summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/inheritance/AllTests.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/Ice/inheritance/AllTests.cpp')
-rw-r--r--cpp/test/Ice/inheritance/AllTests.cpp20
1 files changed, 18 insertions, 2 deletions
diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp
index b4d6fb14d42..31fcfd902b3 100644
--- a/cpp/test/Ice/inheritance/AllTests.cpp
+++ b/cpp/test/Ice/inheritance/AllTests.cpp
@@ -17,8 +17,25 @@ 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:tcp -p 12345 -t 2000");
Ice::ObjectPrx base = communicator->stringToProxy(ref);
test(base);
cout << "ok" << endl;
@@ -101,7 +118,6 @@ allTests(const Ice::CommunicatorPtr& communicator)
test(cbo == cc);
cco = cc->cc(cc);
test(cco == cc);
-
cout << "ok" << endl;
cout << "ditto, but for interface hierarchy... " << flush;