From: Robert L. <rle...@us...> - 2007-02-13 10:16:16
|
Update of /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/receptacle_module_costants/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/test/CppRemoteGenerator/receptacle_module_costants/impl Modified Files: Test_impl.cc Test_ifaceIn_impl.cc Log Message: version 0.8.7 merged Index: Test_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/receptacle_module_costants/impl/Test_impl.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Test_impl.cc 5 Jan 2007 18:58:47 -0000 1.8 --- Test_impl.cc 13 Feb 2007 10:16:11 -0000 1.9 *************** *** 54,103 **** { bool result = receptacle->getBooleanValue(); ! assert(result == Constants::BOOLEAN_CONST); } { unsigned char result = receptacle->getOctetValue(); ! assert(result == Constants::OCTET_CONST); } { short result = receptacle->getShortValue(); ! assert(result == Constants::SHORT_CONST); } { unsigned short result = receptacle->getUnsignedShortValue(); ! assert(result == Constants::USHORT_CONST); } { long result = receptacle->getLongValue(); ! assert(result == Constants::LONG_CONST); } { unsigned long result = receptacle->getUnsignedLongValue(); ! assert(result == Constants::ULONG_CONST); } { char result = receptacle->getCharValue(); ! assert(result == Constants::CHAR_CONST); } { string result = receptacle->getStringValue(); ! assert(result == Constants::STRING_CONST); } { float result = receptacle->getFloatValue(); ! assert(abs(result - Constants::FLOAT_CONST) < 0.001); } { double result = receptacle->getDoubleValue(); ! assert(abs(result - Constants::DOUBLE_CONST) < 0.0001); } } --- 54,103 ---- { bool result = receptacle->getBooleanValue(); ! assert(result == Constants::BOOLEAN_CONST()); } { unsigned char result = receptacle->getOctetValue(); ! assert(result == Constants::OCTET_CONST()); } { short result = receptacle->getShortValue(); ! assert(result == Constants::SHORT_CONST()); } { unsigned short result = receptacle->getUnsignedShortValue(); ! assert(result == Constants::USHORT_CONST()); } { long result = receptacle->getLongValue(); ! assert(result == Constants::LONG_CONST()); } { unsigned long result = receptacle->getUnsignedLongValue(); ! assert(result == Constants::ULONG_CONST()); } { char result = receptacle->getCharValue(); ! assert(result == Constants::CHAR_CONST()); } { string result = receptacle->getStringValue(); ! assert(result == Constants::STRING_CONST()); } { float result = receptacle->getFloatValue(); ! assert(abs(result - Constants::FLOAT_CONST()) < 0.001); } { double result = receptacle->getDoubleValue(); ! assert(abs(result - Constants::DOUBLE_CONST()) < 0.0001); } } Index: Test_ifaceIn_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/receptacle_module_costants/impl/Test_ifaceIn_impl.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Test_ifaceIn_impl.cc 5 Jan 2007 18:58:47 -0000 1.8 --- Test_ifaceIn_impl.cc 13 Feb 2007 10:16:11 -0000 1.9 *************** *** 25,42 **** : component(component_impl) { ! cout << " BOOLEAN_CONST = " << Constants::BOOLEAN_CONST << endl; ! cout << " OCTET_CONST = " << (int)Constants::OCTET_CONST << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST << endl; ! cout << " USHORT_CONST = " << Constants::USHORT_CONST << endl; ! cout << " LONG_CONST = " << Constants::LONG_CONST << endl; ! cout << " ULONG_CONST = " << Constants::ULONG_CONST << endl; ! cout << " CHAR_CONST = " << Constants::CHAR_CONST << endl; ! cout << " STRING_CONST = " << Constants::STRING_CONST << endl; ! cout << " FLOAT_CONST = " << Constants::FLOAT_CONST << endl; ! cout << " DOUBLE_CONST = " << Constants::DOUBLE_CONST << endl; } --- 25,42 ---- : component(component_impl) { ! cout << " BOOLEAN_CONST = " << Constants::BOOLEAN_CONST() << endl; ! cout << " OCTET_CONST = " << (int)Constants::OCTET_CONST() << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST() << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST() << endl; ! cout << " USHORT_CONST = " << Constants::USHORT_CONST() << endl; ! cout << " LONG_CONST = " << Constants::LONG_CONST() << endl; ! cout << " ULONG_CONST = " << Constants::ULONG_CONST() << endl; ! cout << " CHAR_CONST = " << Constants::CHAR_CONST() << endl; ! cout << " STRING_CONST = " << Constants::STRING_CONST() << endl; ! cout << " FLOAT_CONST = " << Constants::FLOAT_CONST() << endl; ! cout << " DOUBLE_CONST = " << Constants::DOUBLE_CONST() << endl; } *************** *** 50,54 **** throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST; } --- 50,54 ---- throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST(); } *************** *** 57,61 **** throw(Components::CCMException) { ! return Constants::OCTET_CONST; } --- 57,61 ---- throw(Components::CCMException) { ! return Constants::OCTET_CONST(); } *************** *** 64,68 **** throw(Components::CCMException) { ! return Constants::SHORT_CONST; } --- 64,68 ---- throw(Components::CCMException) { ! return Constants::SHORT_CONST(); } *************** *** 71,75 **** throw(Components::CCMException) { ! return Constants::USHORT_CONST; } --- 71,75 ---- throw(Components::CCMException) { ! return Constants::USHORT_CONST(); } *************** *** 78,82 **** throw(Components::CCMException) { ! return Constants::LONG_CONST; } --- 78,82 ---- throw(Components::CCMException) { ! return Constants::LONG_CONST(); } *************** *** 85,89 **** throw(Components::CCMException) { ! return Constants::ULONG_CONST; } --- 85,89 ---- throw(Components::CCMException) { ! return Constants::ULONG_CONST(); } *************** *** 92,96 **** throw(Components::CCMException) { ! return Constants::CHAR_CONST; } --- 92,96 ---- throw(Components::CCMException) { ! return Constants::CHAR_CONST(); } *************** *** 99,103 **** throw(Components::CCMException) { ! return Constants::STRING_CONST; } --- 99,103 ---- throw(Components::CCMException) { ! return Constants::STRING_CONST(); } *************** *** 106,110 **** throw(Components::CCMException) { ! return Constants::FLOAT_CONST; } --- 106,110 ---- throw(Components::CCMException) { ! return Constants::FLOAT_CONST(); } *************** *** 113,117 **** throw(Components::CCMException) { ! return Constants::DOUBLE_CONST; } --- 113,117 ---- throw(Components::CCMException) { ! return Constants::DOUBLE_CONST(); } |