MultipleConnectionTest.java needed a longer time out.

JNDI URL was missing file://

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@472500 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 13 insertions, 10 deletions

diff --git a/java/client/test/build-module.xml b/java/client/test/build-module.xml
index 043842505d..99643c79a2 100644
--- a/java/client/test/build-module.xml
+++ b/java/client/test/build-module.xml
@@ -23,7 +23,7 @@
 
     <target name="test" depends="build">
         <echo>Client Tests</echo>
-        <junit fork="yes" printsummary="yes" showoutput="true" haltonfailure="yes" timeout="30000">
+        <junit fork="yes" printsummary="yes" showoutput="true" haltonfailure="yes">
             <sysproperty key="amqj.noAutoCreateVMBroker" value="true"/>
             <formatter type="plain"/>
             <classpath refid="module.class.path"/>
@@ -39,7 +39,7 @@
 
     <target name="testreport" depends="build">
         <echo>Client Tests with Report</echo>
-        <junit fork="yes" printsummary="yes" haltonfailure="no" timeout="30000">
+        <junit fork="yes" printsummary="yes" haltonfailure="no" timeout="90000">
             <sysproperty key="amqj.noAutoCreateVMBroker" value="true"/>
             <formatter type="xml" />
             <classpath refid="module.class.path" />
diff --git a/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Bind.java b/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Bind.java
index 899099f706..37fea92426 100644
--- a/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Bind.java
+++ b/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Bind.java
@@ -49,7 +49,8 @@ import java.util.Hashtable;
 class Bind
 {
     public static final String DEFAULT_PROVIDER_FILE_PATH = System.getProperty("java.io.tmpdir") + "/JNDITest" + System.currentTimeMillis();
-    public String PROVIDER_URL = "file://" + DEFAULT_PROVIDER_FILE_PATH;
+    public static final String DEFAULT_PROVIDER_URL = "file://" + DEFAULT_PROVIDER_FILE_PATH;
+    public String PROVIDER_URL = DEFAULT_PROVIDER_URL;
 
     String _connectionFactoryString = "";
 
@@ -60,12 +61,12 @@ class Bind
 
     public Bind() throws NameAlreadyBoundException, NoInitialContextException
     {
-        this(false, DEFAULT_PROVIDER_FILE_PATH);
+        this(false, DEFAULT_PROVIDER_URL);
     }
 
     public Bind(boolean output) throws NameAlreadyBoundException, NoInitialContextException
     {
-        this(output, DEFAULT_PROVIDER_FILE_PATH);
+        this(output, DEFAULT_PROVIDER_URL);
     }
 
     public Bind(boolean output, String providerURL) throws NameAlreadyBoundException, NoInitialContextException
diff --git a/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Lookup.java b/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Lookup.java
index 5000094a14..9be45e0428 100644
--- a/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Lookup.java
+++ b/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Lookup.java
@@ -42,7 +42,8 @@ import java.util.Hashtable;
 class Lookup
 {
     public static final String DEFAULT_PROVIDER_FILE_PATH = System.getProperty("java.io.tmpdir") + "/JNDITest";
-    public String PROVIDER_URL = "file://" + DEFAULT_PROVIDER_FILE_PATH;
+    public static final String DEFAULT_PROVIDER_URL = "file://" + DEFAULT_PROVIDER_FILE_PATH;
+    public String PROVIDER_URL = DEFAULT_PROVIDER_URL;
 
     AMQTopic _topic = null;
     AMQConnection _connection = null;
@@ -52,7 +53,7 @@ class Lookup
 
     public Lookup()
     {
-        this(DEFAULT_PROVIDER_FILE_PATH);
+        this(DEFAULT_PROVIDER_URL);
     }
 
     public Lookup(String providerURL)
diff --git a/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Unbind.java b/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Unbind.java
index a7caec0891..226b7e026d 100644
--- a/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Unbind.java
+++ b/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Unbind.java
@@ -39,18 +39,19 @@ import java.util.Hashtable;
 class Unbind
 {
     public static final String DEFAULT_PROVIDER_FILE_PATH = System.getProperty("java.io.tmpdir") + "/JNDITest" + System.currentTimeMillis();
-    public String PROVIDER_URL = "file://" + DEFAULT_PROVIDER_FILE_PATH;
+    public static final String DEFAULT_PROVIDER_URL = "file://" + DEFAULT_PROVIDER_FILE_PATH;
+    public String PROVIDER_URL = DEFAULT_PROVIDER_URL;
 
     boolean _unbound = false;
 
     public Unbind()
     {
-        this(false, DEFAULT_PROVIDER_FILE_PATH);
+        this(false, DEFAULT_PROVIDER_URL);
     }
 
     public Unbind(Boolean output)
     {
-        this(output, DEFAULT_PROVIDER_FILE_PATH);
+        this(output, DEFAULT_PROVIDER_URL);
     }
 
     public Unbind(String provider)