diff options
Diffstat (limited to 'java/client/test/src')
8 files changed, 15 insertions, 26 deletions
diff --git a/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java b/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java index c7c835c3fd..2e5f2ddbac 100644 --- a/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java +++ b/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java @@ -30,7 +30,9 @@ import org.junit.runners.Suite; org.apache.qpid.basic.UnitTests.class, org.apache.qpid.client.channelclose.UnitTests.class, org.apache.qpid.client.message.UnitTests.class, - org.apache.qpid.forwardall.UnitTests.class + org.apache.qpid.forwardall.UnitTests.class, + org.apache.qpid.destinationurl.UnitTests.class, + org.apache.qpid.jndi.referenceabletest.UnitTests.class }) public class AllClientUnitTests { diff --git a/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java b/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java index be384f42d8..e12d6c0fc5 100644 --- a/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java +++ b/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java @@ -67,7 +67,7 @@ public class ChannelCloseOkTest _session1.createConsumer(_destination1).setMessageListener(new MessageListener() { public void onMessage(Message message) { - _log.info("consumer 1 got message [" + getTextMessage(message) + "]"); + _log.debug("consumer 1 got message [" + getTextMessage(message) + "]"); synchronized (_received1) { _received1.add(message); @@ -79,7 +79,7 @@ public class ChannelCloseOkTest _session2.createConsumer(_destination2).setMessageListener(new MessageListener() { public void onMessage(Message message) { - _log.info("consumer 2 got message [" + getTextMessage(message) + "]"); + _log.debug("consumer 2 got message [" + getTextMessage(message) + "]"); synchronized (_received2) { _received2.add(message); @@ -170,7 +170,7 @@ public class ChannelCloseOkTest private void send(Session session, Destination destination, String message) throws JMSException { - _log.info("sending message " + message); + _log.debug("sending message " + message); MessageProducer producer1 = session.createProducer(destination); producer1.send(session.createTextMessage(message)); } diff --git a/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java b/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java index 6f5c5021fa..f20b0e1409 100644 --- a/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java +++ b/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java @@ -19,7 +19,7 @@ package org.apache.qpid.failover; import org.apache.log4j.Logger; import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.vmbroker.AMQVMBrokerCreationException; +import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; public class FailoverBrokerTester implements Runnable { diff --git a/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java b/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java index 711bd3053d..f0a80f2ead 100644 --- a/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java +++ b/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java @@ -71,16 +71,9 @@ public class AcceptorTest @Test public void startAcceptor() throws IOException { - boolean useMultithreadedIoProcessor = Boolean.getBoolean("qpid.io.multithreaded"); IoAcceptor acceptor = null; - if (useMultithreadedIoProcessor) - { - acceptor = new org.apache.qpid.nio.SocketAcceptor(); - } - else - { - acceptor = new SocketAcceptor(); - } + acceptor = new SocketAcceptor(); + SocketAcceptorConfig config = (SocketAcceptorConfig) acceptor.getDefaultConfig(); SocketSessionConfig sc = (SocketSessionConfig) config.getSessionConfig(); sc.setTcpNoDelay(true); diff --git a/java/client/test/src/org/apache/qpid/mina/WriterTest.java b/java/client/test/src/org/apache/qpid/mina/WriterTest.java index b9e3d394b5..ae0b7ea522 100644 --- a/java/client/test/src/org/apache/qpid/mina/WriterTest.java +++ b/java/client/test/src/org/apache/qpid/mina/WriterTest.java @@ -175,15 +175,9 @@ public class WriterTest implements Runnable public void startWriter() throws IOException, InterruptedException { IoConnector ioConnector = null; - boolean useMultithreadedIoProcessor = Boolean.getBoolean("qpid.io.multithreaded"); - if (useMultithreadedIoProcessor) - { - ioConnector = new org.apache.qpid.nio.SocketConnector(); - } - else - { - ioConnector = new SocketConnector(); - } + + ioConnector = new SocketConnector(); + SocketConnectorConfig cfg = (SocketConnectorConfig) ioConnector.getDefaultConfig(); cfg.setThreadModel(ThreadModel.MANUAL); SocketSessionConfig scfg = (SocketSessionConfig) cfg.getSessionConfig(); diff --git a/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java b/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java index 16ec4e2d73..925e0a4958 100644 --- a/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java +++ b/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java @@ -17,7 +17,7 @@ */ package org.apache.qpid.requestreply1; -import org.apache.qpid.vmbroker.AMQVMBrokerCreationException; +import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; import org.apache.qpid.client.transport.TransportConnection; import org.junit.Test; import org.junit.Before; diff --git a/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java b/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java index 85ecd3398c..7acf2a262f 100644 --- a/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java +++ b/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.Before; import org.junit.After; import org.apache.qpid.AMQException; -import org.apache.qpid.vmbroker.AMQVMBrokerCreationException; +import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; import org.apache.qpid.url.URLSyntaxException; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQSession; diff --git a/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java b/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java index 9cf767436a..86744d162f 100644 --- a/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java +++ b/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java @@ -22,7 +22,7 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.vmbroker.AMQVMBrokerCreationException; +import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; import org.junit.After; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; |