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 2009/07/01 17:53:17 UTC
svn commit: r790233 [1/3] - in /activemq/sandbox/activemq-flow: activemq-all/
activemq-all/src/test/java/org/apache/activemq/legacy/transport/
activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/
activemq-all/src/test/java/org/apache/ac...
Author: chirino
Date: Wed Jul 1 15:53:16 2009
New Revision: 790233
URL: http://svn.apache.org/viewvc?rev=790233&view=rev
Log:
Converted the BrokerTest to TestNG it now supports being run in parallel.
Added:
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/openwire/BrokerTestScenario.java
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/openwire/BrokerTestSupport.java
- copied, changed from r789862, activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerTestSupport.java
Removed:
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerTestSupport.java
Modified:
activemq/sandbox/activemq-flow/activemq-all/pom.xml
activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java
activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java
activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java
activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportBrokerTest.java
activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBrokerTest.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java
activemq/sandbox/activemq-flow/activemq-openwire/pom.xml
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/AdvisoryBrokerTest.java
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerBenchmark.java
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerRestartTestSupport.java
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerTest.java
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/ConcurrentConnectSimulationTest.java
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/MessageExpirationTest.java
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/openwire/BrokerTest.java
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/openwire/MarshallingBrokerTest.java
activemq/sandbox/activemq-flow/activemq-util/src/test/java/org/apache/activemq/apollo/Combinator.java
Modified: activemq/sandbox/activemq-flow/activemq-all/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/pom.xml?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-all/pom.xml Wed Jul 1 15:53:16 2009
@@ -125,6 +125,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java Wed Jul 1 15:53:16 2009
@@ -16,37 +16,44 @@
*/
package org.apache.activemq.legacy.transport;
-import java.net.URI;
+import java.io.IOException;
import java.net.URISyntaxException;
-import org.apache.activemq.apollo.broker.Broker;
-import org.apache.activemq.apollo.broker.BrokerFactory;
import org.apache.activemq.openwire.BrokerTest;
-import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportFactory;
+import org.apache.activemq.openwire.BrokerTestScenario;
+import org.apache.activemq.transport.TransportServer;
public abstract class TransportBrokerTestSupport extends BrokerTest {
- protected Broker createBroker() throws Exception {
- Broker broker = BrokerFactory.createBroker(new URI("jaxb:classpath:non-persistent-activemq.xml"));
- broker.addTransportServer(TransportFactory.bind(new URI(getBindLocation())));
- return broker;
- }
-
protected abstract String getBindLocation();
- protected String getConnectLocation() {
- return null;
- }
+ /**
+ * Need to enhance the BrokerTestScenario a bit to inject the wire format
+ */
@Override
- protected Transport createTransport() throws URISyntaxException, Exception {
- String connectLocation = getConnectLocation();
- if( connectLocation==null ) {
- connectLocation = getBindLocation();
- }
- URI connectURI = new URI(connectLocation);
-
- return TransportFactory.connect(connectURI);
+ public Object createBean() throws Exception {
+ BrokerTestScenario brokerTestScenario = new BrokerTestScenario() {
+
+ private TransportServer transnportServer;
+
+ @Override
+ public TransportServer createTransnportServer() throws IOException, URISyntaxException {
+ transnportServer = super.createTransnportServer();
+ return transnportServer;
+ }
+
+ @Override
+ public String getConnectURI() {
+ return transnportServer.getConnectURI().toString();
+ }
+
+ @Override
+ public String getBindURI() {
+ return getBindLocation();
+ }
+
+ };
+ return brokerTestScenario;
}
}
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java Wed Jul 1 15:53:16 2009
@@ -16,23 +16,14 @@
*/
package org.apache.activemq.legacy.transport.nio;
-import junit.framework.Test;
-import junit.textui.TestRunner;
-
import org.apache.activemq.legacy.transport.TransportBrokerTestSupport;
+import org.testng.annotations.Test;
+@Test
public class NIOTransportBrokerTest extends TransportBrokerTestSupport {
protected String getBindLocation() {
- return "nio://localhost:61616";
- }
-
- public static Test suite() {
- return suite(NIOTransportBrokerTest.class);
- }
-
- public static void main(String[] args) {
- TestRunner.run(suite());
+ return "nio://localhost:0";
}
}
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java Wed Jul 1 15:53:16 2009
@@ -42,82 +42,82 @@
return "ssl://localhost:0";
}
- @Override
- protected Broker createBroker() throws Exception {
- Broker broker = BrokerFactory.createBroker(new URI("jaxb:classpath:non-persistent-activemq.xml"));
- broker.addTransportServer(TransportFactory.bind(new URI(getBindLocation())));
-
-// TODO:
-// KeyManager[] km = getKeyManager();
-// TrustManager[] tm = getTrustManager();
-// connector = service.addSslConnector(getBindLocation(), km, tm, null);
+// @Override
+// protected Broker createBroker() throws Exception {
+// Broker broker = BrokerFactory.createBroker(new URI("jaxb:classpath:non-persistent-activemq.xml"));
+// broker.addTransportServer(TransportFactory.bind(new URI(getBindLocation())));
//
-// // for client side
-// SslTransportFactory sslFactory = new SslTransportFactory();
-// sslFactory.setKeyAndTrustManagers(km, tm, null);
-// TransportFactory.registerTransportFactory("ssl", sslFactory);
-
- return broker;
- }
-
-
- private TrustManager[] getTrustManager() throws Exception {
- TrustManager[] trustStoreManagers = null;
- KeyStore trustedCertStore = KeyStore.getInstance(SslTransportBrokerTest.KEYSTORE_TYPE);
-
- trustedCertStore.load(new FileInputStream(SslTransportBrokerTest.TRUST_KEYSTORE), null);
- TrustManagerFactory tmf =
- TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-
- tmf.init(trustedCertStore);
- trustStoreManagers = tmf.getTrustManagers();
- return trustStoreManagers;
- }
-
- private KeyManager[] getKeyManager() throws Exception {
- KeyManagerFactory kmf =
- KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
- KeyStore ks = KeyStore.getInstance(SslTransportBrokerTest.KEYSTORE_TYPE);
- KeyManager[] keystoreManagers = null;
-
- byte[] sslCert = loadClientCredential(SslTransportBrokerTest.SERVER_KEYSTORE);
-
-
- if (sslCert != null && sslCert.length > 0) {
- ByteArrayInputStream bin = new ByteArrayInputStream(sslCert);
- ks.load(bin, SslTransportBrokerTest.PASSWORD.toCharArray());
- kmf.init(ks, SslTransportBrokerTest.PASSWORD.toCharArray());
- keystoreManagers = kmf.getKeyManagers();
- }
- return keystoreManagers;
- }
-
- private static byte[] loadClientCredential(String fileName) throws IOException {
- if (fileName == null) {
- return null;
- }
- FileInputStream in = new FileInputStream(fileName);
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- byte[] buf = new byte[512];
- int i = in.read(buf);
- while (i > 0) {
- out.write(buf, 0, i);
- i = in.read(buf);
- }
- in.close();
- return out.toByteArray();
- }
-
- protected void setUp() throws Exception {
- maxWait = 10000;
- super.setUp();
- }
-
- public static Test suite() {
- return suite(SslBrokerServiceTest.class);
- }
-
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
+//// TODO:
+//// KeyManager[] km = getKeyManager();
+//// TrustManager[] tm = getTrustManager();
+//// connector = service.addSslConnector(getBindLocation(), km, tm, null);
+////
+//// // for client side
+//// SslTransportFactory sslFactory = new SslTransportFactory();
+//// sslFactory.setKeyAndTrustManagers(km, tm, null);
+//// TransportFactory.registerTransportFactory("ssl", sslFactory);
+//
+// return broker;
+// }
+//
+//
+// private TrustManager[] getTrustManager() throws Exception {
+// TrustManager[] trustStoreManagers = null;
+// KeyStore trustedCertStore = KeyStore.getInstance(SslTransportBrokerTest.KEYSTORE_TYPE);
+//
+// trustedCertStore.load(new FileInputStream(SslTransportBrokerTest.TRUST_KEYSTORE), null);
+// TrustManagerFactory tmf =
+// TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+//
+// tmf.init(trustedCertStore);
+// trustStoreManagers = tmf.getTrustManagers();
+// return trustStoreManagers;
+// }
+//
+// private KeyManager[] getKeyManager() throws Exception {
+// KeyManagerFactory kmf =
+// KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+// KeyStore ks = KeyStore.getInstance(SslTransportBrokerTest.KEYSTORE_TYPE);
+// KeyManager[] keystoreManagers = null;
+//
+// byte[] sslCert = loadClientCredential(SslTransportBrokerTest.SERVER_KEYSTORE);
+//
+//
+// if (sslCert != null && sslCert.length > 0) {
+// ByteArrayInputStream bin = new ByteArrayInputStream(sslCert);
+// ks.load(bin, SslTransportBrokerTest.PASSWORD.toCharArray());
+// kmf.init(ks, SslTransportBrokerTest.PASSWORD.toCharArray());
+// keystoreManagers = kmf.getKeyManagers();
+// }
+// return keystoreManagers;
+// }
+//
+// private static byte[] loadClientCredential(String fileName) throws IOException {
+// if (fileName == null) {
+// return null;
+// }
+// FileInputStream in = new FileInputStream(fileName);
+// ByteArrayOutputStream out = new ByteArrayOutputStream();
+// byte[] buf = new byte[512];
+// int i = in.read(buf);
+// while (i > 0) {
+// out.write(buf, 0, i);
+// i = in.read(buf);
+// }
+// in.close();
+// return out.toByteArray();
+// }
+//
+// protected void setUp() throws Exception {
+// maxWait = 10000;
+// super.setUp();
+// }
+//
+// public static Test suite() {
+// return suite(SslBrokerServiceTest.class);
+// }
+//
+// public static void main(String[] args) {
+// TestRunner.run(suite());
+// }
}
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportBrokerTest.java?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportBrokerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportBrokerTest.java Wed Jul 1 15:53:16 2009
@@ -16,11 +16,12 @@
*/
package org.apache.activemq.legacy.transport.tcp;
-import junit.framework.Test;
-import junit.textui.TestRunner;
-
import org.apache.activemq.legacy.transport.TransportBrokerTestSupport;
+import org.apache.activemq.openwire.BrokerTestScenario;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+@Test
public class SslTransportBrokerTest extends TransportBrokerTestSupport {
public static final String KEYSTORE_TYPE = "jks";
@@ -32,6 +33,7 @@
return "ssl://localhost:0";
}
+ @BeforeTest
protected void setUp() throws Exception {
System.setProperty("javax.net.ssl.trustStore", TRUST_KEYSTORE);
System.setProperty("javax.net.ssl.trustStorePassword", PASSWORD);
@@ -40,17 +42,13 @@
System.setProperty("javax.net.ssl.keyStorePassword", PASSWORD);
System.setProperty("javax.net.ssl.keyStoreType", KEYSTORE_TYPE);
//System.setProperty("javax.net.debug", "ssl,handshake,data,trustmanager");
-
- maxWait = 10000;
- super.setUp();
- }
-
- public static Test suite() {
- return suite(SslTransportBrokerTest.class);
}
- public static void main(String[] args) {
- TestRunner.run(suite());
+ @Override
+ public Object createBean() throws Exception {
+ BrokerTestScenario scenario = (BrokerTestScenario) super.createBean();
+ scenario.maxWait = 10000;
+ return scenario;
}
}
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBrokerTest.java?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBrokerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBrokerTest.java Wed Jul 1 15:53:16 2009
@@ -16,27 +16,22 @@
*/
package org.apache.activemq.legacy.transport.tcp;
-import junit.framework.Test;
-
import org.apache.activemq.legacy.transport.TransportBrokerTestSupport;
+import org.apache.activemq.openwire.BrokerTestScenario;
+import org.testng.annotations.Test;
+@Test
public class TcpTransportBrokerTest extends TransportBrokerTestSupport {
protected String getBindLocation() {
return "tcp://localhost:0";
}
- protected void setUp() throws Exception {
- maxWait = 2000;
- super.setUp();
- }
-
- public static Test suite() {
- return suite(TcpTransportBrokerTest.class);
- }
-
- public static void main(String[] args) {
- junit.textui.TestRunner.run(suite());
+ @Override
+ public Object createBean() throws Exception {
+ BrokerTestScenario scenario = (BrokerTestScenario) super.createBean();
+ scenario.maxWait = 2000;
+ return scenario;
}
}
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java Wed Jul 1 15:53:16 2009
@@ -67,10 +67,20 @@
return hostNames;
}
+ public void setHostNames(String... hostNames) {
+ this.hostNames.clear();
+ for (String name : hostNames) {
+ addHostName(name);
+ }
+ }
+
public void setHostNames(List<AsciiBuffer> hostNames) {
this.hostNames = new ArrayList<AsciiBuffer>(hostNames);
}
+ public void addHostName(String hostName) {
+ this.hostNames.add(new AsciiBuffer(hostName));
+ }
public void addHostName(AsciiBuffer hostName) {
this.hostNames.add(hostName);
}
Modified: activemq/sandbox/activemq-flow/activemq-openwire/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/pom.xml?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/pom.xml Wed Jul 1 15:53:16 2009
@@ -76,6 +76,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/AdvisoryBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/AdvisoryBrokerTest.java?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/AdvisoryBrokerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/AdvisoryBrokerTest.java Wed Jul 1 15:53:16 2009
@@ -27,6 +27,7 @@
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.RemoveInfo;
import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.openwire.BrokerTestSupport;
public class AdvisoryBrokerTest extends BrokerTestSupport {
Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerBenchmark.java?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerBenchmark.java (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerBenchmark.java Wed Jul 1 15:53:16 2009
@@ -29,6 +29,7 @@
import org.apache.activemq.command.MessageAck;
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.openwire.BrokerTestSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerRestartTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerRestartTestSupport.java?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerRestartTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerRestartTestSupport.java Wed Jul 1 15:53:16 2009
@@ -21,6 +21,7 @@
import org.apache.activemq.apollo.broker.Broker;
import org.apache.activemq.broker.store.Store;
+import org.apache.activemq.openwire.BrokerTestSupport;
public class BrokerRestartTestSupport extends BrokerTestSupport {
Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerTest.java?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerTest.java Wed Jul 1 15:53:16 2009
@@ -32,6 +32,7 @@
import org.apache.activemq.command.MessageAck;
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.openwire.BrokerTestSupport;
public class BrokerTest extends BrokerTestSupport {
Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/ConcurrentConnectSimulationTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/ConcurrentConnectSimulationTest.java?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/ConcurrentConnectSimulationTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/ConcurrentConnectSimulationTest.java Wed Jul 1 15:53:16 2009
@@ -23,6 +23,7 @@
import org.apache.activemq.command.ConsumerId;
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.command.SessionId;
+import org.apache.activemq.openwire.BrokerTestSupport;
public class ConcurrentConnectSimulationTest extends BrokerTestSupport {
Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/MessageExpirationTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/MessageExpirationTest.java?rev=790233&r1=790232&r2=790233&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/MessageExpirationTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/MessageExpirationTest.java Wed Jul 1 15:53:16 2009
@@ -28,6 +28,7 @@
import org.apache.activemq.command.MessageAck;
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.openwire.BrokerTestSupport;
public class MessageExpirationTest extends BrokerTestSupport {