You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2007/08/09 02:34:40 UTC
svn commit: r564057 [13/13] - in /activemq/trunk/activemq-core/src:
main/java/org/apache/activemq/ main/java/org/apache/activemq/advisory/
main/java/org/apache/activemq/blob/ main/java/org/apache/activemq/broker/
main/java/org/apache/activemq/broker/ft...
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java Wed Aug 8 17:34:07 2007
@@ -19,6 +19,9 @@
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import javax.jms.DeliveryMode;
@@ -29,7 +32,6 @@
import javax.jms.Session;
import junit.framework.TestCase;
-
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
@@ -40,10 +42,6 @@
import org.apache.activemq.util.ServiceStopper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* @version $Revision: 1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java Wed Aug 8 17:34:07 2007
@@ -18,11 +18,12 @@
import java.io.IOException;
import java.net.URI;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import javax.jms.DeliveryMode;
import junit.framework.Test;
-
import org.apache.activemq.broker.StubConnection;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
@@ -38,9 +39,6 @@
import org.apache.activemq.transport.mock.MockTransport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
public class FanoutTransportBrokerTest extends NetworkTestSupport {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java Wed Aug 8 17:34:07 2007
@@ -16,8 +16,8 @@
*/
package org.apache.activemq.transport.nio;
-import org.apache.activemq.JmsDurableTopicSendReceiveTest;
import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.JmsDurableTopicSendReceiveTest;
import org.apache.activemq.broker.BrokerService;
public class NIOJmsDurableTopicSendReceiveTest extends JmsDurableTopicSendReceiveTest {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java Wed Aug 8 17:34:07 2007
@@ -16,9 +16,9 @@
*/
package org.apache.activemq.transport.nio;
-import org.apache.activemq.broker.BrokerService;
-
import javax.jms.DeliveryMode;
+
+import org.apache.activemq.broker.BrokerService;
public class NIOPersistentSendAndReceiveTest extends NIOJmsSendAndReceiveTest {
protected BrokerService broker;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOTransportBrokerTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOTransportBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOTransportBrokerTest.java Wed Aug 8 17:34:07 2007
@@ -16,10 +16,9 @@
*/
package org.apache.activemq.transport.nio;
-import org.apache.activemq.transport.TransportBrokerTestSupport;
-
import junit.framework.Test;
import junit.textui.TestRunner;
+import org.apache.activemq.transport.TransportBrokerTestSupport;
public class NIOTransportBrokerTest extends TransportBrokerTestSupport {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java Wed Aug 8 17:34:07 2007
@@ -17,6 +17,16 @@
package org.apache.activemq.transport.peer;
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.advisory.AdvisorySupport;
import org.apache.activemq.command.ActiveMQDestination;
@@ -28,18 +38,6 @@
import org.apache.activemq.util.MessageIdList;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import junit.framework.TestCase;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/UnreliableCommandDatagramChannel.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/UnreliableCommandDatagramChannel.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/UnreliableCommandDatagramChannel.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/UnreliableCommandDatagramChannel.java Wed Aug 8 17:34:07 2007
@@ -16,6 +16,11 @@
*/
package org.apache.activemq.transport.reliable;
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.DatagramChannel;
+
import org.apache.activemq.openwire.OpenWireFormat;
import org.apache.activemq.transport.udp.ByteBufferPool;
import org.apache.activemq.transport.udp.CommandDatagramChannel;
@@ -24,13 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.io.IOException;
-import java.net.SocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.DatagramChannel;
-
/**
- *
* @version $Revision: $
*/
public class UnreliableCommandDatagramChannel extends CommandDatagramChannel {
@@ -39,9 +38,9 @@
private DropCommandStrategy dropCommandStrategy;
- public UnreliableCommandDatagramChannel(UdpTransport transport, OpenWireFormat wireFormat, int datagramSize,
- SocketAddress targetAddress, DatagramHeaderMarshaller headerMarshaller, ReplayBuffer replayBuffer, DatagramChannel channel,
- ByteBufferPool bufferPool, DropCommandStrategy strategy) {
+ public UnreliableCommandDatagramChannel(UdpTransport transport, OpenWireFormat wireFormat, int datagramSize, SocketAddress targetAddress,
+ DatagramHeaderMarshaller headerMarshaller, ReplayBuffer replayBuffer, DatagramChannel channel, ByteBufferPool bufferPool,
+ DropCommandStrategy strategy) {
super(transport, wireFormat, datagramSize, targetAddress, headerMarshaller, channel, bufferPool);
this.dropCommandStrategy = strategy;
}
@@ -50,11 +49,10 @@
if (dropCommandStrategy.shouldDropCommand(commandId, address, redelivery)) {
writeBuffer.flip();
log.info("Dropping datagram with command: " + commandId);
-
+
// lets still add it to the replay buffer though!
getReplayBuffer().addBuffer(commandId, writeBuffer);
- }
- else {
+ } else {
super.sendWriteBuffer(commandId, address, writeBuffer, redelivery);
}
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/UnreliableUdpTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/UnreliableUdpTransport.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/UnreliableUdpTransport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/UnreliableUdpTransport.java Wed Aug 8 17:34:07 2007
@@ -16,15 +16,14 @@
*/
package org.apache.activemq.transport.reliable;
-import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.transport.udp.CommandChannel;
-import org.apache.activemq.transport.udp.CommandDatagramChannel;
-import org.apache.activemq.transport.udp.UdpTransport;
-
import java.io.IOException;
import java.net.SocketAddress;
import java.net.URI;
import java.net.UnknownHostException;
+
+import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.transport.udp.CommandChannel;
+import org.apache.activemq.transport.udp.UdpTransport;
/**
* An unreliable UDP transport that will randomly discard packets to simulate a
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/UnreliableUdpTransportTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/UnreliableUdpTransportTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/UnreliableUdpTransportTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/UnreliableUdpTransportTest.java Wed Aug 8 17:34:07 2007
@@ -16,17 +16,15 @@
*/
package org.apache.activemq.transport.reliable;
+import java.net.SocketAddress;
+import java.net.URI;
+
import org.apache.activemq.openwire.OpenWireFormat;
import org.apache.activemq.transport.CommandJoiner;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.udp.ResponseRedirectInterceptor;
import org.apache.activemq.transport.udp.UdpTransport;
import org.apache.activemq.transport.udp.UdpTransportTest;
-
-import java.net.SocketAddress;
-import java.net.URI;
-import java.util.HashSet;
-import java.util.Set;
/**
*
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompSslTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompSslTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompSslTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompSslTest.java Wed Aug 8 17:34:07 2007
@@ -16,14 +16,12 @@
*/
package org.apache.activemq.transport.stomp;
-import org.apache.activemq.transport.tcp.SslSocketHelper;
-
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.SSLSocket;
-import javax.net.SocketFactory;
+import java.io.IOException;
import java.net.Socket;
import java.net.URI;
-import java.io.IOException;
+
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLSocketFactory;
/**
* @version $Revision$
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java Wed Aug 8 17:34:07 2007
@@ -16,20 +16,27 @@
*/
package org.apache.activemq.transport.stomp;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.CombinationTestSupport;
-import org.apache.activemq.broker.*;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.ActiveMQTextMessage;
-
-import javax.jms.*;
-import javax.jms.Connection;
import java.io.IOException;
import java.net.Socket;
import java.net.SocketTimeoutException;
import java.net.URI;
-import java.util.regex.Pattern;
import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.jms.BytesMessage;
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.CombinationTestSupport;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTextMessage;
public class StompTest extends CombinationTestSupport {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java Wed Aug 8 17:34:07 2007
@@ -19,6 +19,10 @@
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.net.SocketFactory;
import org.apache.activemq.CombinationTestSupport;
import org.apache.activemq.command.WireFormatInfo;
@@ -28,11 +32,6 @@
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportListener;
import org.apache.activemq.transport.TransportServer;
-
-import javax.net.SocketFactory;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
public class InactivityMonitorTest extends CombinationTestSupport implements TransportAcceptListener {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslSocketHelper.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslSocketHelper.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslSocketHelper.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslSocketHelper.java Wed Aug 8 17:34:07 2007
@@ -16,10 +16,11 @@
*/
package org.apache.activemq.transport.tcp;
-import javax.management.remote.JMXPrincipal;
-import javax.net.ssl.SSLSocket;
import java.io.IOException;
import java.security.cert.X509Certificate;
+
+import javax.management.remote.JMXPrincipal;
+import javax.net.ssl.SSLSocket;
/**
* @version $Revision$
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java Wed Aug 8 17:34:07 2007
@@ -16,10 +16,9 @@
*/
package org.apache.activemq.transport.tcp;
-import org.apache.activemq.transport.TransportBrokerTestSupport;
-
import junit.framework.Test;
import junit.textui.TestRunner;
+import org.apache.activemq.transport.TransportBrokerTestSupport;
public class SslTransportBrokerTest extends TransportBrokerTestSupport {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java Wed Aug 8 17:34:07 2007
@@ -97,7 +97,7 @@
optionSettings[j] = getMthNaryDigit(i, j, 3) - 1;
if (optionSettings[j] != -1) {
- options.put(optionNames[j], (optionSettings[j] == 1 ? "true" : "false"));
+ options.put(optionNames[j], optionSettings[j] == 1 ? "true" : "false");
}
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportServerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportServerTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportServerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportServerTest.java Wed Aug 8 17:34:07 2007
@@ -17,10 +17,10 @@
package org.apache.activemq.transport.tcp;
-import junit.framework.TestCase;
-
import java.io.IOException;
import java.net.URI;
+
+import junit.framework.TestCase;
public class SslTransportServerTest extends TestCase {
private SslTransportServer sslTransportServer;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java Wed Aug 8 17:34:07 2007
@@ -24,24 +24,22 @@
import javax.net.ssl.SSLSocket;
import junit.framework.TestCase;
-
import org.apache.activemq.command.ConnectionInfo;
import org.apache.activemq.transport.StubTransportListener;
import org.apache.activemq.wireformat.ObjectStreamWireFormat;
/**
* Unit tests for the SslTransport class.
- *
*/
public class SslTransportTest extends TestCase {
-
+
SSLSocket sslSocket;
StubTransportListener stubListener;
-
+
String username;
String password;
String certDistinguishedName;
-
+
protected void setUp() throws Exception {
certDistinguishedName = "ThisNameIsDistinguished";
username = "SomeUserName";
@@ -51,54 +49,48 @@
protected void tearDown() throws Exception {
super.tearDown();
}
-
- private void createTransportAndConsume( boolean wantAuth, boolean needAuth ) throws IOException {
- JMXPrincipal principal = new JMXPrincipal( certDistinguishedName );
- X509Certificate cert = new StubX509Certificate( principal );
- StubSSLSession sslSession =
- new StubSSLSession( cert );
-
- sslSocket = new StubSSLSocket( sslSession );
+
+ private void createTransportAndConsume(boolean wantAuth, boolean needAuth) throws IOException {
+ JMXPrincipal principal = new JMXPrincipal(certDistinguishedName);
+ X509Certificate cert = new StubX509Certificate(principal);
+ StubSSLSession sslSession = new StubSSLSession(cert);
+
+ sslSocket = new StubSSLSocket(sslSession);
sslSocket.setWantClientAuth(wantAuth);
sslSocket.setNeedClientAuth(needAuth);
-
- SslTransport transport = new SslTransport(
- new ObjectStreamWireFormat(), sslSocket );
-
+
+ SslTransport transport = new SslTransport(new ObjectStreamWireFormat(), sslSocket);
+
stubListener = new StubTransportListener();
-
- transport.setTransportListener( stubListener );
-
+
+ transport.setTransportListener(stubListener);
+
ConnectionInfo sentInfo = new ConnectionInfo();
-
+
sentInfo.setUserName(username);
sentInfo.setPassword(password);
-
+
transport.doConsume(sentInfo);
}
-
+
public void testKeepClientUserName() throws IOException {
createTransportAndConsume(true, true);
-
- final ConnectionInfo receivedInfo =
- (ConnectionInfo) stubListener.getCommands().remove();
-
+
+ final ConnectionInfo receivedInfo = (ConnectionInfo)stubListener.getCommands().remove();
+
X509Certificate receivedCert;
-
+
try {
- receivedCert = ((X509Certificate[])receivedInfo.getTransportContext())[0];
+ receivedCert = ((X509Certificate[])receivedInfo.getTransportContext())[0];
} catch (Exception e) {
receivedCert = null;
}
-
- if ( receivedCert == null ) {
+
+ if (receivedCert == null) {
fail("Transmitted certificate chain was not attached to ConnectionInfo.");
}
-
- assertEquals("Received certificate distinguished name did not match the one transmitted.",
- certDistinguishedName, receivedCert.getSubjectDN().getName());
-
- }
-}
+ assertEquals("Received certificate distinguished name did not match the one transmitted.", certDistinguishedName, receivedCert.getSubjectDN().getName());
+ }
+}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java Wed Aug 8 17:34:07 2007
@@ -16,9 +16,8 @@
*/
package org.apache.activemq.transport.tcp;
-import org.apache.activemq.transport.TransportBrokerTestSupport;
-
import junit.framework.Test;
+import org.apache.activemq.transport.TransportBrokerTestSupport;
public class TcpTransportBrokerTest extends TransportBrokerTestSupport {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java Wed Aug 8 17:34:07 2007
@@ -16,13 +16,13 @@
*/
package org.apache.activemq.transport.tcp;
+import javax.jms.Connection;
+import javax.jms.JMSException;
+
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.broker.BrokerService;
-import javax.jms.Connection;
-import javax.jms.JMSException;
-
/**
* @version $Revision$
*/
@@ -34,7 +34,7 @@
public void testUriOptionsWork() throws Exception {
String uri = prefix + bindAddress + postfix;
-// System.out.println("Connecting via: " + uri);
+ // System.out.println("Connecting via: " + uri);
connection = new ActiveMQConnectionFactory(uri).createConnection();
connection.start();
@@ -42,33 +42,29 @@
public void testBadVersionNumberDoesNotWork() throws Exception {
String uri = prefix + bindAddress + postfix + "&minmumWireFormatVersion=65535";
-// System.out.println("Connecting via: " + uri);
+ // System.out.println("Connecting via: " + uri);
try {
connection = new ActiveMQConnectionFactory(uri).createConnection();
connection.start();
fail("Should have thrown an exception!");
- }
- catch (Exception expected) {
+ } catch (Exception expected) {
}
}
-
public void testBadPropertyNameFails() throws Exception {
String uri = prefix + bindAddress + postfix + "&cheese=abc";
-// System.out.println("Connecting via: " + uri);
+ // System.out.println("Connecting via: " + uri);
try {
connection = new ActiveMQConnectionFactory(uri).createConnection();
connection.start();
fail("Should have thrown an exception!");
- }
- catch (Exception expected) {
+ } catch (Exception expected) {
expected.printStackTrace();
}
}
-
protected void setUp() throws Exception {
bindAddress = "tcp://localhost:61616";
super.setUp();
@@ -78,8 +74,7 @@
if (connection != null) {
try {
connection.close();
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
e.printStackTrace();
}
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java Wed Aug 8 17:34:07 2007
@@ -19,24 +19,19 @@
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
import org.apache.activemq.CombinationTestSupport;
import org.apache.activemq.command.CommandTypes;
import org.apache.activemq.command.WireFormatInfo;
-import org.apache.activemq.openwire.OpenWireFormat;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportAcceptListener;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportListener;
import org.apache.activemq.transport.TransportServer;
-
-import javax.net.SocketFactory;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
public class WireformatNegociationTest extends CombinationTestSupport {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java Wed Aug 8 17:34:07 2007
@@ -16,13 +16,13 @@
*/
package org.apache.activemq.transport.udp;
+import java.net.URI;
+
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.command.Response;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportServer;
-
-import java.net.URI;
/**
*
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerTest.java Wed Aug 8 17:34:07 2007
@@ -16,9 +16,8 @@
*/
package org.apache.activemq.transport.vm;
-import org.apache.activemq.transport.TransportBrokerTestSupport;
-
import junit.framework.Test;
+import org.apache.activemq.transport.TransportBrokerTestSupport;
public class VMTransportBrokerTest extends TransportBrokerTestSupport {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java Wed Aug 8 17:34:07 2007
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.usecases;
+
import javax.jms.Connection;
import javax.jms.Destination;
import javax.jms.IllegalStateException;
@@ -33,8 +34,9 @@
public class ChangeSessionDeliveryModeTest extends TestSupport implements MessageListener {
/**
- * test following condition- which are defined by JMS Spec 1.1: MessageConsumers cannot use a MessageListener and
- * receive() from the same session
+ * test following condition- which are defined by JMS Spec 1.1:
+ * MessageConsumers cannot use a MessageListener and receive() from the same
+ * session
*
* @throws Exception
*/
@@ -47,12 +49,11 @@
consumer1.setMessageListener(this);
JMSException jmsEx = null;
MessageConsumer consumer2 = consumerSession.createConsumer(destination);
-
+
try {
consumer2.receive(10);
fail("Did not receive expected exception.");
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
assertTrue(e instanceof IllegalStateException);
}
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java Wed Aug 8 17:34:07 2007
@@ -16,11 +16,11 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
-
import javax.jms.Destination;
import javax.jms.Message;
+
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java Wed Aug 8 17:34:07 2007
@@ -16,9 +16,7 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.test.JmsSendReceiveTestSupport;
+import java.util.List;
import javax.jms.Connection;
import javax.jms.Destination;
@@ -27,7 +25,10 @@
import javax.jms.MessageConsumer;
import javax.jms.MessageListener;
import javax.jms.Session;
-import java.util.List;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.test.JmsSendReceiveTestSupport;
/**
* @version $Revision: 1.1.1.1 $
@@ -67,8 +68,7 @@
if (topic) {
consumerDestination = session.createTopic(getConsumerSubject());
producerDestination = session.createTopic(getProducerSubject());
- }
- else {
+ } else {
consumerDestination = session.createQueue(getConsumerSubject());
producerDestination = session.createQueue(getProducerSubject());
}
@@ -86,7 +86,6 @@
consumers[i].setMessageListener(createMessageListener(i, messageLists[i]));
}
-
LOG.info("Started connections");
}
@@ -109,7 +108,7 @@
* Returns the destinations to which we consume
*/
protected Destination[] getDestinations() {
- return new Destination[]{new ActiveMQTopic(getPrefix() + "FOO.BAR"), new ActiveMQTopic(getPrefix() + "FOO.*"), new ActiveMQTopic(getPrefix() + "FOO.X.Y")};
+ return new Destination[] {new ActiveMQTopic(getPrefix() + "FOO.BAR"), new ActiveMQTopic(getPrefix() + "FOO.*"), new ActiveMQTopic(getPrefix() + "FOO.X.Y")};
}
protected String getPrefix() {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java Wed Aug 8 17:34:07 2007
@@ -16,16 +16,13 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.EmbeddedBrokerTestSupport;
-import org.apache.activemq.EmbeddedBrokerAndConnectionTestSupport;
-
-import javax.jms.Connection;
import javax.jms.Session;
import javax.jms.TemporaryQueue;
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+import org.apache.activemq.EmbeddedBrokerAndConnectionTestSupport;
/**
*
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java Wed Aug 8 17:34:07 2007
@@ -19,9 +19,6 @@
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-
import javax.jms.Connection;
import javax.jms.Queue;
import javax.jms.QueueConnection;
@@ -32,6 +29,8 @@
import javax.jms.Topic;
import junit.framework.TestCase;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
/**
* @author Peter Henning
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java Wed Aug 8 17:34:07 2007
@@ -16,9 +16,6 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.test.TestSupport;
-
import javax.jms.Connection;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
@@ -30,6 +27,9 @@
import javax.jms.TextMessage;
import javax.jms.Topic;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.test.TestSupport;
+
/**
* @version $Revision: 1.1.1.1 $
*/
@@ -42,6 +42,7 @@
private MessageProducer producer;
private Destination destination;
private int messageCount;
+
protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
return new ActiveMQConnectionFactory("vm://localhost?broker.deleteAllMessagesOnStartup=false");
}
@@ -57,7 +58,7 @@
// now lets try again without one connection open
consumeMessagesDeliveredWhileConsumerClosed();
- //now delete the db
+ // now delete the db
ActiveMQConnectionFactory fac = new ActiveMQConnectionFactory("vm://localhost?broker.deleteAllMessagesOnStartup=true");
dummyConnection = fac.createConnection();
dummyConnection.start();
@@ -86,7 +87,7 @@
message = consumer.receive(RECEIVE_TIMEOUT);
assertTrue("Should have received a message!", message != null);
message.acknowledge();
-
+
closeConsumer();
log.info("Now lets create the consumer again and because we didn't ack, we should get it again");
@@ -104,7 +105,7 @@
message = consumer.receive(RECEIVE_TIMEOUT);
assertTrue("Should have received a message!", message != null);
message.acknowledge();
-
+
closeConsumer();
}
@@ -119,7 +120,7 @@
producer.setDeliveryMode(DeliveryMode.PERSISTENT);
TextMessage msg = session.createTextMessage("This is a test: " + messageCount++);
producer.send(msg);
-
+
producer.close();
producer = null;
closeSession();
@@ -128,8 +129,7 @@
protected Destination createDestination() throws JMSException {
if (isTopic()) {
return session.createTopic(getSubject());
- }
- else {
+ } else {
return session.createQueue(getSubject());
}
}
@@ -161,9 +161,8 @@
private MessageConsumer createConsumer(String durableName) throws JMSException {
if (destination instanceof Topic) {
- return session.createDurableSubscriber((Topic) destination, durableName);
- }
- else {
+ return session.createDurableSubscriber((Topic)destination, durableName);
+ } else {
return session.createConsumer(destination);
}
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java Wed Aug 8 17:34:07 2007
@@ -307,8 +307,8 @@
Topic topic = session.createTopic("topic-" + getName());
MessageConsumer consumer = session.createDurableSubscriber(topic, "sub1");
// Drain any messages that may allready be in the sub
- while (consumer.receive(1000) != null)
- ;
+ while (consumer.receive(1000) != null) {
+ }
// See if the durable sub works in a new session.
session.close();
@@ -334,8 +334,8 @@
Topic topic = session.createTopic("topic-" + getName());
MessageConsumer consumer = session.createDurableSubscriber(topic, "sub1");
// Drain any messages that may allready be in the sub
- while (consumer.receive(1000) != null)
- ;
+ while (consumer.receive(1000) != null) {
+ }
// See if the durable sub works in a new connection.
// The embeded broker shutsdown when his connections are closed.
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java Wed Aug 8 17:34:07 2007
@@ -16,16 +16,16 @@
*/
package org.apache.activemq.usecases;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.network.DemandForwardingBridge;
import org.apache.activemq.network.NetworkBridgeConfiguration;
import org.apache.activemq.transport.TransportFactory;
-
-import java.util.List;
-import java.util.Iterator;
-import java.util.ArrayList;
-import java.net.URI;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NewConsumerCreatesDestinationTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NewConsumerCreatesDestinationTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NewConsumerCreatesDestinationTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NewConsumerCreatesDestinationTest.java Wed Aug 8 17:34:07 2007
@@ -16,18 +16,16 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.EmbeddedBrokerTestSupport;
+import java.util.Set;
+
+import javax.jms.Destination;
+import javax.jms.Session;
+
import org.apache.activemq.EmbeddedBrokerAndConnectionTestSupport;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.Session;
-
-import java.util.Set;
/**
*
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java Wed Aug 8 17:34:07 2007
@@ -16,18 +16,27 @@
*/
package org.apache.activemq.usecases;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.jms.Connection;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Session;
+
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.util.IOHelper;
import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.util.IOHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import javax.jms.*;
-import java.util.List;
-import java.util.Collections;
-import java.util.ArrayList;
-import java.io.File;
public final class PublishOnQueueConsumedMessageInTransactionTest extends TestCase implements MessageListener {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java Wed Aug 8 17:34:07 2007
@@ -16,6 +16,8 @@
*/
package org.apache.activemq.usecases;
+import java.io.File;
+
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.xbean.BrokerFactoryBean;
@@ -23,8 +25,6 @@
import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
-
-import java.io.File;
/**
* Test Publish/Consume queue using the release activemq.xml configuration file
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java Wed Aug 8 17:34:07 2007
@@ -16,20 +16,19 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
-
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageProducer;
+import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
+
/**
* @version $Revision: 1.1.1.1 $
*/
public class PublishOnTopicConsumedMessageTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
private MessageProducer replyProducer;
-
public synchronized void onMessage(Message message) {
// lets resend the message somewhere else
@@ -37,10 +36,9 @@
Message msgCopy = (Message)((org.apache.activemq.command.Message)message).copy();
replyProducer.send(msgCopy);
- //log.info("Sending reply: " + message);
+ // log.info("Sending reply: " + message);
super.onMessage(message);
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
log.info("Failed to send message: " + e);
e.printStackTrace();
}
@@ -53,8 +51,7 @@
if (topic) {
replyDestination = receiveSession.createTopic("REPLY." + getSubject());
- }
- else {
+ } else {
replyDestination = receiveSession.createQueue("REPLY." + getSubject());
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java Wed Aug 8 17:34:07 2007
@@ -16,6 +16,8 @@
*/
package org.apache.activemq.usecases;
+import java.io.File;
+
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.xbean.BrokerFactoryBean;
@@ -23,8 +25,6 @@
import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
-
-import java.io.File;
/**
* Test Publish/Consume topic using the release activemq.xml configuration file
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java Wed Aug 8 17:34:07 2007
@@ -16,15 +16,14 @@
*/
package org.apache.activemq.usecases;
-
/**
* @version $Revision: 1.1.1.1 $
*/
public class QueueRedeliverTest extends TopicRedeliverTest {
-
- protected void setUp() throws Exception{
+
+ protected void setUp() throws Exception {
super.setUp();
topic = false;
}
-
+
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java Wed Aug 8 17:34:07 2007
@@ -17,6 +17,7 @@
package org.apache.activemq.usecases;
import java.util.Date;
+import java.util.concurrent.CountDownLatch;
import javax.jms.Connection;
import javax.jms.Destination;
@@ -29,20 +30,17 @@
import javax.jms.TextMessage;
import junit.framework.TestCase;
-
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.concurrent.CountDownLatch;
-
/**
* @author pragmasoft
* @version $Revision: 1.1.1.1 $
*/
public final class QueueRepeaterTest extends TestCase {
-
+
private static final Log log = LogFactory.getLog(QueueRepeaterTest.class);
private volatile String receivedText;
@@ -72,20 +70,18 @@
public void onMessage(Message m) {
try {
- TextMessage tm = (TextMessage) m;
+ TextMessage tm = (TextMessage)m;
receivedText = tm.getText();
latch.countDown();
log.info("consumer received message :" + receivedText);
consumerSession.commit();
log.info("committed transaction");
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
try {
consumerSession.rollback();
log.info("rolled back transaction");
- }
- catch (JMSException e1) {
+ } catch (JMSException e1) {
log.info(e1);
e1.printStackTrace();
}
@@ -103,8 +99,7 @@
tm.setText("Hello, " + new Date());
producer.send(tm);
log.info("producer sent message :" + tm.getText());
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
e.printStackTrace();
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java Wed Aug 8 17:34:07 2007
@@ -16,8 +16,10 @@
*/
package org.apache.activemq.usecases;
-import java.util.HashMap;
import java.net.URI;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
import javax.jms.Connection;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
@@ -25,24 +27,15 @@
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.Topic;
-import org.apache.activemq.ActiveMQConnection;
+
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.Broker;
+import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.test.TestSupport;
import org.apache.activemq.util.IdGenerator;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java Wed Aug 8 17:34:07 2007
@@ -16,14 +16,14 @@
*/
package org.apache.activemq.usecases;
+import java.net.URI;
+
+import javax.jms.JMSException;
+
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.TransportConnector;
-
-import javax.jms.JMSException;
-import java.net.URI;
+import org.apache.activemq.broker.BrokerService;
/**
* @author Oliver Belikan
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java Wed Aug 8 17:34:07 2007
@@ -15,10 +15,6 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.spring.ConsumerBean;
-
import javax.jms.Connection;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
@@ -27,6 +23,9 @@
import javax.jms.TextMessage;
import junit.framework.TestCase;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.spring.ConsumerBean;
/**
*
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java Wed Aug 8 17:34:07 2007
@@ -16,9 +16,6 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.test.TestSupport;
-
import javax.jms.Connection;
import javax.jms.DeliveryMode;
import javax.jms.Message;
@@ -27,6 +24,9 @@
import javax.jms.TextMessage;
import javax.jms.Topic;
import javax.jms.TopicSubscriber;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.test.TestSupport;
/**
* @author Paul Smith
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TestSupport.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TestSupport.java Wed Aug 8 17:34:07 2007
@@ -16,13 +16,6 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.command.ActiveMQMessage;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import javax.jms.Connection;
import javax.jms.Destination;
import javax.jms.JMSException;
@@ -30,6 +23,12 @@
import javax.jms.TextMessage;
import junit.framework.TestCase;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Useful base class for unit test cases
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java Wed Aug 8 17:34:07 2007
@@ -16,12 +16,13 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.JmsMultipleBrokersTestSupport;
-import org.apache.activemq.util.MessageIdList;
+import java.net.URI;
import javax.jms.Destination;
import javax.jms.MessageConsumer;
-import java.net.URI;
+
+import org.apache.activemq.JmsMultipleBrokersTestSupport;
+import org.apache.activemq.util.MessageIdList;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java Wed Aug 8 17:34:07 2007
@@ -16,15 +16,15 @@
*/
package org.apache.activemq.usecases;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.network.DemandForwardingBridge;
import org.apache.activemq.network.NetworkBridgeConfiguration;
import org.apache.activemq.transport.TransportFactory;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.net.URI;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java Wed Aug 8 17:34:07 2007
@@ -16,12 +16,13 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.util.MessageIdList;
-import org.apache.activemq.JmsMultipleBrokersTestSupport;
+import java.net.URI;
-import javax.jms.MessageConsumer;
import javax.jms.Destination;
-import java.net.URI;
+import javax.jms.MessageConsumer;
+
+import org.apache.activemq.JmsMultipleBrokersTestSupport;
+import org.apache.activemq.util.MessageIdList;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java Wed Aug 8 17:34:07 2007
@@ -16,15 +16,15 @@
*/
package org.apache.activemq.usecases;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.network.DemandForwardingBridge;
import org.apache.activemq.network.NetworkBridgeConfiguration;
import org.apache.activemq.transport.TransportFactory;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.net.URI;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java Wed Aug 8 17:34:07 2007
@@ -129,7 +129,7 @@
producerSession.commit();
Message recMsg = consumer.receive(RECEIVE_TIMEOUT);
- assertTrue(recMsg.getJMSRedelivered() == false);
+ assertFalse(recMsg.getJMSRedelivered());
recMsg = consumer.receive(RECEIVE_TIMEOUT);
consumerSession.rollback();
recMsg = consumer.receive(RECEIVE_TIMEOUT);
@@ -169,7 +169,7 @@
producerSession.commit();
Message recMsg = consumer.receive(RECEIVE_TIMEOUT);
- assertTrue(recMsg.getJMSRedelivered() == false);
+ assertFalse(recMsg.getJMSRedelivered());
consumerSession.close();
consumerSession = connection.createSession(true, Session.CLIENT_ACKNOWLEDGE);
consumer = consumerSession.createConsumer(destination);
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java Wed Aug 8 17:34:07 2007
@@ -18,6 +18,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.CountDownLatch;
import javax.jms.Connection;
import javax.jms.Destination;
@@ -30,13 +31,10 @@
import javax.jms.TextMessage;
import junit.framework.TestCase;
-
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.util.concurrent.CountDownLatch;
/**
* Test case for AMQ-268
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionTest.java Wed Aug 8 17:34:07 2007
@@ -17,6 +17,7 @@
package org.apache.activemq.usecases;
import java.util.Date;
+import java.util.concurrent.CountDownLatch;
import javax.jms.Connection;
import javax.jms.Destination;
@@ -29,20 +30,17 @@
import javax.jms.TextMessage;
import junit.framework.TestCase;
-
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.concurrent.CountDownLatch;
-
/**
* @author pragmasoft
* @version $Revision: 1.1.1.1 $
*/
public final class TransactionTest extends TestCase {
-
+
private static final Log log = LogFactory.getLog(TransactionTest.class);
private volatile String receivedText;
@@ -72,20 +70,18 @@
public void onMessage(Message m) {
try {
- TextMessage tm = (TextMessage) m;
+ TextMessage tm = (TextMessage)m;
receivedText = tm.getText();
latch.countDown();
log.info("consumer received message :" + receivedText);
consumerSession.commit();
log.info("committed transaction");
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
try {
consumerSession.rollback();
log.info("rolled back transaction");
- }
- catch (JMSException e1) {
+ } catch (JMSException e1) {
log.info(e1);
e1.printStackTrace();
}
@@ -103,8 +99,7 @@
tm.setText("Hello, " + new Date());
producer.send(tm);
log.info("producer sent message :" + tm.getText());
- }
- catch (JMSException e) {
+ } catch (JMSException e) {
e.printStackTrace();
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java Wed Aug 8 17:34:07 2007
@@ -18,16 +18,15 @@
import javax.jms.DeliveryMode;
-
/**
* @version $Revision: 1.1.1.1 $
*/
public class TransientQueueRedeliverTest extends TopicRedeliverTest {
-
- protected void setUp() throws Exception{
+
+ protected void setUp() throws Exception {
super.setUp();
topic = false;
deliveryMode = DeliveryMode.NON_PERSISTENT;
}
-
+
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java Wed Aug 8 17:34:07 2007
@@ -16,22 +16,22 @@
*/
package org.apache.activemq.usecases;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.jms.Destination;
+import javax.jms.MessageConsumer;
+
+import org.apache.activemq.JmsMultipleBrokersTestSupport;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.command.Command;
import org.apache.activemq.network.DemandForwardingBridge;
import org.apache.activemq.network.NetworkBridgeConfiguration;
import org.apache.activemq.transport.TransportFactory;
-import org.apache.activemq.JmsMultipleBrokersTestSupport;
-import org.apache.activemq.command.Command;
import org.apache.activemq.util.MessageIdList;
-
-import javax.jms.Destination;
-import javax.jms.MessageConsumer;
-import java.util.List;
-import java.util.ArrayList;
-import java.net.URI;
-
-import java.util.concurrent.atomic.AtomicInteger;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java Wed Aug 8 17:34:07 2007
@@ -16,26 +16,25 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.CombinationTestSupport;
-import org.apache.activemq.util.MessageIdList;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.xbean.XBeanBrokerFactory;
-
import java.net.URI;
import java.util.Arrays;
-import junit.framework.Test;
-
-import javax.jms.Destination;
-import javax.jms.ConnectionFactory;
import javax.jms.Connection;
-import javax.jms.Session;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
+import javax.jms.Session;
import javax.jms.TextMessage;
+
+import junit.framework.Test;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.CombinationTestSupport;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.util.MessageIdList;
+import org.apache.activemq.xbean.XBeanBrokerFactory;
public class TwoBrokerMulticastQueueTest extends CombinationTestSupport {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java Wed Aug 8 17:34:07 2007
@@ -16,16 +16,17 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.JmsMultipleBrokersTestSupport;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.ActiveMQPrefetchPolicy;
+import java.net.URI;
+import javax.jms.Connection;
import javax.jms.Destination;
import javax.jms.Message;
-import javax.jms.Connection;
-import javax.jms.Session;
import javax.jms.MessageConsumer;
-import java.net.URI;
+import javax.jms.Session;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQPrefetchPolicy;
+import org.apache.activemq.JmsMultipleBrokersTestSupport;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java Wed Aug 8 17:34:07 2007
@@ -16,9 +16,9 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.ActiveMQConnectionFactory;
-
import javax.jms.JMSException;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java Wed Aug 8 17:34:07 2007
@@ -16,10 +16,10 @@
*/
package org.apache.activemq.usecases;
+import javax.jms.JMSException;
+
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
-
-import javax.jms.JMSException;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java Wed Aug 8 17:34:07 2007
@@ -19,13 +19,10 @@
import javax.jms.JMSException;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.xbean.BrokerFactoryBean;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.xbean.BrokerFactoryBean;
import org.springframework.core.io.ClassPathResource;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java Wed Aug 8 17:34:07 2007
@@ -16,9 +16,9 @@
*/
package org.apache.activemq.usecases;
-import org.apache.activemq.ActiveMQConnectionFactory;
-
import javax.jms.JMSException;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java Wed Aug 8 17:34:07 2007
@@ -16,9 +16,9 @@
*/
package org.apache.activemq.util;
-import junit.framework.TestCase;
-
import java.io.IOException;
+
+import junit.framework.TestCase;
public class DataByteArrayOutputStreamTest extends TestCase {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MarshallingSupportTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MarshallingSupportTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MarshallingSupportTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MarshallingSupportTest.java Wed Aug 8 17:34:07 2007
@@ -4,8 +4,8 @@
package org.apache.activemq.util;
-import java.io.IOException;
import java.util.Properties;
+
import junit.framework.TestCase;
/**
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java Wed Aug 8 17:34:07 2007
@@ -16,9 +16,9 @@
*/
package org.apache.activemq.xbean;
-import org.apache.activemq.EmbeddedBrokerTestSupport;
-
import javax.jms.Connection;
+
+import org.apache.activemq.EmbeddedBrokerTestSupport;
/**
*