From: Robert L. <rle...@us...> - 2007-03-23 11:03:49
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_not_connected/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17271/test/CppGenerator/receptacle_not_connected/impl Modified Files: _check_Test.cc Log Message: C++: the local home adapter has no longer a dependency to the home's implementation Index: _check_Test.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_not_connected/impl/_check_Test.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** _check_Test.cc 5 Jan 2007 14:17:26 -0000 1.3 --- _check_Test.cc 23 Mar 2007 11:03:44 -0000 1.4 *************** *** 1,11 **** /*** ! * CCM Tools Test Client * ! * This file was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> * * This test client is part of the mirror component test concept. For each ! * component a corresponding mirror component will be instantiated. ! * All component ports will be connected to the mirror component's ports. * Additionally, developers can add some testing code to validate supported * interfaces as well as component attribute access. --- 1,11 ---- /*** ! * CCM Tools Test Client * ! * This file was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> * * This test client is part of the mirror component test concept. For each ! * component a corresponding mirror component will be instantiated. ! * All component ports will be connected to the mirror component's ports. * Additionally, developers can add some testing code to validate supported * interfaces as well as component attribute access. *************** *** 17,20 **** --- 17,23 ---- #include <Components/ccmtools.h> + #include <TestHomeMirror_entry.h> + #include <TestHome_entry.h> + #include <TestHomeMirror_gen.h> #include <TestHome_gen.h> *************** *** 33,38 **** int error = 0; error = deploy_TestHome("TestHome"); ! error += deploy_TestHomeMirror("TestHomeMirror"); ! if(error) { cerr << "BOOTSTRAP ERROR: Can't deploy component homes!" << endl; --- 36,41 ---- int error = 0; error = deploy_TestHome("TestHome"); ! error += deploy_TestHomeMirror("TestHomeMirror"); ! if(error) { cerr << "BOOTSTRAP ERROR: Can't deploy component homes!" << endl; *************** *** 40,44 **** } ! try { Components::HomeFinder* homeFinder = Components::HomeFinder::Instance(); --- 43,47 ---- } ! try { Components::HomeFinder* homeFinder = Components::HomeFinder::Instance(); *************** *** 54,58 **** /* ! * Don't connect the receptacle to activate a Components::NoConnection * exception. * Test_ck_console = myTest->connect("console", Test_uses_console); --- 57,61 ---- /* ! * Don't connect the receptacle to activate a Components::NoConnection * exception. * Test_ck_console = myTest->connect("console", Test_uses_console); *************** *** 69,98 **** myTestMirror->remove(); ! } catch(Components::HomeNotFound ) { cout << "DEPLOYMENT ERROR: can't find a home!" << endl; return -1; ! } catch(Components::NotImplemented& e ) { ! cout << "DEPLOYMENT ERROR: function not implemented: " << e.what ( ) << endl; return -1; ! } ! catch(Components::InvalidName& e ) { ! cout << "DEPLOYMENT ERROR: invalid name during connection: " << e.what ( ) << endl; return -1; } ! catch ( ... ) { cout << "DEPLOYMENT ERROR: there is something wrong!" << endl; error = -1; } ! if (error < 0) { return error; } ! error += undeploy_TestHome("TestHome"); error += undeploy_TestHomeMirror("TestHomeMirror"); --- 72,101 ---- myTestMirror->remove(); ! } catch(Components::HomeNotFound ) { cout << "DEPLOYMENT ERROR: can't find a home!" << endl; return -1; ! } catch(Components::NotImplemented& e ) { ! cout << "DEPLOYMENT ERROR: function not implemented: " << e.what ( ) << endl; return -1; ! } ! catch(Components::InvalidName& e ) { ! cout << "DEPLOYMENT ERROR: invalid name during connection: " << e.what ( ) << endl; return -1; } ! catch ( ... ) { cout << "DEPLOYMENT ERROR: there is something wrong!" << endl; error = -1; } ! if (error < 0) { return error; } ! error += undeploy_TestHome("TestHome"); error += undeploy_TestHomeMirror("TestHomeMirror"); |