diff options
Diffstat (limited to 'TAO/tests')
50 files changed, 18 insertions, 44 deletions
diff --git a/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc b/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc index 679a47c31c8..679a47c31c8 100644..100755 --- a/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc +++ b/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc diff --git a/TAO/tests/Bug_1812_Regression/Test.idl b/TAO/tests/Bug_1812_Regression/Test.idl index 176f713989b..176f713989b 100644..100755 --- a/TAO/tests/Bug_1812_Regression/Test.idl +++ b/TAO/tests/Bug_1812_Regression/Test.idl diff --git a/TAO/tests/Bug_1812_Regression/test.cpp b/TAO/tests/Bug_1812_Regression/test.cpp index d3b463ab1f1..d3b463ab1f1 100644..100755 --- a/TAO/tests/Bug_1812_Regression/test.cpp +++ b/TAO/tests/Bug_1812_Regression/test.cpp diff --git a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc index 679a47c31c8..679a47c31c8 100644..100755 --- a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc +++ b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc diff --git a/TAO/tests/Bug_1813_Regression/Test.idl b/TAO/tests/Bug_1813_Regression/Test.idl index 2b47d41dd97..2b47d41dd97 100644..100755 --- a/TAO/tests/Bug_1813_Regression/Test.idl +++ b/TAO/tests/Bug_1813_Regression/Test.idl diff --git a/TAO/tests/Bug_1813_Regression/test.cpp b/TAO/tests/Bug_1813_Regression/test.cpp index d3b463ab1f1..d3b463ab1f1 100644..100755 --- a/TAO/tests/Bug_1813_Regression/test.cpp +++ b/TAO/tests/Bug_1813_Regression/test.cpp diff --git a/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc b/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc index 3fcbdd9dee2..3fcbdd9dee2 100644..100755 --- a/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc +++ b/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc diff --git a/TAO/tests/Bug_2144_Regression/README b/TAO/tests/Bug_2144_Regression/README index 78e177a24c7..78e177a24c7 100644..100755 --- a/TAO/tests/Bug_2144_Regression/README +++ b/TAO/tests/Bug_2144_Regression/README diff --git a/TAO/tests/Bug_2144_Regression/test.cpp b/TAO/tests/Bug_2144_Regression/test.cpp index c7b795b0d04..c7b795b0d04 100644..100755 --- a/TAO/tests/Bug_2144_Regression/test.cpp +++ b/TAO/tests/Bug_2144_Regression/test.cpp diff --git a/TAO/tests/Bug_2144_Regression/test.idl b/TAO/tests/Bug_2144_Regression/test.idl index 28335e7e932..28335e7e932 100644..100755 --- a/TAO/tests/Bug_2144_Regression/test.idl +++ b/TAO/tests/Bug_2144_Regression/test.idl diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc index ff28e59983f..ff28e59983f 100644..100755 --- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc +++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp index 65df3934e3a..65df3934e3a 100644..100755 --- a/TAO/tests/Bug_2183_Regression/Hello.cpp +++ b/TAO/tests/Bug_2183_Regression/Hello.cpp diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h index 7e1c3042968..7e1c3042968 100644..100755 --- a/TAO/tests/Bug_2183_Regression/Hello.h +++ b/TAO/tests/Bug_2183_Regression/Hello.h diff --git a/TAO/tests/Bug_2183_Regression/README b/TAO/tests/Bug_2183_Regression/README index 4e54c27822b..4e54c27822b 100644..100755 --- a/TAO/tests/Bug_2183_Regression/README +++ b/TAO/tests/Bug_2183_Regression/README diff --git a/TAO/tests/Bug_2183_Regression/Test.idl b/TAO/tests/Bug_2183_Regression/Test.idl index 3c0976e106d..3c0976e106d 100644..100755 --- a/TAO/tests/Bug_2183_Regression/Test.idl +++ b/TAO/tests/Bug_2183_Regression/Test.idl diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp index 913d3153ae9..913d3153ae9 100644..100755 --- a/TAO/tests/Bug_2183_Regression/client.cpp +++ b/TAO/tests/Bug_2183_Regression/client.cpp diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp index 4853611a134..4853611a134 100644..100755 --- a/TAO/tests/Bug_2183_Regression/server.cpp +++ b/TAO/tests/Bug_2183_Regression/server.cpp diff --git a/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc b/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc index cff84ebf492..cff84ebf492 100644..100755 --- a/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc +++ b/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc diff --git a/TAO/tests/Bug_2222_Regression/TestCase.idl b/TAO/tests/Bug_2222_Regression/TestCase.idl index 119634fdc21..119634fdc21 100644..100755 --- a/TAO/tests/Bug_2222_Regression/TestCase.idl +++ b/TAO/tests/Bug_2222_Regression/TestCase.idl diff --git a/TAO/tests/Bug_2222_Regression/TestType.idl b/TAO/tests/Bug_2222_Regression/TestType.idl index 408e5cf6d97..408e5cf6d97 100644..100755 --- a/TAO/tests/Bug_2222_Regression/TestType.idl +++ b/TAO/tests/Bug_2222_Regression/TestType.idl diff --git a/TAO/tests/Bug_2222_Regression/test.cpp b/TAO/tests/Bug_2222_Regression/test.cpp index 8e6a7bec7ff..8e6a7bec7ff 100644..100755 --- a/TAO/tests/Bug_2222_Regression/test.cpp +++ b/TAO/tests/Bug_2222_Regression/test.cpp diff --git a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc index d428b0fce50..d428b0fce50 100644..100755 --- a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc +++ b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc diff --git a/TAO/tests/Bug_2375_Regression/README b/TAO/tests/Bug_2375_Regression/README index 97b642530a1..97b642530a1 100644..100755 --- a/TAO/tests/Bug_2375_Regression/README +++ b/TAO/tests/Bug_2375_Regression/README diff --git a/TAO/tests/Bug_2375_Regression/test.cpp b/TAO/tests/Bug_2375_Regression/test.cpp index 2a2d57db0e7..2a2d57db0e7 100644..100755 --- a/TAO/tests/Bug_2375_Regression/test.cpp +++ b/TAO/tests/Bug_2375_Regression/test.cpp diff --git a/TAO/tests/Bug_2375_Regression/test.idl b/TAO/tests/Bug_2375_Regression/test.idl index a6ee7413825..a6ee7413825 100644..100755 --- a/TAO/tests/Bug_2375_Regression/test.idl +++ b/TAO/tests/Bug_2375_Regression/test.idl diff --git a/TAO/tests/Bug_2669_Regression/Child.idl b/TAO/tests/Bug_2669_Regression/Child.idl index fd35fee57e6..cc6dac2f24b 100644 --- a/TAO/tests/Bug_2669_Regression/Child.idl +++ b/TAO/tests/Bug_2669_Regression/Child.idl @@ -5,10 +5,10 @@ */ //============================================================================= -#pragma prefix "child.pragma.prefix" - #include "Parent.idl" +#pragma prefix "child.pragma.prefix" + interface ChildInterface : ParentInterface {}; module ChildModule diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp index f840ef82b8b..ec1910c1fc2 100644 --- a/TAO/tests/Bug_2669_Regression/client.cpp +++ b/TAO/tests/Bug_2669_Regression/client.cpp @@ -8,7 +8,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -#include "ace/OS_NS_string.h" #include "ChildS.h" @@ -46,7 +45,7 @@ public: NonRelatedChildHandler (void) {}; ~NonRelatedChildHandler (void) {}; }; - + int main (int argc, char *argv[]) { @@ -81,23 +80,14 @@ main (int argc, char *argv[]) // Create two handlers ChildHandler child_handler; NonRelatedChildHandler non_related_child_handler; - + ChildModule::AMI_ChildInterfaceHandler_var the_child_handler_var = child_handler._this (); - - const char * expectedid = "IDL:child.pragma.prefix/ChildModule/AMI_ChildInterfaceHandler:1.0"; - if (ACE_OS::strcmp (the_child_handler_var->_interface_repository_id (), expectedid) != 0) - { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - ChildModule::repository id is " - "incorrectly generated, received %s\n", - the_child_handler_var->_interface_repository_id ())); - result = 1; - } - + // This handler has no relationship with the above in IDL. AMI_ChildInterfaceHandler_var the_non_related_child_handler_var = non_related_child_handler._this (); - + // Check that both handler objects narrow successfully to their parent // handler types... ParentModule::AMI_ParentInterfaceHandler_var the_parent_handler_var = @@ -105,17 +95,17 @@ main (int argc, char *argv[]) if (CORBA::is_nil (the_parent_handler_var.in ())) { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - Cannot narrow ChildModule::ChildInterface " + ACE_DEBUG ((LM_ERROR, "Error: REGRESSION - Cannot narrow ChildModule::ChildInterface " "reply handler to its parent handler type.\n")); result = 1; } - + AMI_ParentInterfaceHandler_var the_non_related_parent_handler_var = AMI_ParentInterfaceHandler::_narrow (the_non_related_child_handler_var.in ()); if (CORBA::is_nil (the_non_related_parent_handler_var.in ())) { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - Cannot narrow ChildInterface " + ACE_DEBUG ((LM_ERROR, "Error: REGRESSION - Cannot narrow ChildInterface " "reply handler to its parent handler type.\n")); result = 1; } @@ -127,25 +117,25 @@ main (int argc, char *argv[]) if (! CORBA::is_nil (the_parent_handler_var.in ())) { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - ChildModule::ChildInterface reply handler " + ACE_DEBUG ((LM_ERROR, "Error: REGRESSION - ChildModule::ChildInterface reply handler " "narrows to unrelated type.\n")); result = 1; } - + the_non_related_parent_handler_var = AMI_ParentInterfaceHandler::_narrow (the_child_handler_var.in ()); if (! CORBA::is_nil (the_non_related_parent_handler_var.in ())) { - ACE_ERROR ((LM_ERROR, "Error: REGRESSION - ChildModule::ChildInterface reply handler " + ACE_DEBUG ((LM_ERROR, "Error: REGRESSION - ChildModule::ChildInterface reply handler " "narrows to unrelated type.\n")); result = 1; } poa_var->destroy (1,0); - + orb->destroy (); - + } ACE_CATCHANY { diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp index bfa97ea05a1..bfa97ea05a1 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/Hello.cpp +++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h index 429a7e10963..429a7e10963 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/Hello.h +++ b/TAO/tests/ICMG_Any_Bug/Hello.h diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h index ad60160af2d..ad60160af2d 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h +++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp index 3457c09156a..3457c09156a 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/client.cpp +++ b/TAO/tests/ICMG_Any_Bug/client.cpp diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp index e32f495349a..e32f495349a 100644..100755 --- a/TAO/tests/ICMG_Any_Bug/server.cpp +++ b/TAO/tests/ICMG_Any_Bug/server.cpp diff --git a/TAO/tests/IDL_Test/array_only.idl b/TAO/tests/IDL_Test/array_only.idl index bb791128223..bb791128223 100644..100755 --- a/TAO/tests/IDL_Test/array_only.idl +++ b/TAO/tests/IDL_Test/array_only.idl diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp index fc690fa5cf4..fc690fa5cf4 100644..100755 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.h b/TAO/tests/MProfile_Forwarding/Servant_Locator.h index ac226fda180..ac226fda180 100644..100755 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.h +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.h diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp index 04c27ae739f..04c27ae739f 100644..100755 --- a/TAO/tests/MProfile_Forwarding/server.cpp +++ b/TAO/tests/MProfile_Forwarding/server.cpp diff --git a/TAO/tests/MProfile_Forwarding/test.idl b/TAO/tests/MProfile_Forwarding/test.idl index 1f1e6389faf..1f1e6389faf 100644..100755 --- a/TAO/tests/MProfile_Forwarding/test.idl +++ b/TAO/tests/MProfile_Forwarding/test.idl diff --git a/TAO/tests/MProfile_Forwarding/test_i.inl b/TAO/tests/MProfile_Forwarding/test_i.inl index b11bb431e1f..b11bb431e1f 100644..100755 --- a/TAO/tests/MProfile_Forwarding/test_i.inl +++ b/TAO/tests/MProfile_Forwarding/test_i.inl diff --git a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc index ab5cf4db05d..ab5cf4db05d 100644..100755 --- a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc +++ b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc diff --git a/TAO/tests/Permanent_Forward/README b/TAO/tests/Permanent_Forward/README index 283aa20a87d..283aa20a87d 100644..100755 --- a/TAO/tests/Permanent_Forward/README +++ b/TAO/tests/Permanent_Forward/README diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp index 21fbd5409bd..21fbd5409bd 100644..100755 --- a/TAO/tests/Permanent_Forward/StubTest.cpp +++ b/TAO/tests/Permanent_Forward/StubTest.cpp diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index 9341e3addbb..4d98648a2ac 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -115,22 +115,6 @@ main (int argc, char *argv[]) 1); } - // BUG 2656 testing - _get_policy_overrides() should return an empty - // sequence rather than nill. - CORBA::PolicyTypeSeq types; - CORBA::PolicyList_var policies = server->_get_policy_overrides(types); - - if (policies.ptr () == 0) - { - ACE_ERROR ((LM_ERROR, - "(%P|%t) _get_policy_overrides returned nill pointer\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); - } - else - { - CORBA::ULong ListSize = policies->length(); - } - server->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index 0139cdf6672..0139cdf6672 100644..100755 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h index e4b50c40a70..e4b50c40a70 100644..100755 --- a/TAO/tests/QtTests/client.h +++ b/TAO/tests/QtTests/client.h diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index 68ed428b4b6..68ed428b4b6 100644..100755 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp diff --git a/TAO/tests/QtTests/test.idl b/TAO/tests/QtTests/test.idl index 1dc08b44be6..1dc08b44be6 100644..100755 --- a/TAO/tests/QtTests/test.idl +++ b/TAO/tests/QtTests/test.idl diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp index 0d961989108..0d961989108 100644..100755 --- a/TAO/tests/QtTests/test_i.cpp +++ b/TAO/tests/QtTests/test_i.cpp diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h index ac04d36afc9..ac04d36afc9 100644..100755 --- a/TAO/tests/QtTests/test_i.h +++ b/TAO/tests/QtTests/test_i.h diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp index 0b230c0558d..8f0bc9e45ef 100644 --- a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp +++ b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp @@ -8,11 +8,11 @@ * * @author Carlos O'Ryan */ -#include "tao/Bounded_Basic_String_Sequence_T.h" +#include "tao/Bounded_String_Sequence_T.h" #include "tao/CORBA_String.h" CORBA::ULong const MAXIMUM = 42; -typedef TAO::bounded_basic_string_sequence<char, MAXIMUM> s_sequence; +typedef TAO::bounded_string_sequence<MAXIMUM> s_sequence; int main(int,char*[]) { diff --git a/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp b/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp index 02cccf4ba2a..246c46f7e85 100644 --- a/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp +++ b/TAO/tests/Sequence_Unit_Tests/Unbounded_String.cpp @@ -8,10 +8,10 @@ * * @author Carlos O'Ryan */ -#include "tao/Unbounded_Basic_String_Sequence_T.h" +#include "tao/Unbounded_String_Sequence_T.h" #include "tao/CORBA_String.h" -typedef TAO::unbounded_basic_string_sequence<char> s_sequence; +typedef TAO::unbounded_string_sequence s_sequence; int main(int,char*[]) { |