Ice.DefaultHost, Ice.DefaultProtocol

3 files changed, 3 insertions, 40 deletions

diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index bd2b65646f1..343430d3b57 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -49,27 +49,7 @@ ThrowerPrx
 allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 {
     cout << "testing stringToProxy... " << flush;
-    string ref;
-    
-    Ice::PropertiesPtr properties = communicator->getProperties();
-
-    string protocol = properties->getProperty("Ice.Protocol");
-    string secure;
-
-    if (protocol.empty())
-    {
-        protocol = "tcp";
-    }
-
-    if (protocol.compare("ssl") == 0)
-    {
-        secure = " -s ";
-    }
-
-    string endpts = protocol + " -p 12345 -t 2000";
-
-    ref = "thrower" + secure + ":" + endpts;
-
+    string ref = "thrower:default -p 12345 -t 2000";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp
index c8486e3857a..cb2be202a7d 100644
--- a/cpp/test/Ice/exceptions/Collocated.cpp
+++ b/cpp/test/Ice/exceptions/Collocated.cpp
@@ -16,16 +16,7 @@ using namespace std;
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    Ice::PropertiesPtr properties = communicator->getProperties();
-
-    string protocol = properties->getProperty("Ice.Protocol");
-
-    if (protocol.empty())
-    {
-        protocol = "tcp";
-    }
-
-    string endpts = protocol + " -p 12345 -t 2000";
+    string endpts = "default -p 12345 -t 2000";
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts);
     Ice::ObjectPtr object = new ThrowerI(adapter);
     adapter->add(object, Ice::stringToIdentity("thrower"));
diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp
index 86fdbda3c76..2372531fd5c 100644
--- a/cpp/test/Ice/exceptions/Server.cpp
+++ b/cpp/test/Ice/exceptions/Server.cpp
@@ -17,16 +17,8 @@ int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::PropertiesPtr properties = communicator->getProperties();
-
-    string protocol = properties->getProperty("Ice.Protocol");
-
-    if (protocol.empty())
-    {
-        protocol = "tcp";
-    }
-
     properties->setProperty("Ice.WarnAboutServerExceptions", "0");
-    string endpts = protocol + " -p 12345 -t 2000";
+    string endpts = "default -p 12345 -t 2000";
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts);
     Ice::ObjectPtr object = new ThrowerI(adapter);
     adapter->add(object, Ice::stringToIdentity("thrower"));