Merge pull request RemedyIT#382 from jwillemsen/jwi-currentests

Extend PI tests
jwillemsen · May 3, 2024 · 69a582d · 69a582d
2 parents 8177f77 + 8f66cf3
commit 69a582d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/tests/pi/current/server_orb_initializer.cpp b/tests/pi/current/server_orb_initializer.cpp
@@ -46,17 +46,20 @@ ServerORBInitializer::post_init (
   ::slot_id = info->allocate_slot_id ();
 
   IDL::traits<PortableInterceptor::ServerRequestInterceptor>::ref_type server_interceptor =
-      CORBA::make_reference<ServerRequestInterceptor> (
-          ::slot_id,
-          pi_current);
+      CORBA::make_reference<ServerRequestInterceptor> (::slot_id, pi_current);
 
-  info->add_server_request_interceptor (server_interceptor);
+  IDL::traits<PortableInterceptor::ServerRequestInterceptor>::ref_type server_interceptor2 =
+    IDL::traits<PortableInterceptor::ServerRequestInterceptor>::narrow (server_interceptor);
+
+  info->add_server_request_interceptor (server_interceptor2);
 
   IDL::traits<PortableInterceptor::ClientRequestInterceptor>::ref_type client_interceptor =
-      CORBA::make_reference<ClientRequestInterceptor2> (
-          ::slot_id);
+      CORBA::make_reference<ClientRequestInterceptor2> (::slot_id);
+
+  IDL::traits<PortableInterceptor::ClientRequestInterceptor>::ref_type client_interceptor2 =
+    IDL::traits<PortableInterceptor::ClientRequestInterceptor>::narrow (client_interceptor);
 
-  info->add_client_request_interceptor (client_interceptor);
+  info->add_client_request_interceptor (client_interceptor2);
 
 //  // Disable collocation -- TAO-specific!!!
 //  //

diff --git a/tests/pi/current/server_request_interceptor.cpp b/tests/pi/current/server_request_interceptor.cpp
@@ -35,7 +35,7 @@ ServerRequestInterceptor::receive_request_service_contexts (
 {
   TAOX11_TEST_INFO << "ServerRequestInterceptor::receive_request_service_contexts (" << ri->operation () << ")" << std::endl;
 
-  std::string op = ri->operation ();
+  std::string const op = ri->operation ();
 
   if (op != "invoke_me")
     return; // Don't mess with PICurrent if not invoking test method.
@@ -70,6 +70,10 @@ ServerRequestInterceptor::receive_request (
 
   try
   {
+    CORBA::OctetSeq const ai = ri->adapter_id ();
+    PortableInterceptor::ObjectId const oi = ri->object_id ();
+    IDL::traits<PortableInterceptor::ServerRequestInfo>::ref_type narrow_ri = IDL::traits<PortableInterceptor::ServerRequestInfo>::narrow (ri);
+
     CORBA::Any new_data;
     uint32_t number = 19;
     new_data <<= number;