diff options
Diffstat (limited to 'TAO/tests/Bug_1535_Regression')
-rw-r--r-- | TAO/tests/Bug_1535_Regression/.cvsignore | 1 | ||||
-rw-r--r-- | TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc | 9 | ||||
-rw-r--r-- | TAO/tests/Bug_1535_Regression/Test.idl | 6 | ||||
-rw-r--r-- | TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp | 232 | ||||
-rwxr-xr-x | TAO/tests/Bug_1535_Regression/run_test.pl | 31 |
5 files changed, 0 insertions, 279 deletions
diff --git a/TAO/tests/Bug_1535_Regression/.cvsignore b/TAO/tests/Bug_1535_Regression/.cvsignore deleted file mode 100644 index 4f843084647..00000000000 --- a/TAO/tests/Bug_1535_Regression/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -bug_1535_regression diff --git a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc deleted file mode 100644 index 7d7eaacb597..00000000000 --- a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc +++ /dev/null @@ -1,9 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(bug_1535_regression) : taoserver, utils, minimum_corba { - exename = bug_1535_regression - Source_Files { - bug_1535_regression.cpp - } -} diff --git a/TAO/tests/Bug_1535_Regression/Test.idl b/TAO/tests/Bug_1535_Regression/Test.idl deleted file mode 100644 index c3b752788a4..00000000000 --- a/TAO/tests/Bug_1535_Regression/Test.idl +++ /dev/null @@ -1,6 +0,0 @@ -// $Id$ - -interface Test -{ - void print_hello_world(); -}; diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp deleted file mode 100644 index 1bec57c8fde..00000000000 --- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp +++ /dev/null @@ -1,232 +0,0 @@ -// $Id$ - -#include "TestS.h" -#include "tao/Utils/ORB_Destroyer.h" -#include "tao/Utils/RIR_Narrow.h" -#include "tao/Utils/PolicyList_Destroyer.h" -#include "tao/Utils/Servant_Var.h" - -ACE_RCSID (Bug_1535_Regression, - bug_1535_regression, - "$Id$") - -PortableServer::POA_ptr -create_persistent_POA (PortableServer::POA_ptr parent, - char const * name - ACE_ENV_ARG_DECL) -{ - TAO::Utils::PolicyList_Destroyer plist (3); - plist.length(3); - - plist[0] = - parent->create_lifespan_policy (PortableServer::PERSISTENT - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); - - plist[1] = - parent->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); - - plist[2] = - parent->create_implicit_activation_policy ( - PortableServer::NO_IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); - - PortableServer::POAManager_var mgr = - parent->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); - - return parent->create_POA (name, - mgr.in(), - plist - ACE_ENV_ARG_PARAMETER); -} - -void -test_create_object_before_servant_reactivation ( - CORBA::ORB_ptr orb, - PortableServer::POA_ptr root_poa - ACE_ENV_ARG_DECL) -{ - // Create a persistent POA and then create a reference in it... - PortableServer::POA_var persistent_poa = - create_persistent_POA(root_poa, - "T1" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - - PortableServer::ObjectId_var oid = - PortableServer::string_to_ObjectId ("TestServant"); - - char const * id = _tc_Test->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - CORBA::Object_var object = - persistent_poa->create_reference_with_id ( - oid.in (), - id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if (CORBA::is_nil (object.in ())) - { - ACE_ERROR ((LM_ERROR, - "(%P|%t) nil reference in create_reference_with_id \n")); - - return; - } - - CORBA::String_var ior = - orb->object_to_string (object.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - // Now destroy the POA... - persistent_poa->destroy (true, - true); - - // Now create the POA again... - persistent_poa = - create_persistent_POA (root_poa, - "T1" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - // And try to create the object again... - object = - orb->string_to_object (ior.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if(CORBA::is_nil (object.in ())) - { - ACE_ERROR ((LM_ERROR, - "(%P|%t) nil reference in string_to_object (servant reactivation) \n")); - return; - } - - persistent_poa->destroy (true, - true - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -void -test_create_object_before_POA_reactivation( - CORBA::ORB_ptr orb, - PortableServer::POA_ptr root_poa - ACE_ENV_ARG_DECL) -{ - // Create a persistent POA and then create a reference in it... - PortableServer::POA_var persistent_poa = - create_persistent_POA (root_poa, - "T2" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - PortableServer::ObjectId_var oid = - PortableServer::string_to_ObjectId ("TestServant"); - - char const * id = _tc_Test->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - CORBA::Object_var object = - persistent_poa->create_reference_with_id (oid.in (), - id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if (CORBA::is_nil (object.in ())) - { - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) nil reference in create_reference_with_id \n")); - return; - } - - CORBA::String_var ior = - orb->object_to_string (object.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - // Now destroy the POA... - persistent_poa->destroy (true, - true - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - // And try to create the object again... - object = orb->string_to_object (ior.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if (CORBA::is_nil (object.in ())) - { - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) nil reference in string_to_object (POA reactivation) \n")); - - return; - } - - persistent_poa->destroy (true, - true - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -int -main (int argc, char *argv[]) -{ - ACE_DECLARE_NEW_CORBA_ENV; - - ACE_TRY - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - "" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - TAO::Utils::ORB_Destroyer orb_destroyer (orb.in()); - - PortableServer::POA_var root_poa = - TAO::Utils::RIR_Narrow<PortableServer::POA>::narrow (orb.in (), - "RootPOA" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - test_create_object_before_POA_reactivation (orb.in(), - root_poa.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - test_create_object_before_servant_reactivation (orb.in (), - root_poa.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught a CORBA exception \n"); - return 1; - } - ACE_CATCHALL - { - return 1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (1); - - return 0; -} diff --git a/TAO/tests/Bug_1535_Regression/run_test.pl b/TAO/tests/Bug_1535_Regression/run_test.pl deleted file mode 100755 index 6e368d26fcc..00000000000 --- a/TAO/tests/Bug_1535_Regression/run_test.pl +++ /dev/null @@ -1,31 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib '../../../bin'; -use PerlACE::Run_Test; - -$status = 0; - -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("bug_1535_regression"); -} -else { - $SV = new PerlACE::Process ("bug_1535_regression"); -} - -$SV->Spawn (); - -$server = $SV->WaitKill (10); - -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; - $status = 1; -} - -unlink $iorfile; - -exit $status; |