From 98018f2daea7abdc9848684b2cd1c329e4dd384e Mon Sep 17 00:00:00 2001 From: marina Date: Sat, 14 Oct 2000 03:42:31 +0000 Subject: ChangeLogTag:Fri Oct 13 21:35:52 2000 Marina Spivak --- TAO/tests/RTCORBA/Client_Protocol/client.cpp | 6 +++++- TAO/tests/RTCORBA/Client_Protocol/run_test.pl | 8 ++++---- TAO/tests/RTCORBA/Client_Protocol/server.cpp | 6 ++---- TAO/tests/RTCORBA/Makefile | 3 ++- TAO/tests/RTCORBA/Makefile.bor | 3 ++- TAO/tests/RTCORBA/README | 5 +++++ 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp index 2cf491809b5..7f0ec058b9b 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp @@ -113,7 +113,7 @@ main (int argc, char *argv[]) return 1; // PolicyManager. - object = orb->resolve_initial_references ("PolicyManager", + object = orb->resolve_initial_references ("ORBPolicyManager", ACE_TRY_ENV); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = @@ -243,6 +243,10 @@ main (int argc, char *argv[]) ACE_TRY_ENV); ACE_TRY_CHECK; + server2->test_method (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Testing over. Shut down server ORB. server2->shutdown (ACE_TRY_ENV); ACE_TRY_CHECK; } diff --git a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl index 4408740a6b6..ea6069f574e 100755 --- a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl +++ b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl @@ -15,17 +15,17 @@ $iorfile2 = "$cwd$DIR_SEPARATOR" . "test2.ior"; ACE::checkForTarget($cwd); -print STDERR "********** RTCORBA Client Protocol Policy Unit Test\n\n"; +print STDERR "\n********** RTCORBA Client Protocol Policy Unit Test\n\n"; unlink $iorfile1; unlink $iorfile2; # Arguments are platform-dependent (UIOP not available on Windows). $server_args = - "-s $iorfile1 -c $iorfile2 -p 1413566208 " + "-s $iorfile1 -c $iorfile2 -p 1413566208 -ORBdebuglevel 3" ."-ORBendpoint iiop:// -ORBendpoint shmiop:// -ORBEndpoint uiop://"; $client_args = - "-s file://$iorfile1 -c file://$iorfile2 -p 1413566210 -ORBdebuglevel 1"; + "-s file://$iorfile1 -c file://$iorfile2 -p 1413566210"; if ($^O eq "MSWin32") { @@ -33,7 +33,7 @@ $server_args = "-s $iorfile1 -c $iorfile2 -p 1413566210 " ."-ORBendpoint iiop:// -ORBendpoint shmiop://"; $client_args = - "-s file://$iorfile1 -c file://$iorfile2 -p 1413566210 -ORBdebuglevel 1"; + "-s file://$iorfile1 -c file://$iorfile2 -p 1413566210 -ORBdebuglevel 3"; } # Start server. diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp index 1d0c37f9241..47ae541b919 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp @@ -32,7 +32,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (CORBA::Environment& ACE_TRY_ENV) +Test_i::test_method (CORBA::Environment& /*ACE_TRY_ENV*/) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -43,8 +43,6 @@ void Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_DEBUG ((LM_DEBUG, - "Received request to shut down the ORB\n")); this->orb_->shutdown (0, ACE_TRY_ENV); } @@ -234,7 +232,7 @@ main (int argc, char *argv[]) orb->run (ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); + ACE_DEBUG ((LM_DEBUG, "\nServer ORB event loop finished\n\n")); } ACE_CATCHANY { diff --git a/TAO/tests/RTCORBA/Makefile b/TAO/tests/RTCORBA/Makefile index 8fdb85248ba..45efde99ffd 100644 --- a/TAO/tests/RTCORBA/Makefile +++ b/TAO/tests/RTCORBA/Makefile @@ -11,7 +11,8 @@ #---------------------------------------------------------------------------- DIRS = Client_Propagated \ - Server_Protocol + Server_Protocol \ + Client_Protocol ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/tests/RTCORBA/Makefile.bor b/TAO/tests/RTCORBA/Makefile.bor index 7ee96f0290e..1818cb4c629 100644 --- a/TAO/tests/RTCORBA/Makefile.bor +++ b/TAO/tests/RTCORBA/Makefile.bor @@ -4,6 +4,7 @@ DIRS = \ Client_Propagated \ - Server_Protocol + Server_Protocol \ + Client_Protocol !include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/RTCORBA/README b/TAO/tests/RTCORBA/README index 1be8be1db57..c1a3a823805 100644 --- a/TAO/tests/RTCORBA/README +++ b/TAO/tests/RTCORBA/README @@ -20,3 +20,8 @@ on the corresponding test. List of tests: Tests various settings of RTCORBA::ServerProtocolPolicy. + + . Client_Protocol + + Tests various settings of + RTCORBA::ClientProtocolPolicy. -- cgit v1.2.1