diff options
9 files changed, 35 insertions, 28 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 1cca247fcaf..cced1c5fd30 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,15 @@ +Thu Sep 23 07:55:57 UTC 2010 Marijke Hengstmengelt <mhengstmengel@remedy.nl> + + * connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc: + * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp: + * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h: + * connectors/tests/AMIDDS/descriptors/Plan.cdp: + * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h: + * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp: + * connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl: + * connectors/tests/AMIDDS/Base/AmiDds_DDS.idl: + Fuzz errors. + Thu Sep 23 07:55:57 UTC 2010 Marcel Smit <msmit@remedy.nl> * tests/IDL3_to_XMI/XMI_For_Array/test.idl: diff --git a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl index 82fdb881b12..480790b0703 100755 --- a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl +++ b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl @@ -20,5 +20,5 @@ struct TestTopic { }; typedef sequence<TestTopic> TestTopicSeq; - + #endif diff --git a/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl b/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl index 4d26ae5741e..aaa866d7be4 100755 --- a/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl +++ b/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl @@ -17,7 +17,7 @@ module AmiDds { - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> AmiDdsConnector; + module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> AmiDdsConnector; }; #endif /* AMIDDS_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp index c9e01a708dc..252eed3be67 100755 --- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp +++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp @@ -48,7 +48,7 @@ namespace CIAO_AmiDds_Receiver_Impl const TestTopic & an_instance, const ::CCM_DDS::ReadInfo & info) { - ACE_DEBUG ((LM_DEBUG, "Receiver (DDS4CCM)) :\tget data with on_one_data: " + ACE_DEBUG ((LM_DEBUG, "Receiver (DDS4CCM)) :\tget data with on_one_data: " "key <%C> - iteration <%d>\n", an_instance.key.in (), an_instance.x)); diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h index 27dbec4dccd..859332cb082 100755 --- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h +++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h @@ -29,7 +29,7 @@ namespace CIAO_AmiDds_Receiver_Impl //============================================================ // ListenOneByOneTest_Listener_exec_i - //============================================================ + //============================================================ class AMIDDS_RECEIVER_EXEC_Export ListenOneByOneTest_Listener_exec_i : public virtual ::AmiDds::AmiDdsConnector::CCM_Listener, public virtual ::CORBA::LocalObject diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc index 340073323a9..7d83baefda6 100755 --- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc +++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc @@ -27,7 +27,7 @@ project(AMI_AmiDds_Base_AmiDds_Sender_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(AMI_AmiDds_Base_AmiDds_Sender_lem_stub) : ccm_svnt, ami, dds4ccm_base { +project(AMI_AmiDds_Base_AmiDds_Sender_l_stub) : ccm_svnt, ami, dds4ccm_base { after += AMI_AmiDds_Base_AmiDds_Sender_lem_gen AMI_AmiDds_Base_stub Conn_AmiDds_Base_stub DDS_AmiDds_Base_stub libs += AmiDds_Base_stub DDS_AmiDds_Base_stub libpaths += ../lib @@ -78,7 +78,7 @@ project(AMI_AmiDds_Base_AmiDds_Sender_stub) : ccm_stub, ami,dds4ccm_base { } project(AMI_AmiDds_Base_AmiDds_Sender_exec) : ciao_executor, ami, ami4ccm_stub, dds4ccm_lem_stub { - after += AMI_AmiDds_Base_AmiDds_Sender_lem_stub AMI_AmiDds_Base_AmiDds_Sender_stub AMI_AmiDds_Base_exec Conn_AmiDds_Base_stub AMI_AmiDds_Base_lem_stub DDS_AmiDds_Connector_stub DDS_AMIDDS_Connector_lem_stub + after += AMI_AmiDds_Base_AmiDds_Sender_l_stub AMI_AmiDds_Base_AmiDds_Sender_stub AMI_AmiDds_Base_exec Conn_AmiDds_Base_stub AMI_AmiDds_Base_lem_stub DDS_AmiDds_Connector_stub DDS_AMIDDS_Connector_lem_stub sharedname = AmiDds_Sender_exec libs += AmiDds_Sender_stub AmiDds_Sender_lem_stub AmiDds_Base_stub AmiDds_Base_lem_stub DDS_AmiDds_Base_stub DDS_AmiDds_Connector_stub DDS_AMIDDS_Connector_lem_stub libpaths += ../lib @@ -102,7 +102,7 @@ project(AMI_AmiDds_Base_AmiDds_Sender_exec) : ciao_executor, ami, ami4ccm_stub, } project(AMI_AmiDds_Base_AmiDds_Sender_svnt) : ciao_servant, ami, dds4ccm_lem_stub, dds4ccm_skel { - after += AMI_AmiDds_Base_skel AMI_AmiDds_Base_AmiDds_Sender_lem_stub AMI_AmiDds_Base_AmiDds_Sender_stub AMI_AmiDds_Base_exec AMI_AmiDds_skel DDS_AmiDds_Connector_stub DDS_AMIDDS_Connector_lem_stub DDS_AmiDds_Connector_svnt + after += AMI_AmiDds_Base_skel AMI_AmiDds_Base_AmiDds_Sender_l_stub AMI_AmiDds_Base_AmiDds_Sender_stub AMI_AmiDds_Base_exec AMI_AmiDds_skel DDS_AmiDds_Connector_stub DDS_AMIDDS_Connector_lem_stub DDS_AmiDds_Connector_svnt sharedname = AmiDds_Sender_svnt libs += AmiDds_Sender_stub AmiDds_Sender_lem_stub \ AmiDds_Base_skel AmiDds_Base_stub \ diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp index e602976a421..3874ccc494e 100755 --- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp +++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp @@ -26,7 +26,7 @@ namespace CIAO_AmiDds_Sender_Impl { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Sender (AMI4CCM)) :\treceived ASYNCHRONOUS answer ") - ACE_TEXT("from Receiver <%u>\n"), answer)); + ACE_TEXT("from Receiver <%u>\n"), answer)); } void @@ -68,7 +68,7 @@ namespace CIAO_AmiDds_Sender_Impl // Supported operations and attributes. CORBA::Boolean - Sender_exec_i::create_one(CORBA::Short nr) + Sender_exec_i::create_one(CORBA::Short nr) { CORBA::Boolean result = true; TestTopic i = this->topic_seq_one_[nr]; @@ -172,7 +172,6 @@ namespace CIAO_AmiDds_Sender_Impl ACE_TEXT("Sender (AMI4CCM)) :\t") ACE_TEXT("Invoke Asynchronous call nr %u\n"),(i + 1))); my_foo_ami_->sendc_hello (new MyFoo_callback_exec_i ()); - } } return result; @@ -186,8 +185,7 @@ namespace CIAO_AmiDds_Sender_Impl CORBA::Boolean result = true; ::AmiDds::MyFoo_var my_foo_ami_ = context_->get_connection_run_my_foo(); - - for (CORBA::Short i = 0; i < 2; ++i) + for (CORBA::Short i = 0; i < 2; ++i) { if (CORBA::is_nil (my_foo_ami_)) { @@ -223,8 +221,8 @@ namespace CIAO_AmiDds_Sender_Impl this->test_ok_ = this->create_one(0); if(this->test_ok_.value()) { - this->test_ok_ = this->update_one(0); - } + this->test_ok_ = this->update_one(0); + } if(this->test_ok_.value()) { this->test_nr_ = SEND_ASYNCH; @@ -235,7 +233,7 @@ namespace CIAO_AmiDds_Sender_Impl } break; case SEND_ASYNCH: - this->test_ok_ = this->send_asynch_call(); + this->test_ok_ = this->send_asynch_call(); if(this->test_ok_.value()) { this->test_nr_ = UPDATE_TWO; @@ -249,8 +247,8 @@ namespace CIAO_AmiDds_Sender_Impl this->test_ok_ = this->create_one(1); if(this->test_ok_.value()) { - this->test_ok_ = this->update_one(1); - } + this->test_ok_ = this->update_one(1); + } if(this->test_ok_.value()) { this->test_nr_ = SEND_SYNCH; @@ -259,9 +257,9 @@ namespace CIAO_AmiDds_Sender_Impl { this->test_nr_ = END_TEST; } - break; - case SEND_SYNCH: - this->test_ok_ = this->send_synch_call(); + break; + case SEND_SYNCH: + this->test_ok_ = this->send_synch_call(); this->test_nr_ = END_TEST; break; default: diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h index 108d66e1791..49902dc8693 100755 --- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h +++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h @@ -37,9 +37,9 @@ namespace CIAO_AmiDds_Sender_Impl enum UPDATER_TEST { UPDATE_ONE, - SEND_SYNCH, + SEND_SYNCH, UPDATE_TWO, - SEND_ASYNCH, + SEND_ASYNCH, END_TEST }; @@ -74,14 +74,14 @@ namespace CIAO_AmiDds_Sender_Impl void start (void); void stop (void); void add_instances_of_topic (void); - CORBA::Boolean create_one(CORBA::Short nr); + CORBA::Boolean create_one(CORBA::Short nr); CORBA::Boolean update_one(CORBA::Short nr); - CORBA::Boolean send_asynch_call(void); + CORBA::Boolean send_asynch_call(void); CORBA::Boolean send_synch_call(void); pulse_Generator * ticker_; ::AmiDds::CCM_Sender_Context_var context_; - ::AmiDds::AmiDdsConnector::Updater_var updater_; + ::AmiDds::AmiDdsConnector::Updater_var updater_; UPDATER_TEST test_nr_; Atomic_Boolean test_ok_; TestTopicSeq topic_seq_one_; diff --git a/CIAO/connectors/tests/AMIDDS/descriptors/Plan.cdp b/CIAO/connectors/tests/AMIDDS/descriptors/Plan.cdp index 784f59cb093..90371c0ed89 100755 --- a/CIAO/connectors/tests/AMIDDS/descriptors/Plan.cdp +++ b/CIAO/connectors/tests/AMIDDS/descriptors/Plan.cdp @@ -211,9 +211,6 @@ </value> </execParameter> </implementation> - - - <instance xmi:id="AmiDds.ComponentImplementations.AmiDdsImplementation.AmiDds.Receiver"> <name>AmiDds.ComponentImplementations.AmiDdsImplementation.AmiDds.Receiver</name> |