From f7f268dfb9d005db91487e13d93167d262a382c9 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 23 Feb 2009 08:13:54 +0000 Subject: Mon Feb 23 08:08:15 UTC 2009 Johnny Willemsen --- .../TP_Foo_B/Foo_B_Statistics.cpp | 46 +++++++++++----------- TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp | 10 ++--- 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'TAO/tests/CSD_Strategy_Tests/TP_Foo_B') diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp index 6cf19e95125..2db50ba7eb8 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp @@ -5,7 +5,7 @@ extern const char* ONEWAY_ARG_TEST_STR; extern CORBA::Boolean special_value; -Foo_B_Statistics::Foo_B_Statistics(unsigned num_remote_clients, +Foo_B_Statistics::Foo_B_Statistics(unsigned num_remote_clients, unsigned num_collcated_clients) : num_clients_ (num_remote_clients + num_collcated_clients), num_collcated_clients_ (num_collcated_clients), @@ -63,14 +63,14 @@ Foo_B_Statistics::actual(unsigned op_num, StringVector sv) } -void +void Foo_B_Statistics::expected_callbacks (unsigned num_cbs) { expected_callbacks_ = num_cbs * this->num_collcated_clients_; } -void +void Foo_B_Statistics::actual_callbacks (unsigned num_cbs) { actual_callbacks_ += num_cbs; @@ -94,7 +94,7 @@ Foo_B_Statistics::actual_vs_expected() { ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected " "servant_error_count_=%u\n", servant_error_count_)); - if (ret) + if (ret) ret = false; } @@ -103,9 +103,9 @@ Foo_B_Statistics::actual_vs_expected() if (actual_callbacks_ != expected_callbacks_) { ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected " - "actual_callbacks_=%u expected_callbacks_=%u \n", + "actual_callbacks_=%u expected_callbacks_=%u\n", actual_callbacks_, expected_callbacks_)); - if (ret) + if (ret) ret = false; } @@ -115,9 +115,9 @@ Foo_B_Statistics::actual_vs_expected() if (this->expected_op_count_[z] != this->actual_op_count_[z]) { ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected " - "expected_op_count_[%u]=%u actual_op_count_[%u]=%u \n", + "expected_op_count_[%u]=%u actual_op_count_[%u]=%u\n", z, expected_op_count_[z], z, actual_op_count_[z])); - if (ret) + if (ret) ret = false; } } @@ -131,15 +131,15 @@ Foo_B_Statistics::actual_vs_expected() { case FOO_B_STAT_LONG: { - unsigned actual_size + unsigned actual_size = this->actual_in_long_[i].size (); - unsigned expected_size + unsigned expected_size = this->num_clients_ * stats.expected_op_count_[i]; if (actual_size != expected_size) { ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected " "actual_size=%u expected_size=%u\n", actual_size, expected_size)); - if (ret) + if (ret) ret = false; } sort (this->actual_in_long_[i]); @@ -149,9 +149,9 @@ Foo_B_Statistics::actual_vs_expected() if (this->actual_in_long_[i][j] != this->actual_in_long_[i][j + 1] - 1) { ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected " - "actual_in_long_[%u][%u]=%d actual_in_long_[%u][%u]=%d\n", + "actual_in_long_[%u][%u]=%d actual_in_long_[%u][%u]=%d\n", i, j, actual_in_long_[i][j], i, j+1, actual_in_long_[i][j + 1])); - if (ret) + if (ret) ret = false; } } @@ -160,15 +160,15 @@ Foo_B_Statistics::actual_vs_expected() case FOO_B_STAT_STRING: { - unsigned actual_size + unsigned actual_size = this->actual_in_string_[i].size (); - unsigned expected_size + unsigned expected_size = this->num_clients_ * stats.expected_op_count_[i]; if (actual_size != expected_size) { ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected " "actual_size=%u expected_size=%u\n", actual_size, expected_size)); - if (ret) + if (ret) ret = false; } @@ -182,9 +182,9 @@ Foo_B_Statistics::actual_vs_expected() if (ACE_OS::strcmp (buffer, ONEWAY_ARG_TEST_STR) != 0) { ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected " - "actual_in_string_[%u][%u]=%s \n", + "actual_in_string_[%u][%u]=%s\n", i, k, actual_in_string_[i][k].c_str())); - if (ret) + if (ret) ret = false; } lvec.push_back (client_id); @@ -197,21 +197,21 @@ Foo_B_Statistics::actual_vs_expected() if (lvec[j] != lvec[j + 1] - 1) { ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected " - "lvec[%u]=%d lvec[%u]=%d\n", + "lvec[%u]=%d lvec[%u]=%d\n", j, lvec[j], j+1, lvec[j + 1])); - if (ret) + if (ret) ret = false; } } } break; - + case FOO_B_STAT_NONE: default: break; } - - } + + } return ret; } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp index 730d8f2e922..6cd944f8473 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp @@ -181,11 +181,11 @@ Foo_B_i::test_var_array_arg(const Var_Array messages) { this->op_count_[13] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ") - // ACE_TEXT(" %s \n"), messages[0].in ())); + // ACE_TEXT(" %s\n"), messages[0].in ())); //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ") - // ACE_TEXT(" %s \n"), messages[1].in ())); + // ACE_TEXT(" %s\n"), messages[1].in ())); //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ") - // ACE_TEXT(" %s \n"), messages[2].in ())); + // ACE_TEXT(" %s\n"), messages[2].in ())); unsigned cur_client_id = 0; for (unsigned i = 0 ; i < 3; i ++) @@ -224,7 +224,7 @@ Foo_B_i::test_special_basic_arg(CORBA::Boolean value, { this->op_count_[14] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_special_basic_arg ") - // ACE_TEXT(" got special basic arg: %d \n"), value)); + // ACE_TEXT(" got special basic arg: %d\n"), value)); CORBA::Boolean expected_special_value = client_id % 2; if (expected_special_value != value) @@ -243,7 +243,7 @@ Foo_B_i::test_objref_arg(Callback_ptr cb) ACE_UNUSED_ARG(cb); this->op_count_[15] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_objref_arg ") - // ACE_TEXT(" got callback object. \n"))); + // ACE_TEXT(" got callback object.\n"))); } -- cgit v1.2.1