more glacier2 tests

1 files changed, 203 insertions, 71 deletions

diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp
index e3b32e163ef..1e8b69ee932 100644
--- a/cpp/test/Glacier2/router/Client.cpp
+++ b/cpp/test/Glacier2/router/Client.cpp
@@ -33,62 +33,162 @@ main(int argc, char* argv[])
 int
 CallbackClient::run(int argc, char* argv[])
 {
-    ObjectAdapterPtr adapter = communicator()->createObjectAdapterWithEndpoints("CallbackReceiverAdapter", "");
-    adapter->activate();
-    // Put the print statement after activate(), so that if
-    // Ice.PrintAdapterReady is set, the "ready" is the first output
-    // from the client, and not the print statement below. Otherwise
-    // the Python test scripts will be confused, as they expect the
-    // "ready" from the Object Adapter to be the first thing that is
-    // printed.
-    cout << "creating and activating callback receiver adapter... " << flush;
-    cout << "ok" << endl;
-
-    cout << "testing stringToProxy for router... " << flush;
-    ObjectPrx routerBase = communicator()->stringToProxy("abc/def:default -p 12346 -t 30000");
-    cout << "ok" << endl;
-
-    cout << "testing checked cast for router... " << flush;
-    Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
-    test(router);
-    cout << "ok" << endl;
-
-    cout << "creating session with router... " << flush;
-    Glacier2::SessionPrx session = router->createSession("dummy", "abc123");
-    cout << "ok" << endl;
-
-    cout << "installing router with communicator... " << flush;
-    communicator()->setDefaultRouter(router);
-    cout << "ok" << endl;
-
-    cout << "installing router with object adapter... " << flush;
-    adapter->addRouter(router);
-    cout << "ok" << endl;
-
-    cout << "getting category from router... " << flush;
-    string category = router->getServerProxy()->ice_getIdentity().category;
-    cout << "ok" << endl;
-
-    cout << "creating and adding callback receiver object... " << flush;
-    CallbackReceiverI* callbackReceiverImpl = new CallbackReceiverI;
-    ObjectPtr callbackReceiver = callbackReceiverImpl;
-    Identity callbackReceiverIdent;
-    callbackReceiverIdent.name = "callbackReceiver";
-    callbackReceiverIdent.category = category;
-    CallbackReceiverPrx twowayR = CallbackReceiverPrx::uncheckedCast(
-	adapter->add(callbackReceiver, callbackReceiverIdent));
-    cout << "ok" << endl;
-
-    cout << "testing stringToProxy... " << flush;
-    ObjectPrx base = communicator()->stringToProxy("callback:tcp -p 12345 -t 10000");
-    cout << "ok" << endl;
-
-    cout << "testing checked cast... " << flush;
-    CallbackPrx twoway = CallbackPrx::checkedCast(base);
-    test(twoway);
-    cout << "ok" << endl;
+    ObjectAdapterPtr adapter;
+
+    {
+	adapter = communicator()->createObjectAdapterWithEndpoints("CallbackReceiverAdapter", "");
+	adapter->activate();
+	// Put the print statement after activate(), so that if
+	// Ice.PrintAdapterReady is set, the "ready" is the first
+	// output from the client, and not the print statement
+	// below. Otherwise the Python test scripts will be confused,
+	// as they expect the "ready" from the Object Adapter to be
+	// the first thing that is printed.
+	cout << "creating and activating callback receiver adapter... " << flush;
+	cout << "ok" << endl;
+    }
+
+    ObjectPrx routerBase;
+
+    {
+	cout << "testing stringToProxy for router... " << flush;
+	routerBase = communicator()->stringToProxy("abc/def:default -p 12346 -t 30000");
+	cout << "ok" << endl;
+    }
+    
+    Glacier2::RouterPrx router;
+
+    {
+	cout << "testing checked cast for router... " << flush;
+	router = Glacier2::RouterPrx::checkedCast(routerBase);
+	test(router);
+	cout << "ok" << endl;
+    }
+
+    {
+	cout << "installing router with communicator... " << flush;
+	communicator()->setDefaultRouter(router);
+	cout << "ok" << endl;
+    }
+
+    ObjectPrx base;
+
+    {
+	cout << "testing stringToProxy for server object... " << flush;
+	base = communicator()->stringToProxy("callback:tcp -p 12345 -t 10000");
+	cout << "ok" << endl;
+    }
 	
     {
+	cout << "trying to ping server before session creation... " << flush;
+	try
+	{
+	    base->ice_ping();
+	    test(false);
+	}
+	catch(const ObjectNotExistException&)
+	{
+	    cout << "ok" << endl;
+	}
+    }
+
+    Glacier2::SessionPrx session;
+
+    {
+	cout << "trying to create session with wrong password... " << flush;
+	try
+	{
+	    session = router->createSession("dummy", "xxx");
+	    test(false);
+	}
+	catch(const Glacier2::PermissionDeniedException&)
+	{
+	    cout << "ok" << endl;
+	}
+    }
+
+    {
+	cout << "trying to destroy non-existing session... " << flush;
+	try
+	{
+	    router->destroySession();
+	    test(false);
+	}
+	catch(const Glacier2::SessionNotExistException&)
+	{
+	    cout << "ok" << endl;
+	}
+    }
+
+    {
+	cout << "creating session with correct password... " << flush;
+	session = router->createSession("dummy", "abc123");
+	cout << "ok" << endl;
+    }
+
+    {
+	cout << "trying to create a second session... " << flush;
+	try
+	{
+	    router->createSession("dummy", "abc123");
+	    test(false);
+	}
+	catch(const Glacier2::SessionExistsException&)
+	{
+	    cout << "ok" << endl;
+	}
+    }
+
+    {
+	cout << "pinging server after session creation... " << flush;
+	base->ice_ping();
+	cout << "ok" << endl;
+    }
+
+    CallbackPrx twoway;
+
+    {
+	cout << "testing checked cast for server object... " << flush;
+	twoway = CallbackPrx::checkedCast(base);
+	test(twoway);
+	cout << "ok" << endl;
+    }
+
+    {
+	cout << "installing router with object adapter... " << flush;
+	adapter->addRouter(router);
+	cout << "ok" << endl;
+    }
+
+    string category;
+
+    {
+	cout << "getting category from router... " << flush;
+	category = router->getServerProxy()->ice_getIdentity().category;
+	cout << "ok" << endl;
+    }
+
+    CallbackReceiverI* callbackReceiverImpl;
+    ObjectPtr callbackReceiver;
+    CallbackReceiverPrx twowayR;
+    CallbackReceiverPrx fakeTwowayR;
+    
+    {
+	cout << "creating and adding callback receiver object... " << flush;
+	callbackReceiverImpl = new CallbackReceiverI;
+	callbackReceiver = callbackReceiverImpl;
+	Identity callbackReceiverIdent;
+	callbackReceiverIdent.name = "callbackReceiver";
+	callbackReceiverIdent.category = category;
+	twowayR = CallbackReceiverPrx::uncheckedCast(adapter->add(callbackReceiver, callbackReceiverIdent));
+	Identity fakeCallbackReceiverIdent;
+	fakeCallbackReceiverIdent.name = "callbackReceiver";
+	fakeCallbackReceiverIdent.category = "dummy";
+	fakeTwowayR = CallbackReceiverPrx::uncheckedCast(adapter->add(callbackReceiver, fakeCallbackReceiverIdent));
+	cout << "ok" << endl;
+    }
+    
+    {
 	cout << "testing oneway callback... " << flush;
 	CallbackPrx oneway = CallbackPrx::uncheckedCast(twoway->ice_oneway());
 	CallbackReceiverPrx onewayR = CallbackReceiverPrx::uncheckedCast(twowayR->ice_oneway());
@@ -126,28 +226,60 @@ CallbackClient::run(int argc, char* argv[])
 	cout << "ok" << endl;
     }
 
-    cout << "testing server shutdown... " << flush;
-    twoway->shutdown();
-    // No ping, otherwise the router prints a warning message if it's
-    // started with --Ice.Warn.Connections.
-    cout << "ok" << endl;
-    /*
-    try
     {
-	twoway->ice_ping();
-	test(false);
+	cout << "trying twoway callback with fake category... " << flush;
+	Context context;
+	context["_fwd"] = "t";
+	try
+	{
+	    twoway->initiateCallback(fakeTwowayR, context);
+	    test(false);
+	}
+	catch(const ObjectNotExistException&)
+	{
+	    cout << "ok" << endl;
+	}
+    }
+
+    {
+	cout << "testing server shutdown... " << flush;
+	twoway->shutdown();
+	// No ping, otherwise the router prints a warning message if it's
+	// started with --Ice.Warn.Connections.
+	cout << "ok" << endl;
+	/*
+	  try
+	  {
+	  base->ice_ping();
+	  test(false);
+	  }
+	  // If we use the glacier router, the exact exception reason gets
+	  // lost.
+	  catch(const UnknownLocalException&)
+	  {
+	  cout << "ok" << endl;
+	  }
+	*/
     }
-    // If we use the glacier router, the exact exception reason gets
-    // lost.
-    catch(const UnknownLocalException&)
+    
     {
+	cout << "destroying session... " << flush;
+	router->destroySession();
 	cout << "ok" << endl;
     }
-    */
-
-    cout << "destroying session with router... " << flush;
-    router->destroySession();
-    cout << "ok" << endl;
+    
+    {
+	cout << "trying to ping server after session destruction... " << flush;
+	try
+	{
+	    base->ice_ping();
+	    test(false);
+	}
+	catch(const ObjectNotExistException&)
+	{
+	    cout << "ok" << endl;
+	}
+    }
 
     return EXIT_SUCCESS;
 }