Author: chirino
Date: Fri Jun 30 21:22:58 2006
New Revision: 418437
URL: http://svn.apache.org/viewvc?rev=418437&view=rev
Log:
Changed tests so that the data files are under the target directory
Modified:
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaRecoveryBrokerTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaXARecoveryBrokerTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/ListContainerTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/LoadTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/MapContainerTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/StoreTest.java
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
Modified:
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaRecoveryBrokerTest.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaRecoveryBrokerTest.java?rev=418437&r1=418436&r2=418437&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaRecoveryBrokerTest.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaRecoveryBrokerTest.java
Fri Jun 30 21:22:58 2006
@@ -40,8 +40,7 @@
protected BrokerService createRestartedBroker() throws Exception {
BrokerService broker = new BrokerService();
-
- KahaPersistentAdaptor adaptor = new KahaPersistentAdaptor(new
File("activemq-data/storetest"));
+ KahaPersistentAdaptor adaptor = new KahaPersistentAdaptor(new File(
System.getProperty("basedir", ".")+"/target/activemq-data/kaha-store.db"));
broker.setPersistenceAdapter(adaptor);
broker.addConnector("tcp://localhost:0");
return broker;
Modified:
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaXARecoveryBrokerTest.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaXARecoveryBrokerTest.java?rev=418437&r1=418436&r2=418437&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaXARecoveryBrokerTest.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaXARecoveryBrokerTest.java
Fri Jun 30 21:22:58 2006
@@ -49,7 +49,7 @@
protected BrokerService createRestartedBroker() throws Exception {
BrokerService broker = new BrokerService();
- KahaPersistentAdaptor adaptor = new KahaPersistentAdaptor(new
File("activemq-data/storetest"));
+ KahaPersistentAdaptor adaptor = new KahaPersistentAdaptor(new File(
System.getProperty("basedir", ".")+"/target/activemq-data/kaha-store.db"));
broker.setPersistenceAdapter(adaptor);
broker.addConnector("tcp://localhost:0");
return broker;
Modified:
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/ListContainerTest.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/ListContainerTest.java?rev=418437&r1=418436&r2=418437&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/ListContainerTest.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/ListContainerTest.java
Fri Jun 30 21:22:58 2006
@@ -10,7 +10,7 @@
public class ListContainerTest extends TestCase{
- protected String name = "test";
+ protected String name;
protected Store store;
protected ListContainer container;
protected LinkedList testList;
@@ -291,6 +291,7 @@
protected void setUp() throws Exception{
super.setUp();
+ name = System.getProperty("basedir",
".")+"/target/activemq-data/list-container.db";
StoreFactory.delete(name);
store = getStore();
store.deleteListContainer(name);
Modified:
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/LoadTest.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/LoadTest.java?rev=418437&r1=418436&r2=418437&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/LoadTest.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/LoadTest.java
Fri Jun 30 21:22:58 2006
@@ -48,6 +48,7 @@
protected void setUp() throws Exception{
super.setUp();
+ name = System.getProperty("basedir",
".")+"/target/activemq-data/load.db";
StoreFactory.delete(name);
store=getStore();
}
Modified:
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/MapContainerTest.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/MapContainerTest.java?rev=418437&r1=418436&r2=418437&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/MapContainerTest.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/MapContainerTest.java
Fri Jun 30 21:22:58 2006
@@ -15,7 +15,7 @@
public class MapContainerTest extends TestCase{
- protected String name = "test";
+ protected String name;
protected Store store;
protected MapContainer container;
protected Map testMap;
@@ -158,6 +158,7 @@
protected void setUp() throws Exception{
super.setUp();
+ name = System.getProperty("basedir",
".")+"/target/activemq-data/map-container.db";
store = getStore();
store.deleteListContainer(name);
container = store.getMapContainer(name);
Modified:
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/StoreTest.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/StoreTest.java?rev=418437&r1=418436&r2=418437&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/StoreTest.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/StoreTest.java
Fri Jun 30 21:22:58 2006
@@ -25,10 +25,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.activemq.kaha.ListContainer;
-import org.apache.activemq.kaha.MapContainer;
-import org.apache.activemq.kaha.Store;
-import org.apache.activemq.kaha.StoreFactory;
+
import junit.framework.TestCase;
/**
@@ -38,7 +35,7 @@
*/
public class StoreTest extends TestCase{
- protected String name = "sdbStoreTest.db";
+ protected String name;
protected Store store;
@@ -197,6 +194,7 @@
protected void setUp() throws Exception{
super.setUp();
+ name = System.getProperty("basedir",
".")+"/target/activemq-data/store-test.db";
store = getStore();
}
Modified:
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml?rev=418437&r1=418436&r2=418437&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
(original)
+++
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
Fri Jun 30 21:22:58 2006
@@ -23,7 +23,7 @@
</transportConnectors>
<persistenceAdapter>
- <kahaPersistentAdaptor dir = "activemq-data/storetest"/>
+ <kahaPersistentAdaptor dir =
"${basedir}/target/activemq-data/kaha-broker.db"/>
</persistenceAdapter>
</broker>
