Ice.DefaultHost, Ice.DefaultProtocol

3 files changed, 3 insertions, 39 deletions

diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp
index 31fcfd902b3..89efb521eb3 100644
--- a/cpp/test/Ice/inheritance/AllTests.cpp
+++ b/cpp/test/Ice/inheritance/AllTests.cpp
@@ -17,25 +17,8 @@ using namespace std;
 InitialPrx
 allTests(const Ice::CommunicatorPtr& communicator)
 {
-    Ice::PropertiesPtr properties = communicator->getProperties();
-
-    string protocol = properties->getProperty("Ice.Protocol");
-
-    if (protocol.empty())
-    {
-        protocol = "tcp";
-    }
-
-    string secureFlag;
-
-    if (!protocol.compare("ssl"))
-    {
-        secureFlag = " -s ";
-    }
-
-    string ref = "initial" + secureFlag + ":" + protocol + " -p 12345 -t 2000";
-
     cout << "testing stringToProxy... " << flush;
+    string ref = "initial:default -p 12345 -t 2000";
     Ice::ObjectPrx base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp
index 30a39fc3ad8..30dfc6b7233 100644
--- a/cpp/test/Ice/inheritance/Collocated.cpp
+++ b/cpp/test/Ice/inheritance/Collocated.cpp
@@ -16,17 +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 InitialI(adapter);
     adapter->add(object, Ice::stringToIdentity("initial"));
diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp
index 3d1a3ab494d..72c3d71a759 100644
--- a/cpp/test/Ice/inheritance/Server.cpp
+++ b/cpp/test/Ice/inheritance/Server.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 InitialI(adapter);
     adapter->add(object, Ice::stringToIdentity("initial"));