diff options
| author | msmit <msmit@remedy.nl> | 2009-11-26 13:10:52 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2009-11-26 13:10:52 +0000 |
| commit | 171534fe324c988076849ce3944193824dcb522e (patch) | |
| tree | f91fc3f754c256d45a2e4e01ef76e7266d8df390 | |
| parent | d0d83fcd80688ca3482dae931d7cdf642e9db37d (diff) | |
| download | ATCD-171534fe324c988076849ce3944193824dcb522e.tar.gz | |
Thu Nov 26 13:11:06 UTC 2009 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h:
* connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
Resolved runtime errors.
* connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp:
Resolved test error: test took longer than 60 seconds.
5 files changed, 15 insertions, 5 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 2a7370bfd1e..d34318bfe94 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Thu Nov 26 13:11:06 UTC 2009 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: + Resolved runtime errors. + + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp: + Resolved test error: test took longer than 60 seconds. + Thu Nov 26 12:56:39 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/Containers/Session/Session_Container.h: diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp index c2cdac3685b..3c4517d27bf 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp @@ -413,7 +413,7 @@ namespace CIAO_Keyed_Test_Receiver_Impl CIAO_DEBUG ((LM_INFO, "Receiver_exec_i summary: received <%u> - expected <%d>\n", this->received_.value (), this->expected_)); - if (this->received_ < this->expected_) + if (this->received_.value () < this->expected_) { CIAO_ERROR ((LM_ERROR, "ERROR : Expected to receive %u samples, actually got %u\n", this->expected_, this->received_.value ())); diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h index 3d245132841..f4ea96bca15 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h @@ -154,7 +154,7 @@ namespace CIAO_Keyed_Test_Receiver_Impl CORBA::UShort iterations_; CORBA::UShort keys_; CORBA::Boolean get_data_, read_data_, raw_listen_; - long expected_; + CORBA::ULong expected_; Atomic_ULong received_; }; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp index 6e96c0308ef..06e307e7676 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp @@ -187,7 +187,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl Receiver_exec_i::ccm_remove (void) { CIAO_DEBUG ((LM_INFO, "Receiver_exec_i summary: received <%u>\n", - this->received_)); + this->received_.value ())); } extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp index 148ed745c3e..a4009d42b4b 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp @@ -174,7 +174,7 @@ </type> <value> <!-- Sender->keys * Sender->iterations --> - <ushort>50</ushort> + <ushort>30</ushort> </value> </value> </configProperty> @@ -250,7 +250,7 @@ <kind>tk_ushort</kind> </type> <value> - <ushort>5</ushort> + <ushort>3</ushort> </value> </value> </configProperty> |