diff options
author | Jose <jose@zeroc.com> | 2009-01-26 18:59:37 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2009-01-26 18:59:37 +0100 |
commit | 4cee2e16bafdd11f4a5ad2f35d75eb869b2c72fa (patch) | |
tree | 7186aa9148abf547da8b4ec81b1af57e8b496ee9 | |
parent | Minor fix (diff) | |
download | ice-4cee2e16bafdd11f4a5ad2f35d75eb869b2c72fa.tar.bz2 ice-4cee2e16bafdd11f4a5ad2f35d75eb869b2c72fa.tar.xz ice-4cee2e16bafdd11f4a5ad2f35d75eb869b2c72fa.zip |
Squashed commit of the following:
commit 383ca2a6cdde92fc538b056548d8cea7e3eb83a8
Author: Jose Gutierrez <jose@zeroc.com>
Date: Mon Jan 26 18:53:56 2009 +0100
3655 - fixed test/Ice/adapterDeactivation/AllTests.cpp to use system assigned ports
-rw-r--r-- | cpp/test/Ice/adapterDeactivation/AllTests.cpp | 6 | ||||
-rw-r--r-- | cs/test/Ice/adapterDeactivation/AllTests.cs | 6 | ||||
-rw-r--r-- | java/test/Ice/adapterDeactivation/AllTests.java | 6 | ||||
-rw-r--r-- | py/test/Ice/adapterDeactivation/AllTests.py | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp index a9d206f5189..03fba86f2f3 100644 --- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp +++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp @@ -32,10 +32,10 @@ allTests(const CommunicatorPtr& communicator) { cout << "creating/destroying/recreating object adapter... " << flush; ObjectAdapterPtr adapter = - communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999"); + communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default"); try { - communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9998"); + communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default"); test(false); } catch(const AlreadyRegisteredException&) @@ -46,7 +46,7 @@ allTests(const CommunicatorPtr& communicator) // // Use a different port than the first adapter to avoid an "address already in use" error. // - adapter = communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9998"); + adapter = communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default"); adapter->destroy(); cout << "ok" << endl; } diff --git a/cs/test/Ice/adapterDeactivation/AllTests.cs b/cs/test/Ice/adapterDeactivation/AllTests.cs index e7aac6b42c0..5d671b9721c 100644 --- a/cs/test/Ice/adapterDeactivation/AllTests.cs +++ b/cs/test/Ice/adapterDeactivation/AllTests.cs @@ -40,10 +40,10 @@ public class AllTests Console.Out.Write("creating/destroying/recreating object adapter... "); Console.Out.Flush(); Ice.ObjectAdapter adapter = - communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999"); + communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default"); try { - communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9998"); + communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default"); test(false); } catch(Ice.AlreadyRegisteredException) @@ -54,7 +54,7 @@ public class AllTests // // Use a different port than the first adapter to avoid an "address already in use" error. // - adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9998"); + adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default"); adapter.destroy(); Console.Out.WriteLine("ok"); } diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/Ice/adapterDeactivation/AllTests.java index ae26e279b06..1a4f0220731 100644 --- a/java/test/Ice/adapterDeactivation/AllTests.java +++ b/java/test/Ice/adapterDeactivation/AllTests.java @@ -41,10 +41,10 @@ public class AllTests System.out.print("creating/destroying/recreating object adapter... "); System.out.flush(); Ice.ObjectAdapter adapter = - communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999"); + communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default"); try { - communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9998"); + communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default"); test(false); } catch(Ice.AlreadyRegisteredException ex) @@ -54,7 +54,7 @@ public class AllTests // // Use a different port than the first adapter to avoid an "address already in use" error. // - adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9998"); + adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default"); adapter.destroy(); System.out.println("ok"); } diff --git a/py/test/Ice/adapterDeactivation/AllTests.py b/py/test/Ice/adapterDeactivation/AllTests.py index 1ce76ebc10f..a4f8327ce79 100644 --- a/py/test/Ice/adapterDeactivation/AllTests.py +++ b/py/test/Ice/adapterDeactivation/AllTests.py @@ -29,15 +29,15 @@ def allTests(communicator): print "creating/destroying/recreating object adapter... ", sys.stdout.flush() - adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999") + adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default") try: - communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9998") + communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default") test(False) except Ice.LocalException: pass adapter.destroy() - adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9998") + adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default") adapter.destroy() print "ok" |