Author: ritchiem
Date: Wed Nov 8 05:46:51 2006
New Revision: 472492
URL: http://svn.apache.org/viewvc?view=rev&rev=472492
Log:
Fixed last few issues with the unit tests.
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Bind.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/JNDIReferenceableTest.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Lookup.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Unbind.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/transacted/TransactedTest.java
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/connection/ConnectionTest.java?view=diff&rev=472492&r1=472491&r2=472492
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
Wed Nov 8 05:46:51 2006
@@ -74,7 +74,8 @@
}
}
- @Test @Ignore //fixme The inVM broker currently has no authentication ..
need a way to add it
+ @Ignore("The inVM broker currently has no authentication .. Needs added
QPID-")
+ @Test
public void passwordFailureConnection() throws Exception
{
try
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java?view=diff&rev=472492&r1=472491&r2=472492
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
Wed Nov 8 05:46:51 2006
@@ -324,7 +324,8 @@
Assert.assertTrue(connectionurl.getBrokerCount() == 1);
}
- @Test @Ignore //FIXME Connection now parses but result is wrong
+ @Ignore("Connection now parses but result is wrong QPID-")
+ @Test
public void wrongOptionSeperatorInBroker()
{
String url =
"amqp://user:@/test?brokerlist='tcp://localhost:5672+option='value''";
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java?view=diff&rev=472492&r1=472491&r2=472492
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
Wed Nov 8 05:46:51 2006
@@ -23,6 +23,8 @@
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.url.URLSyntaxException;
import org.junit.Before;
import org.junit.Test;
import org.junit.Assert;
@@ -69,6 +71,12 @@
TransportConnection.killVMBroker(1);
}
+
+ public ObjectMessageTest() throws Exception
+ {
+ this(new AMQConnection("vm://:1", "guest", "guest",
randomize("Client"), "/test_path"));
+ }
+
ObjectMessageTest(String broker) throws Exception
{
this(new AMQConnection(broker, "guest", "guest", randomize("Client"),
"/test_path"));
@@ -290,4 +298,8 @@
return in + System.currentTimeMillis();
}
+ public static junit.framework.Test suite()
+ {
+ return new JUnit4TestAdapter(ObjectMessageTest.class);
+ }
}
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Bind.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Bind.java?view=diff&rev=472492&r1=472491&r2=472492
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Bind.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Bind.java
Wed Nov 8 05:46:51 2006
@@ -49,7 +49,7 @@
class Bind
{
public static final String DEFAULT_PROVIDER_FILE_PATH =
System.getProperty("java.io.tmpdir") + "/JNDITest" + System.currentTimeMillis();
- public static final String PROVIDER_URL = "file://" +
DEFAULT_PROVIDER_FILE_PATH;
+ public String PROVIDER_URL = "file://" + DEFAULT_PROVIDER_FILE_PATH;
String _connectionFactoryString = "";
@@ -60,15 +60,24 @@
public Bind() throws NameAlreadyBoundException, NoInitialContextException
{
- this(false);
+ this(false, DEFAULT_PROVIDER_FILE_PATH);
}
public Bind(boolean output) throws NameAlreadyBoundException,
NoInitialContextException
{
+ this(output, DEFAULT_PROVIDER_FILE_PATH);
+ }
+
+ public Bind(boolean output, String providerURL) throws
NameAlreadyBoundException, NoInitialContextException
+ {
+ PROVIDER_URL = providerURL;
+
// Set up the environment for creating the initial context
Hashtable env = new Hashtable(11);
env.put(Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.fscontext.RefFSContextFactory");
+
+
env.put(Context.PROVIDER_URL, PROVIDER_URL);
@@ -184,22 +193,49 @@
public String connectionFactoryValue()
{
- return _connectionFactoryString;
+ if (_connectionFactoryString != null)
+ {
+ return _connectionFactoryString;
+ }
+ else
+ {
+ return "";
+ }
}
public String connectionValue()
{
- return _connectionString;
+ if (_connectionString != null)
+ {
+ return _connectionString;
+ }
+ else
+ {
+ return "";
+ }
}
public String topicValue()
{
- return ((AMQTopic) _topic).toURL();
+ if (_topic != null)
+ {
+ return ((AMQTopic) _topic).toURL();
+ }
+ else
+ {
+ return "";
+ }
+
}
public boolean bound()
{
return _bound;
+ }
+
+ public String getProviderURL()
+ {
+ return PROVIDER_URL;
}
public static void main(String[] args) throws NameAlreadyBoundException,
NoInitialContextException
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/JNDIReferenceableTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/JNDIReferenceableTest.java?view=diff&rev=472492&r1=472491&r2=472492
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/JNDIReferenceableTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/JNDIReferenceableTest.java
Wed Nov 8 05:46:51 2006
@@ -100,8 +100,8 @@
}
Assert.assertTrue(b.bound());
-
- Lookup l = new Lookup();
+
+ Lookup l = new Lookup(b.getProviderURL());
Assert.assertTrue(l.connectionFactoryValue().equals(b.connectionFactoryValue()));
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Lookup.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Lookup.java?view=diff&rev=472492&r1=472491&r2=472492
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Lookup.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Lookup.java
Wed Nov 8 05:46:51 2006
@@ -42,19 +42,29 @@
class Lookup
{
public static final String DEFAULT_PROVIDER_FILE_PATH =
System.getProperty("java.io.tmpdir") + "/JNDITest";
- public static final String PROVIDER_URL = "file://" +
DEFAULT_PROVIDER_FILE_PATH;
+ public String PROVIDER_URL = "file://" + DEFAULT_PROVIDER_FILE_PATH;
AMQTopic _topic = null;
AMQConnection _connection = null;
AMQConnectionFactory _connectionFactory = null;
private String _connectionURL;
+
public Lookup()
{
+ this(DEFAULT_PROVIDER_FILE_PATH);
+ }
+
+ public Lookup(String providerURL)
+ {
+
+ PROVIDER_URL = providerURL;
+
// Set up the environment for creating the initial context
Hashtable env = new Hashtable(11);
env.put(Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.fscontext.RefFSContextFactory");
+
env.put(Context.PROVIDER_URL, PROVIDER_URL);
File file = new
File(PROVIDER_URL.substring(PROVIDER_URL.indexOf("://") + 3));
@@ -115,17 +125,34 @@
public String connectionFactoryValue()
{
- return _connectionFactory.getConnectionURL().toString();
+ if (_connectionFactory != null)
+ {
+ return _connectionFactory.getConnectionURL().toString();
+ }
+ return "";
}
public String connectionValue()
{
- return _connectionURL;
+ if (_connectionURL != null)
+ {
+ return _connectionURL;
+ }
+ return "";
}
public String topicValue()
{
- return _topic.toURL();
+ if (_topic != null)
+ {
+ return _topic.toURL();
+ }
+ return "";
+ }
+
+ public String getProviderURL()
+ {
+ return PROVIDER_URL;
}
public static void main(String[] args)
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Unbind.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Unbind.java?view=diff&rev=472492&r1=472491&r2=472492
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Unbind.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/jndi/referenceabletest/Unbind.java
Wed Nov 8 05:46:51 2006
@@ -38,18 +38,29 @@
*/
class Unbind
{
- public static final String DEFAULT_PROVIDER_FILE_PATH =
System.getProperty("java.io.tmpdir") + "/JNDITest";
- public static final String PROVIDER_URL = "file://" +
DEFAULT_PROVIDER_FILE_PATH;
+ 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;
boolean _unbound = false;
public Unbind()
{
- this(false);
+ this(false, DEFAULT_PROVIDER_FILE_PATH);
}
- public Unbind(boolean output)
+ public Unbind(Boolean output)
{
+ this(output, DEFAULT_PROVIDER_FILE_PATH);
+ }
+
+ public Unbind(String provider)
+ {
+ this(false, provider);
+ }
+
+ public Unbind(boolean output, String providerURL)
+ {
+ PROVIDER_URL = providerURL;
// Set up the environment for creating the initial context
Hashtable env = new Hashtable(11);
env.put(Context.INITIAL_CONTEXT_FACTORY,
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/transacted/TransactedTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/transacted/TransactedTest.java?view=diff&rev=472492&r1=472491&r2=472492
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/transacted/TransactedTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/test/unit/transacted/TransactedTest.java
Wed Nov 8 05:46:51 2006
@@ -48,7 +48,7 @@
private Session prepSession;
private MessageProducer prepProducer1;
- private AMQConnection testCon;
+ private AMQConnection testCon;
private Session testSession;
private MessageConsumer testConsumer1;
private MessageConsumer testConsumer2;
@@ -82,6 +82,9 @@
con = new AMQConnection("vm://:1", "guest", "guest", "TransactedTest",
"/test");
session = con.createSession(true, 0);
consumer1 = session.createConsumer(queue1);
+ //Dummy just to create the queue.
+ MessageConsumer consumer2 = session.createConsumer(queue2);
+ consumer2.close();
producer2 = session.createProducer(queue2);
con.start();
