Added Ice/location & Glacier2/router testing for JS browsers

8 files changed, 22 insertions, 22 deletions

diff --git a/cpp/test/Glacier2/attack/Client.cpp b/cpp/test/Glacier2/attack/Client.cpp
index 69022d72a15..33657b2d717 100644
--- a/cpp/test/Glacier2/attack/Client.cpp
+++ b/cpp/test/Glacier2/attack/Client.cpp
@@ -118,7 +118,7 @@ AttackClient::run(int, char**)
     backend->shutdown();
     communicator()->setDefaultRouter(0);
     ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                        getTestEndpoint(communicator(), 11, "tcp"));
+                                                        getTestEndpoint(communicator(), 11));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(adminBase);
     test(process);
     process->shutdown();
diff --git a/cpp/test/Glacier2/dynamicFiltering/Client.cpp b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
index e29d7afacf5..1c06191e764 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Client.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
@@ -164,7 +164,7 @@ SessionControlClient::run(int argc, char* argv[])
     //
     communicator()->setDefaultRouter(0);
     ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                          getTestEndpoint(communicator(), 11, "tcp"));
+                                                          getTestEndpoint(communicator(), 11));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();
diff --git a/cpp/test/Glacier2/override/Client.cpp b/cpp/test/Glacier2/override/Client.cpp
index 8e351d2d574..60a51659f53 100644
--- a/cpp/test/Glacier2/override/Client.cpp
+++ b/cpp/test/Glacier2/override/Client.cpp
@@ -211,7 +211,7 @@ CallbackClient::run(int, char**)
 
         communicator()->setDefaultRouter(0);
         ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                              getTestEndpoint(communicator(), 11, "tcp"));
+                                                              getTestEndpoint(communicator(), 11));
         Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
         process->shutdown();
         try
diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp
index 1a27a8726c1..bd93abd04cc 100644
--- a/cpp/test/Glacier2/router/Client.cpp
+++ b/cpp/test/Glacier2/router/Client.cpp
@@ -911,7 +911,7 @@ CallbackClient::run(int argc, char* argv[])
         {
             cout << "testing stringToProxy for admin process facet... " << flush;
             processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                        getTestEndpoint(communicator(), 11, "tcp"));
+                                                        getTestEndpoint(communicator(), 11));
             cout << "ok" << endl;
         }
 
diff --git a/cpp/test/Glacier2/sessionControl/Client.cpp b/cpp/test/Glacier2/sessionControl/Client.cpp
index 4c437886367..82f928bf641 100644
--- a/cpp/test/Glacier2/sessionControl/Client.cpp
+++ b/cpp/test/Glacier2/sessionControl/Client.cpp
@@ -103,7 +103,7 @@ SessionControlClient::run(int, char**)
     session->shutdown();
     communicator()->setDefaultRouter(0);
     ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                          getTestEndpoint(communicator(), 11, "tcp"));
+                                                          getTestEndpoint(communicator(), 11));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();
diff --git a/cpp/test/Glacier2/sessionHelper/Client.cpp b/cpp/test/Glacier2/sessionHelper/Client.cpp
index 92bd74ace0d..92186b494e8 100644
--- a/cpp/test/Glacier2/sessionHelper/Client.cpp
+++ b/cpp/test/Glacier2/sessionHelper/Client.cpp
@@ -456,7 +456,7 @@ public:
             {
                 cout << "testing stringToProxy for process object... " << flush;
                 processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                            getTestEndpoint(communicator(), 11, "tcp"));
+                                                            getTestEndpoint(communicator(), 11));
                 cout << "ok" << endl;
             }
 
diff --git a/cpp/test/Glacier2/staticFiltering/Client.cpp b/cpp/test/Glacier2/staticFiltering/Client.cpp
index 64223ab657f..88c379232c1 100644
--- a/cpp/test/Glacier2/staticFiltering/Client.cpp
+++ b/cpp/test/Glacier2/staticFiltering/Client.cpp
@@ -152,7 +152,7 @@ AttackClient::run(int, char**)
     }
 
     ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                          getTestEndpoint(communicator(), 11, "tcp"));
+                                                          getTestEndpoint(communicator(), 11));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();
diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp
index 3a479e23436..148230c9fbf 100644
--- a/cpp/test/Ice/location/AllTests.cpp
+++ b/cpp/test/Ice/location/AllTests.cpp
@@ -73,7 +73,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
     Ice::ObjectPrxPtr base = communicator->stringToProxy("test @ TestAdapter");
     Ice::ObjectPrxPtr base2 = communicator->stringToProxy("test @ TestAdapter");
     Ice::ObjectPrxPtr base3 = communicator->stringToProxy("test");
-    Ice::ObjectPrxPtr base4 = communicator->stringToProxy("ServerManager"); 
+    Ice::ObjectPrxPtr base4 = communicator->stringToProxy("ServerManager");
     Ice::ObjectPrxPtr base5 = communicator->stringToProxy("test2");
     Ice::ObjectPrxPtr base6 = communicator->stringToProxy("test @ ReplicatedAdapter");
     cout << "ok" << endl;
@@ -90,8 +90,8 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
     test(Ice::proxyIdentityEqual(base->ice_getLocator(), anotherLocator));
     communicator->setDefaultLocator(locator);
     base = communicator->stringToProxy("test @ TestAdapter");
-    test(Ice::proxyIdentityEqual(base->ice_getLocator(), communicator->getDefaultLocator())); 
-    
+    test(Ice::proxyIdentityEqual(base->ice_getLocator(), communicator->getDefaultLocator()));
+
     //
     // We also test ice_router/ice_getRouter (perhaps we should add a
     // test/Ice/router test?)
@@ -127,7 +127,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
     TestIntfPrxPtr obj6 = ICE_CHECKED_CAST(TestIntfPrx, base6);
     test(obj6);
     cout << "ok" << endl;
- 
+
     cout << "testing id@AdapterId indirect proxy... " << flush;
     obj->shutdown();
     manager->startServer();
@@ -140,8 +140,8 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
         cerr << ex << endl;
         test(false);
     }
-    cout << "ok" << endl;    
-    
+    cout << "ok" << endl;
+
     cout << "testing id@ReplicaGroupId indirect proxy... " << flush;
     obj->shutdown();
     manager->startServer();
@@ -154,7 +154,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
         cerr << ex << endl;
         test(false);
     }
-    cout << "ok" << endl;    
+    cout << "ok" << endl;
 
     cout << "testing identity indirect proxy... " << flush;
     obj->shutdown();
@@ -296,11 +296,11 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
     count += 2;
     test(count == locator->getRequestCount());
 
-    communicator->stringToProxy("test@TestAdapter")->ice_locatorCacheTimeout(-1)->ice_ping(); 
+    communicator->stringToProxy("test@TestAdapter")->ice_locatorCacheTimeout(-1)->ice_ping();
     test(count == locator->getRequestCount());
     communicator->stringToProxy("test")->ice_locatorCacheTimeout(-1)->ice_ping();
     test(count == locator->getRequestCount());
-    communicator->stringToProxy("test@TestAdapter")->ice_ping(); 
+    communicator->stringToProxy("test@TestAdapter")->ice_ping();
     test(count == locator->getRequestCount());
     communicator->stringToProxy("test")->ice_ping();
     test(count == locator->getRequestCount());
@@ -456,7 +456,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
     {
         test(false);
     }
-    
+
     try
     {
         communicator->stringToProxy("test@TestAdapter3")->ice_locatorCacheTimeout(0)->ice_ping();
@@ -471,7 +471,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
         test(false);
     }
     catch(const Ice::LocalException&)
-    {   
+    {
     }
     registry->setAdapterDirectProxy("TestAdapter3", locator->findAdapterById("TestAdapter"));
     try
@@ -541,7 +541,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
         test(false);
     }
     catch(const Ice::LocalException&)
-    {   
+    {
     }
     try
     {
@@ -560,7 +560,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
     {
         test(false);
     }
-    
+
     registry->addObject(communicator->stringToProxy("test4"));
     try
     {
@@ -696,7 +696,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
 #endif
     string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ?
             "127.0.0.1" : "\"0:0:0:0:0:0:0:1\"";
-        
+
     if(!uwp || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
                   communicator->getProperties()->getProperty("Ice.Default.Protocol") != "wss"))
     {
@@ -715,7 +715,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
             id.name = Ice::generateUUID();
             registry->addObject(adapter->add(ICE_MAKE_SHARED(HelloI), id));
             adapter->activate();
-            
+
             HelloPrxPtr helloPrx = ICE_CHECKED_CAST(HelloPrx, communicator->stringToProxy(communicator->identityToString(id)));
             test(!helloPrx->ice_getConnection());