Bug 2225: Proxy test failed with --threadPerConnection.

6 files changed, 29 insertions, 13 deletions

diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index 841e48a446f..25ae4428034 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -314,6 +314,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
     prop->setProperty(property, "");
 
     property = propertyPrefix + ".ThreadPerConnection";
+    prop->setProperty(property, "0");
+    b1 = communicator->propertyToProxy(propertyPrefix);
     test(!b1->ice_isThreadPerConnection());
     prop->setProperty(property, "1");
     b1 = communicator->propertyToProxy(propertyPrefix);
diff --git a/cs/test/Ice/proxy/AllTests.cs b/cs/test/Ice/proxy/AllTests.cs
index ac2461f9761..bf9d7349b56 100644
--- a/cs/test/Ice/proxy/AllTests.cs
+++ b/cs/test/Ice/proxy/AllTests.cs
@@ -320,6 +320,8 @@ public class AllTests
         prop.setProperty(property, "");
 
         property = propertyPrefix + ".ThreadPerConnection";
+        prop.setProperty(property, "0");
+        b1 = communicator.propertyToProxy(propertyPrefix);
         test(!b1.ice_isThreadPerConnection());
         prop.setProperty(property, "1");
         b1 = communicator.propertyToProxy(propertyPrefix);
diff --git a/java/test/Ice/proxy/AllTests.java b/java/test/Ice/proxy/AllTests.java
index a063b575582..7093b1c45ad 100644
--- a/java/test/Ice/proxy/AllTests.java
+++ b/java/test/Ice/proxy/AllTests.java
@@ -319,6 +319,8 @@ public class AllTests
         prop.setProperty(property, "");
 
         property = propertyPrefix + ".ThreadPerConnection";
+        prop.setProperty(property, "0");
+        b1 = communicator.propertyToProxy(propertyPrefix);
         test(!b1.ice_isThreadPerConnection());
         prop.setProperty(property, "1");
         b1 = communicator.propertyToProxy(propertyPrefix);
diff --git a/php/test/Ice/proxy/Client.php b/php/test/Ice/proxy/Client.php
index 9bf49f64c75..a7512b3f6f7 100644
--- a/php/test/Ice/proxy/Client.php
+++ b/php/test/Ice/proxy/Client.php
@@ -241,19 +241,23 @@ function allTests()
 
     // These two properties don't do anything to direct proxies so
     // first we test that.
-    $property = $propertyPrefix . ".Locator";
-    test(!$b1->ice_getLocator());
-    $ICE->setProperty($property, "locator:default -p 10000");
-    $b1 = $ICE->propertyToProxy($propertyPrefix);
-    test(!$b1->ice_getLocator());
-    $ICE->setProperty($property, "");
-
-    $property = $propertyPrefix . ".LocatorCacheTimeout";
-    test($b1->ice_getLocatorCacheTimeout() == 0);
-    $ICE->setProperty($property, "1");
-    $b1 = $ICE->propertyToProxy($propertyPrefix);
-    test($b1->ice_getLocatorCacheTimeout() == 0);
-    $ICE->setProperty($property, "");
+    //
+    // Commented out because setting a locator or locator cache
+    // timeout on a direct proxy causes warning.
+    //
+    // $property = $propertyPrefix . ".Locator";
+    // test(!$b1->ice_getLocator());
+    // $ICE->setProperty($property, "locator:default -p 10000");
+    // $b1 = $ICE->propertyToProxy($propertyPrefix);
+    // test(!$b1->ice_getLocator());
+    // $ICE->setProperty($property, "");
+
+    // $property = $propertyPrefix . ".LocatorCacheTimeout";
+    // test($b1->ice_getLocatorCacheTimeout() == 0);
+    // $ICE->setProperty($property, "1");
+    // $b1 = $ICE->propertyToProxy($propertyPrefix);
+    // test($b1->ice_getLocatorCacheTimeout() == 0);
+    // $ICE->setProperty($property, "");
 
     // Now retest with an indirect proxy.
     $ICE->setProperty($propertyPrefix, "test");
@@ -319,6 +323,8 @@ function allTests()
     //$ICE->setProperty($property, "");
 
     $property = $propertyPrefix . ".ThreadPerConnection";
+    $ICE->setProperty($property, "0");
+    $b1 = $ICE->propertyToProxy($propertyPrefix);
     test(!$b1->ice_isThreadPerConnection());
     $ICE->setProperty($property, "1");
     $b1 = $ICE->propertyToProxy($propertyPrefix);
diff --git a/py/test/Ice/proxy/AllTests.py b/py/test/Ice/proxy/AllTests.py
index 40c7f154c5d..cd700ff3e38 100644
--- a/py/test/Ice/proxy/AllTests.py
+++ b/py/test/Ice/proxy/AllTests.py
@@ -282,6 +282,8 @@ def allTests(communicator, collocated):
     #prop.setProperty(property, "")
 
     property = propertyPrefix + ".ThreadPerConnection"
+    prop.setProperty(property, "0")
+    b1 = communicator.propertyToProxy(propertyPrefix)
     test(not b1.ice_isThreadPerConnection())
     prop.setProperty(property, "1")
     b1 = communicator.propertyToProxy(propertyPrefix)
diff --git a/rb/test/Ice/proxy/AllTests.rb b/rb/test/Ice/proxy/AllTests.rb
index eeeac40913f..96d37c3a00e 100644
--- a/rb/test/Ice/proxy/AllTests.rb
+++ b/rb/test/Ice/proxy/AllTests.rb
@@ -278,6 +278,8 @@ def allTests(communicator)
     #prop.setProperty(property, "")
 
     property = propertyPrefix + ".ThreadPerConnection"
+    prop.setProperty(property, "0")
+    b1 = communicator.propertyToProxy(propertyPrefix)
     test(!b1.ice_isThreadPerConnection())
     prop.setProperty(property, "1")
     b1 = communicator.propertyToProxy(propertyPrefix)