diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-06-06 11:26:30 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-06-06 11:26:30 +0000 |
| commit | 4b97bf9dfc946bdbfffa213fddb89fcdc5608576 (patch) | |
| tree | 85b1a0587585e3938c8b6a3a0a5942bfc98293d9 /CIAO/connectors/dds4ccm/tests | |
| parent | 5b6a27c73c731f15e013a65be8a0e12d0e650c95 (diff) | |
| download | ATCD-4b97bf9dfc946bdbfffa213fddb89fcdc5608576.tar.gz | |
Wed Jun 6 11:25:57 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h:
* connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp:
After we get one unexpected sample are bailing out
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests')
2 files changed, 21 insertions, 8 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp index 28a4b76be77..891c2118e7a 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp @@ -219,7 +219,7 @@ namespace CIAO_Different_Test_Receiver_Impl } } - void + bool Receiver_exec_i::check_iter_getter (const QueryConditionTest & sample) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET ALL : ") @@ -229,17 +229,20 @@ namespace CIAO_Different_Test_Receiver_Impl if (sample.iteration <= ACE_OS::atoi (MIN_ITERATION)) { ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: " - "Didn't expect samples with iterations " - "<= %C\n", + "Didn't expect samples with iteration %C " + "<= %C\n", sample.iteration, MIN_ITERATION)); + return false; } if (sample.iteration > ACE_OS::atoi (MAX_ITERATION)) { ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: " - "Didn't expect samples with iterations " - "> %C\n", + "Didn't expect samples with iteration &C" + "> %C\n", sample.iteration, MAX_ITERATION)); + return false; } + return true; } @@ -279,7 +282,12 @@ namespace CIAO_Different_Test_Receiver_Impl CORBA::Boolean result = getter->get_one (qf_info.out (), readinfo); if (result) { - this->check_iter_getter (qf_info.in ()); + if (!this->check_iter_getter (qf_info.in ())) + { + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " + "ERROR: got unexpected " + "sample, bailing out\n")); + } } else { @@ -292,7 +300,12 @@ namespace CIAO_Different_Test_Receiver_Impl result = getter->get_one (qf_info.out (), readinfo); if (result) { - this->check_iter_getter (qf_info.in ()); + if (!this->check_iter_getter (qf_info.in ())) + { + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " + "ERROR: got unexpected " + "sample, bailing out\n")); + } } } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h index eaa92a8e150..0f33da4bd00 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h @@ -190,7 +190,7 @@ namespace CIAO_Different_Test_Receiver_Impl void get_all (void); void check_iter_reader (const QueryConditionTest & sample); - void check_iter_getter (const QueryConditionTest & sample); + bool check_iter_getter (const QueryConditionTest & sample); void check_filters (void); void check_filter ( |