[jboss-cvs] JBossCache/tests-50/functional/org/jboss/cache/pojo ...
Vladmir Blagojevic
vladimir.blagojevic at jboss.com
Wed Jan 10 11:44:14 EST 2007
User: vblagojevic
Date: 07/01/10 11:44:14
Modified: tests-50/functional/org/jboss/cache/pojo
ReplicatedTxTest.java ReplicatedByteTest.java
ReplicatedTest.java
ReplicatedPutWithBulkRemoveTest.java
ReplicatedSerializableTest.java
ReplicatedObjectGraphTest.java
NewReplicatedTest.java
ReplicatedNonSerializableTest.java
ReplicatedCircularGraphTest.java
NewReplicatedTxTest.java EnumTest.java
Log:
JBCACHE-840 (work in progress)
Revision Changes Path
1.6 +4 -3 JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedTxTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedTxTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedTxTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ReplicatedTxTest.java 31 Oct 2006 11:07:17 -0000 1.5
+++ ReplicatedTxTest.java 10 Jan 2007 16:44:14 -0000 1.6
@@ -5,6 +5,8 @@
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.pojo.test.Person;
import org.jboss.cache.pojo.test.Student;
import org.jboss.cache.transaction.DummyTransactionManager;
@@ -43,11 +45,10 @@
{
super.setUp();
log.info("setUp() ....");
- String configFile = "META-INF/replSync-service.xml";
boolean toStart = false;
- cache = PojoCacheFactory.createCache(configFile, toStart);
+ cache = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.start();
- cache1 = PojoCacheFactory.createCache(configFile, toStart);
+ cache1 = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache1.start();
System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
1.4 +4 -3 JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedByteTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedByteTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedByteTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ReplicatedByteTest.java 31 Oct 2006 14:21:04 -0000 1.3
+++ ReplicatedByteTest.java 10 Jan 2007 16:44:14 -0000 1.4
@@ -27,6 +27,8 @@
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.pojo.test.Resource;
/**
@@ -49,11 +51,10 @@
{
super.setUp();
log.info("setUp() ....");
- String configFile = "META-INF/replSync-service.xml";
boolean toStart = false;
- cache = PojoCacheFactory.createCache(configFile, toStart);
+ cache = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.start();
- cache1 = PojoCacheFactory.createCache(configFile, toStart);
+ cache1 = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache1.start();
}
1.5 +4 -3 JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ReplicatedTest.java 31 Oct 2006 11:07:17 -0000 1.4
+++ ReplicatedTest.java 10 Jan 2007 16:44:14 -0000 1.5
@@ -5,6 +5,8 @@
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.pojo.test.Person;
import org.jboss.cache.pojo.test.Student;
@@ -30,11 +32,10 @@
{
super.setUp();
log.info("setUp() ....");
- String configFile = "META-INF/replSync-service.xml";
boolean toStart = false;
- cache = PojoCacheFactory.createCache(configFile, toStart);
+ cache = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.start();
- cache1 = PojoCacheFactory.createCache(configFile, toStart);
+ cache1 = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache1.start();
}
1.5 +4 -2 JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedPutWithBulkRemoveTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedPutWithBulkRemoveTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedPutWithBulkRemoveTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ReplicatedPutWithBulkRemoveTest.java 31 Oct 2006 11:07:17 -0000 1.4
+++ ReplicatedPutWithBulkRemoveTest.java 10 Jan 2007 16:44:14 -0000 1.5
@@ -12,6 +12,8 @@
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.pojo.test.Address;
import org.jboss.cache.pojo.test.Person;
@@ -43,8 +45,8 @@
Properties prop = new Properties();
prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache("META-INF/replSync-service.xml", toStart);
- cache1_ = PojoCacheFactory.createCache("META-INF/replSync-service.xml", toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.start();
cache1_.start();
}
1.6 +4 -2 JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedSerializableTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedSerializableTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedSerializableTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ReplicatedSerializableTest.java 31 Oct 2006 11:07:17 -0000 1.5
+++ ReplicatedSerializableTest.java 10 Jan 2007 16:44:14 -0000 1.6
@@ -12,6 +12,8 @@
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.pojo.test.CacheObject;
import org.jboss.cache.pojo.test.Student;
@@ -41,8 +43,8 @@
Properties prop = new Properties();
prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache("META-INF/replSync-service.xml", toStart);
- cache1_ = PojoCacheFactory.createCache("META-INF/replSync-service.xml", toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.start();
cache1_.start();
}
1.9 +3 -1 JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedObjectGraphTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ReplicatedObjectGraphTest.java 4 Jan 2007 05:35:39 -0000 1.8
+++ ReplicatedObjectGraphTest.java 10 Jan 2007 16:44:14 -0000 1.9
@@ -6,6 +6,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.pojo.test.Address;
import org.jboss.cache.pojo.test.Person;
@@ -45,7 +47,7 @@
private PojoCache createCache(String name) throws Exception
{
boolean toStart = false;
- PojoCache tree = PojoCacheFactory.createCache("META-INF/replSync-service.xml", toStart);
+ PojoCache tree = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
tree.start();
return tree;
}
1.9 +4 -2 JBossCache/tests-50/functional/org/jboss/cache/pojo/NewReplicatedTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NewReplicatedTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/NewReplicatedTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NewReplicatedTest.java 30 Dec 2006 17:49:58 -0000 1.8
+++ NewReplicatedTest.java 10 Jan 2007 16:44:14 -0000 1.9
@@ -6,6 +6,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.pojo.test.Person;
import org.jboss.cache.pojo.test.SpecialSerializedAddress;
@@ -37,8 +39,8 @@
Properties prop = new Properties();
prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache("META-INF/replSync-service.xml", toStart);
- cache1_ = PojoCacheFactory.createCache("META-INF/replSync-service.xml", toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.start();
cache1_.start();
}
1.6 +4 -2 JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedNonSerializableTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedNonSerializableTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedNonSerializableTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ReplicatedNonSerializableTest.java 31 Oct 2006 11:07:17 -0000 1.5
+++ ReplicatedNonSerializableTest.java 10 Jan 2007 16:44:14 -0000 1.6
@@ -12,6 +12,8 @@
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheFactory;
import javax.naming.Context;
import java.util.Properties;
@@ -39,8 +41,8 @@
Properties prop = new Properties();
prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache("META-INF/replSync-service.xml", toStart);
- cache1_ = PojoCacheFactory.createCache("META-INF/replSync-service.xml", toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.start();
cache1_.start();
}
1.5 +3 -1 JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedCircularGraphTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ReplicatedCircularGraphTest.java 6 Nov 2006 13:44:26 -0000 1.4
+++ ReplicatedCircularGraphTest.java 10 Jan 2007 16:44:14 -0000 1.5
@@ -12,6 +12,8 @@
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.pojo.test.Person;
import org.jboss.cache.pojo.test.Link;
import org.jboss.cache.pojo.test.NodeManager;
@@ -56,7 +58,7 @@
private PojoCache createCache(String name) throws Exception
{
boolean toStart = false;
- PojoCache tree = PojoCacheFactory.createCache("META-INF/replSync-service.xml", toStart);
+ PojoCache tree = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
tree.start();
return tree;
}
1.8 +4 -2 JBossCache/tests-50/functional/org/jboss/cache/pojo/NewReplicatedTxTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NewReplicatedTxTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/NewReplicatedTxTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NewReplicatedTxTest.java 4 Jan 2007 05:35:39 -0000 1.7
+++ NewReplicatedTxTest.java 10 Jan 2007 16:44:14 -0000 1.8
@@ -12,6 +12,8 @@
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.pojo.test.Address;
import org.jboss.cache.pojo.test.Person;
import org.jboss.cache.transaction.DummyTransactionManager;
@@ -58,8 +60,8 @@
Properties prop = new Properties();
prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache("META-INF/replSync-service.xml", toStart);
- cache1_ = PojoCacheFactory.createCache("META-INF/replSync-service.xml", toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.start();
cache1_.start();
1.2 +4 -3 JBossCache/tests-50/functional/org/jboss/cache/pojo/EnumTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EnumTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/EnumTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- EnumTest.java 8 Nov 2006 08:48:51 -0000 1.1
+++ EnumTest.java 10 Jan 2007 16:44:14 -0000 1.2
@@ -27,6 +27,8 @@
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheFactory;
import org.jboss.cache.pojo.test.ArrayObject;
import org.jboss.cache.pojo.test.Person;
import org.jboss.cache.pojo.test.EnumPlanet;
@@ -51,10 +53,9 @@
{
super.setUp();
log.info("setUp() ....");
- String configFile = "META-INF/replSync-service.xml";
boolean toStart = true;
- cache_ = PojoCacheFactory.createCache(configFile, toStart);
- cache1_ = PojoCacheFactory.createCache(configFile, toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestCacheFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
}
protected void tearDown() throws Exception
More information about the jboss-cvs-commits
mailing list