1 files changed, 7 insertions, 6 deletions

diff --git a/cpp/test/Ice/background/AllTests.cpp b/cpp/test/Ice/background/AllTests.cpp
index 70a44976b6d..900a611bfa7 100644
--- a/cpp/test/Ice/background/AllTests.cpp
+++ b/cpp/test/Ice/background/AllTests.cpp
@@ -202,13 +202,14 @@ void readWriteTests(const ConfigurationPtr&, const Test::BackgroundPrx&, const T
 BackgroundPrx
 allTests(const Ice::CommunicatorPtr& communicator)
 {
-    string sref = "background:default -p 12010";
+    const string endp = getTestEndpoint(communicator, 0);
+    string sref = "background:" + endp;
     Ice::ObjectPrx obj = communicator->stringToProxy(sref);
     test(obj);
 
     BackgroundPrx background = BackgroundPrx::uncheckedCast(obj);
 
-    sref = "backgroundController:tcp -p 12011";
+    sref = "backgroundController:" + getTestEndpoint(communicator, 1, "tcp");
     obj = communicator->stringToProxy(sref);
     test(obj);
 
@@ -245,7 +246,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cout << "testing locator... " << flush;
     {
         Ice::LocatorPrx locator;
-        obj = communicator->stringToProxy("locator:default -p 12010")->ice_invocationTimeout(250);
+        obj = communicator->stringToProxy("locator:" + endp)->ice_invocationTimeout(250);
         locator = Ice::LocatorPrx::uncheckedCast(obj);
         obj = communicator->stringToProxy("background@Test")->ice_locator(locator)->ice_oneway();
 
@@ -260,7 +261,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         backgroundController->resumeCall("findAdapterById");
 
-        obj = communicator->stringToProxy("locator:default -p 12010");
+        obj = communicator->stringToProxy("locator:" + endp);
         locator = Ice::LocatorPrx::uncheckedCast(obj);
         obj = obj->ice_locator(locator);
         obj->ice_ping();
@@ -285,7 +286,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     {
         Ice::RouterPrx router;
 
-        obj = communicator->stringToProxy("router:default -p 12010")->ice_invocationTimeout(250);
+        obj = communicator->stringToProxy("router:" + endp)->ice_invocationTimeout(250);
         router = Ice::RouterPrx::uncheckedCast(obj);
         obj = communicator->stringToProxy("background@Test")->ice_router(router)->ice_oneway();
 
@@ -300,7 +301,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         backgroundController->resumeCall("getClientProxy");
 
-        obj = communicator->stringToProxy("router:default -p 12010");
+        obj = communicator->stringToProxy("router:" + endp);
         router = Ice::RouterPrx::uncheckedCast(obj);
         obj = communicator->stringToProxy("background@Test")->ice_router(router);
         BackgroundPrx bg = BackgroundPrx::uncheckedCast(obj);