Skip to content

U
uniset2
Commit 70ecd289 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(UInterface): корректировка сообщений об ошибках

parent 01a6fca4
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 40 deletions
extensions/tests/test_ui.cc
View file @ 70ecd289
...@@ -86,8 +86,8 @@ TEST_CASE("UInterface", "[UInterface]") ...@@ -86,8 +86,8 @@ TEST_CASE("UInterface", "[UInterface]")
SECTION( "resolve" ) SECTION( "resolve" )
{ {
REQUIRE_NOTHROW( ui.resolve(sid) ); REQUIRE_NOTHROW( ui.resolve(sid) );
REQUIRE_THROWS_AS( ui.resolve(sid, 10), UniSetTypes::ORepFailed ); REQUIRE_THROWS_AS( ui.resolve(sid, 10), UniSetTypes::ResolveNameError );
REQUIRE_THROWS_AS( ui.resolve(sid, DefaultObjectId), UniSetTypes::ORepFailed ); REQUIRE_THROWS_AS( ui.resolve(sid, DefaultObjectId), UniSetTypes::ResolveNameError );
} }
SECTION( "send" ) SECTION( "send" )
......
src/Interfaces/UInterface.cc
View file @ 70ecd289
...@@ -122,8 +122,12 @@ throw(UI_THROW_EXCEPTIONS) ...@@ -122,8 +122,12 @@ throw(UI_THROW_EXCEPTIONS)
if ( id == DefaultObjectId ) if ( id == DefaultObjectId )
throw ORepFailed("UI(getValue): error id=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(getValue): error id=UniSetTypes::DefaultObjectId");
if ( node == DefaultObjectId ) if( node == DefaultObjectId )
throw ORepFailed("UI(getValue): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(getValue): id='" << id << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -286,10 +290,14 @@ void UInterface::setValue( const ObjectId id, long value, const ObjectId node ) ...@@ -286,10 +290,14 @@ void UInterface::setValue( const ObjectId id, long value, const ObjectId node )
throw(UI_THROW_EXCEPTIONS) throw(UI_THROW_EXCEPTIONS)
{ {
if ( id == DefaultObjectId ) if ( id == DefaultObjectId )
throw ORepFailed("UI(setValue): попытка обратиться к объекту с id=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(setValue): error: id=UniSetTypes::DefaultObjectId");
if ( node == DefaultObjectId ) if ( node == DefaultObjectId )
throw ORepFailed("UI(setValue): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(askRemoteSensor): id='" << id << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -485,10 +493,14 @@ void UInterface::askRemoteSensor( const ObjectId id, UniversalIO::UIOCommand cmd ...@@ -485,10 +493,14 @@ void UInterface::askRemoteSensor( const ObjectId id, UniversalIO::UIOCommand cmd
throw UniSetTypes::IOBadParam("UI(askRemoteSensor): unknown back ID"); throw UniSetTypes::IOBadParam("UI(askRemoteSensor): unknown back ID");
if ( id == DefaultObjectId ) if ( id == DefaultObjectId )
throw ORepFailed("UI(askRemoteSensor): id=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(askRemoteSensor): error: id=UniSetTypes::DefaultObjectId");
if ( node == DefaultObjectId ) if ( node == DefaultObjectId )
throw ORepFailed("UI(askRemoteSensor): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(askRemoteSensor): id='" << id << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -578,10 +590,14 @@ IOType UInterface::getIOType( const ObjectId id, const ObjectId node ) const ...@@ -578,10 +590,14 @@ IOType UInterface::getIOType( const ObjectId id, const ObjectId node ) const
throw(UI_THROW_EXCEPTIONS) throw(UI_THROW_EXCEPTIONS)
{ {
if ( id == DefaultObjectId ) if ( id == DefaultObjectId )
throw ORepFailed("UI(getIOType): попытка обратиться к объекту с id=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(getIOType): error: id=UniSetTypes::DefaultObjectId");
if ( node == DefaultObjectId ) if( node == DefaultObjectId )
throw ORepFailed("UI(getIOType): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(getIOType): id='" << id << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -667,8 +683,12 @@ throw(UI_THROW_EXCEPTIONS) ...@@ -667,8 +683,12 @@ throw(UI_THROW_EXCEPTIONS)
if ( name == DefaultObjectId ) if ( name == DefaultObjectId )
throw ORepFailed("UI(getType): попытка обратиться к объекту с id=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(getType): попытка обратиться к объекту с id=UniSetTypes::DefaultObjectId");
if ( node == DefaultObjectId ) if( node == DefaultObjectId )
throw ORepFailed("UI(getType): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(getType): id='" << name << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -795,8 +815,12 @@ throw(ResolveNameError, UniSetTypes::TimeOut ) ...@@ -795,8 +815,12 @@ throw(ResolveNameError, UniSetTypes::TimeOut )
if ( rid == DefaultObjectId ) if ( rid == DefaultObjectId )
throw ResolveNameError("UI(resolve): ID=UniSetTypes::DefaultObjectId"); throw ResolveNameError("UI(resolve): ID=UniSetTypes::DefaultObjectId");
if ( node == DefaultObjectId ) if( node == DefaultObjectId )
throw ResolveNameError("UI(resolve): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(resolve): id='" << rid << "' error: node=UniSetTypes::DefaultObjectId";
throw ResolveNameError(err.str());
}
CosNaming::NamingContext_var ctx; CosNaming::NamingContext_var ctx;
rcache.erase(rid, node); rcache.erase(rid, node);
...@@ -932,8 +956,12 @@ throw(UI_THROW_EXCEPTIONS) ...@@ -932,8 +956,12 @@ throw(UI_THROW_EXCEPTIONS)
if ( name == DefaultObjectId ) if ( name == DefaultObjectId )
throw ORepFailed("UI(send): ERROR: id=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(send): ERROR: id=UniSetTypes::DefaultObjectId");
if ( node == DefaultObjectId ) if( node == DefaultObjectId )
throw ORepFailed("UI(send): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(send): id='" << name << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -1005,8 +1033,12 @@ IOController_i::ShortIOInfo UInterface::getChangedTime( const ObjectId id, const ...@@ -1005,8 +1033,12 @@ IOController_i::ShortIOInfo UInterface::getChangedTime( const ObjectId id, const
if( id == DefaultObjectId ) if( id == DefaultObjectId )
throw ORepFailed("UI(getChangedTime): Unknown id=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(getChangedTime): Unknown id=UniSetTypes::DefaultObjectId");
if ( node == DefaultObjectId ) if( node == DefaultObjectId )
throw ORepFailed("UI(getChangedTime): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(getChangedTime): id='" << id << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -1239,10 +1271,14 @@ void UInterface::askRemoteThreshold( const ObjectId sid, const ObjectId node, ...@@ -1239,10 +1271,14 @@ void UInterface::askRemoteThreshold( const ObjectId sid, const ObjectId node,
throw UniSetTypes::IOBadParam("UI(askRemoteThreshold): unknown back ID"); throw UniSetTypes::IOBadParam("UI(askRemoteThreshold): unknown back ID");
if ( sid == DefaultObjectId ) if ( sid == DefaultObjectId )
throw ORepFailed("UI(askRemoteThreshold): попытка обратиться к объекту с id=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(askRemoteThreshold): error: id=UniSetTypes::DefaultObjectId");
if ( node == DefaultObjectId ) if( node == DefaultObjectId )
throw ORepFailed("UI(askRemoteThreshold): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(askRemoteThreshold): id='" << sid << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -1332,7 +1368,14 @@ IONotifyController_i::ThresholdInfo ...@@ -1332,7 +1368,14 @@ IONotifyController_i::ThresholdInfo
UInterface::getThresholdInfo( const IOController_i::SensorInfo& si, const UniSetTypes::ThresholdId tid ) const UInterface::getThresholdInfo( const IOController_i::SensorInfo& si, const UniSetTypes::ThresholdId tid ) const
{ {
if ( si.id == DefaultObjectId ) if ( si.id == DefaultObjectId )
throw ORepFailed("UI(getThresholdInfo): попытка обратиться к объекту с id=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(getThresholdInfo): error: id=UniSetTypes::DefaultObjectId");
if( si.node == DefaultObjectId )
{
ostringstream err;
err << "UI(getThresholdInfo): id='" << si.id << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -1406,10 +1449,14 @@ UInterface::getThresholdInfo( const IOController_i::SensorInfo& si, const UniSet ...@@ -1406,10 +1449,14 @@ UInterface::getThresholdInfo( const IOController_i::SensorInfo& si, const UniSet
long UInterface::getRawValue( const IOController_i::SensorInfo& si ) long UInterface::getRawValue( const IOController_i::SensorInfo& si )
{ {
if ( si.id == DefaultObjectId ) if ( si.id == DefaultObjectId )
throw ORepFailed("UI(getRawValue): попытка обратиться к объекту с id=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(getRawValue): error: id=UniSetTypes::DefaultObjectId");
if ( si.node == DefaultObjectId ) if( si.node == DefaultObjectId )
throw ORepFailed("UI(cgetRawValue): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(getRawValue): id='" << si.id << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -1491,10 +1538,14 @@ void UInterface::calibrate(const IOController_i::SensorInfo& si, ...@@ -1491,10 +1538,14 @@ void UInterface::calibrate(const IOController_i::SensorInfo& si,
// throw UniSetTypes::IOBadParam("UI(askTreshold): неизвестен ID администратора"); // throw UniSetTypes::IOBadParam("UI(askTreshold): неизвестен ID администратора");
if( si.id == DefaultObjectId ) if( si.id == DefaultObjectId )
throw ORepFailed("UI(calibrate): попытка обратиться к объекту с id=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(calibrate): error: id=UniSetTypes::DefaultObjectId");
if( si.node == DefaultObjectId ) if( si.node == DefaultObjectId )
throw ORepFailed("UI(calibrate): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(calibrate): id='" << si.id << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -1571,8 +1622,12 @@ IOController_i::CalibrateInfo UInterface::getCalibrateInfo( const IOController_i ...@@ -1571,8 +1622,12 @@ IOController_i::CalibrateInfo UInterface::getCalibrateInfo( const IOController_i
if ( si.id == DefaultObjectId ) if ( si.id == DefaultObjectId )
throw ORepFailed("UI(getCalibrateInfo): попытка обратиться к объекту с id=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(getCalibrateInfo): попытка обратиться к объекту с id=UniSetTypes::DefaultObjectId");
if ( si.node == DefaultObjectId ) if( si.node == DefaultObjectId )
throw ORepFailed("UI(getCalibrateInfo): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(getCalibrateInfo): id='" << si.id << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -1900,8 +1955,12 @@ IOController_i::ShortMapSeq* UInterface::getSensors( const UniSetTypes::ObjectId ...@@ -1900,8 +1955,12 @@ IOController_i::ShortMapSeq* UInterface::getSensors( const UniSetTypes::ObjectId
if ( id == DefaultObjectId ) if ( id == DefaultObjectId )
throw ORepFailed("UI(getSensors): error node=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(getSensors): error node=UniSetTypes::DefaultObjectId");
if ( node == DefaultObjectId ) if( node == DefaultObjectId )
throw ORepFailed("UI(getSensors): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(getSensors): id='" << id << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -1972,13 +2031,17 @@ IOController_i::ShortMapSeq* UInterface::getSensors( const UniSetTypes::ObjectId ...@@ -1972,13 +2031,17 @@ IOController_i::ShortMapSeq* UInterface::getSensors( const UniSetTypes::ObjectId
throw UniSetTypes::TimeOut(set_err("UI(getSensors): Timeout", id, node)); throw UniSetTypes::TimeOut(set_err("UI(getSensors): Timeout", id, node));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
IOController_i::SensorInfoSeq* UInterface::getSensorsMap( const UniSetTypes::ObjectId id, UniSetTypes::ObjectId node ) IOController_i::SensorInfoSeq* UInterface::getSensorsMap( const UniSetTypes::ObjectId id, const UniSetTypes::ObjectId node )
{ {
if ( id == DefaultObjectId ) if ( id == DefaultObjectId )
throw ORepFailed("UI(getSensorsMap): error node=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(getSensorsMap): error node=UniSetTypes::DefaultObjectId");
if ( node == DefaultObjectId ) if( node == DefaultObjectId )
throw ORepFailed("UI(getSensorsMap): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(getSensorsMap): id='" << id << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
...@@ -2048,13 +2111,17 @@ IOController_i::SensorInfoSeq* UInterface::getSensorsMap( const UniSetTypes::Obj ...@@ -2048,13 +2111,17 @@ IOController_i::SensorInfoSeq* UInterface::getSensorsMap( const UniSetTypes::Obj
throw UniSetTypes::TimeOut(set_err("UI(getSensorsMap): Timeout", id, node)); throw UniSetTypes::TimeOut(set_err("UI(getSensorsMap): Timeout", id, node));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
IONotifyController_i::ThresholdsListSeq* UInterface::getThresholdsList( const UniSetTypes::ObjectId id, UniSetTypes::ObjectId node ) IONotifyController_i::ThresholdsListSeq* UInterface::getThresholdsList( const UniSetTypes::ObjectId id, const UniSetTypes::ObjectId node )
{ {
if ( id == DefaultObjectId ) if ( id == DefaultObjectId )
throw ORepFailed("UI(getThresholdsList): error node=UniSetTypes::DefaultObjectId"); throw ORepFailed("UI(getThresholdsList): error node=UniSetTypes::DefaultObjectId");
if ( node == DefaultObjectId ) if( node == DefaultObjectId )
throw ORepFailed("UI(getThresholdsList): error node=UniSetTypes::DefaultObjectId"); {
ostringstream err;
err << "UI(getThresholdsList): id='" << id << "' error: node=UniSetTypes::DefaultObjectId";
throw ORepFailed(err.str());
}
try try
{ {
......
tests/test_ui.cc
View file @ 70ecd289
...@@ -33,8 +33,8 @@ TEST_CASE("UInterface", "[UInterface]") ...@@ -33,8 +33,8 @@ TEST_CASE("UInterface", "[UInterface]")
REQUIRE_THROWS_AS( ui.getValue(sid, 100), UniSetTypes::Exception ); REQUIRE_THROWS_AS( ui.getValue(sid, 100), UniSetTypes::Exception );
REQUIRE_THROWS_AS( ui.resolve(sid), UniSetTypes::ORepFailed ); REQUIRE_THROWS_AS( ui.resolve(sid), UniSetTypes::ORepFailed );
REQUIRE_THROWS_AS( ui.resolve(sid, 10), UniSetTypes::ORepFailed ); REQUIRE_THROWS_AS( ui.resolve(sid, 10), UniSetTypes::ResolveNameError );
REQUIRE_THROWS_AS( ui.resolve(sid, DefaultObjectId), UniSetTypes::ORepFailed ); REQUIRE_THROWS_AS( ui.resolve(sid, DefaultObjectId), ResolveNameError );
TransportMessage tm( SensorMessage(sid, 10).transport_msg() ); TransportMessage tm( SensorMessage(sid, 10).transport_msg() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment