You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/03/18 16:13:14 UTC
svn commit: r755613 - in
/servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine:
AbstractClusterEndpointTest.java GenericInOnlyClusterEndpointTest.java
ReconnectTest.java
Author: gnodet
Date: Wed Mar 18 15:13:14 2009
New Revision: 755613
URL: http://svn.apache.org/viewvc?rev=755613&view=rev
Log:
Do not use a persistent broker for tests other than the reconnect tests
Modified:
servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/AbstractClusterEndpointTest.java
servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/GenericInOnlyClusterEndpointTest.java
servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ReconnectTest.java
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/AbstractClusterEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/AbstractClusterEndpointTest.java?rev=755613&r1=755612&r2=755613&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/AbstractClusterEndpointTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/AbstractClusterEndpointTest.java Wed Mar 18 15:13:14 2009
@@ -141,8 +141,7 @@
deleteFile(data);
}
BrokerService broker = new BrokerService();
- broker.setPersistent(true);
- broker.setDataDirectoryFile(data);
+ broker.setPersistent(false);
broker.setUseJmx(true);
broker.addConnector("tcp://localhost:" + port);
broker.start();
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/GenericInOnlyClusterEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/GenericInOnlyClusterEndpointTest.java?rev=755613&r1=755612&r2=755613&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/GenericInOnlyClusterEndpointTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/GenericInOnlyClusterEndpointTest.java Wed Mar 18 15:13:14 2009
@@ -254,11 +254,6 @@
}
@Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- @Override
protected void tearDown() throws Exception {
listener.assertExchangeCompleted();
((DisposableBean) cluster1.getPool()).destroy();
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ReconnectTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ReconnectTest.java?rev=755613&r1=755612&r2=755613&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ReconnectTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/ReconnectTest.java Wed Mar 18 15:13:14 2009
@@ -144,4 +144,19 @@
super.tearDown();
}
+ @Override
+ protected Service createBroker(boolean deleteData) throws Exception {
+ // For reconnection tests, we need a persistent broker
+ File data = new File("target/activemq");
+ if (deleteData) {
+ deleteFile(data);
+ }
+ BrokerService broker = new BrokerService();
+ broker.setPersistent(true);
+ broker.setDataDirectoryFile(data);
+ broker.setUseJmx(true);
+ broker.addConnector("tcp://localhost:" + port);
+ broker.start();
+ return broker;
+ }
}