[jboss-cvs] JBossCache/tests/perf/org/jboss/cache/aop ...
Manik Surtani
msurtani at jboss.com
Thu Jul 20 05:03:55 EDT 2006
User: msurtani
Date: 06/07/20 05:03:55
Modified: tests/perf/org/jboss/cache/aop LocalMapPerfAopTest.java
ReplicatedSyncPerfAopTest.java
Log:
Fixed some broken UTs to use the new xml parsers, cache factories, etc.
Revision Changes Path
1.3 +6 -7 JBossCache/tests/perf/org/jboss/cache/aop/LocalMapPerfAopTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LocalMapPerfAopTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/perf/org/jboss/cache/aop/LocalMapPerfAopTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- LocalMapPerfAopTest.java 9 Apr 2006 12:33:50 -0000 1.2
+++ LocalMapPerfAopTest.java 20 Jul 2006 09:03:55 -0000 1.3
@@ -13,8 +13,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.jboss.cache.PropertyConfigurator;
-import org.jboss.cache.TreeCache;
-import org.jboss.cache.aop.PojoCache;
+import org.jboss.cache.config.Configuration;
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.lock.LockStrategyFactory;
import org.jboss.cache.transaction.DummyTransactionManager;
@@ -32,13 +31,13 @@
/**
* Local mode performance test for TreeCache.
*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
* @author<a href="mailto:bwang at jboss.org">Ben Wang</a> May 20 2003
*/
public class LocalMapPerfAopTest extends TestCase
{
PojoCache cache_;
- int cachingMode_ = TreeCache.LOCAL;
+ Configuration.CacheMode cachingMode_ = Configuration.CacheMode.LOCAL;
final static Properties p_;
// final static Log log_=LogFactory.getLog(LocalPerfAopTest.class);
String oldFactory_ = null;
@@ -68,7 +67,7 @@
System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
DummyTransactionManager.getInstance();
- initCaches(TreeCache.LOCAL);
+ initCaches(Configuration.CacheMode.LOCAL);
tm_ = new DummyTransactionManager();
log("ReplicatedAsyncPerfAopTest: cacheMode=Local");
@@ -114,13 +113,13 @@
proxyMaps_ = null;
}
- void initCaches(int caching_mode) throws Exception
+ void initCaches(Configuration.CacheMode caching_mode) throws Exception
{
cachingMode_ = caching_mode;
cache_ = new PojoCache();
PropertyConfigurator config = new PropertyConfigurator();
config.configure(cache_, "META-INF/local-service.xml"); // read in generic local xml
- cache_.setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
+ cache_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
cache_.startService();
}
1.3 +14 -14 JBossCache/tests/perf/org/jboss/cache/aop/ReplicatedSyncPerfAopTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedSyncPerfAopTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/perf/org/jboss/cache/aop/ReplicatedSyncPerfAopTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ReplicatedSyncPerfAopTest.java 9 Apr 2006 12:33:50 -0000 1.2
+++ ReplicatedSyncPerfAopTest.java 20 Jul 2006 09:03:55 -0000 1.3
@@ -14,7 +14,7 @@
import junit.framework.TestSuite;
import org.jboss.cache.PropertyConfigurator;
import org.jboss.cache.TreeCache;
-import org.jboss.cache.aop.PojoCache;
+import org.jboss.cache.config.Configuration;
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.transaction.DummyTransactionManager;
@@ -29,13 +29,13 @@
/**
* Replicated synchronous mode performance test for transactional TreeCache.
*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
* @author<a href="mailto:bwang at jboss.org">Ben Wang</a> May 20 2003
*/
public class ReplicatedSyncPerfAopTest extends TestCase
{
PojoCache cache1_, cache2_, cache3_;
- int cachingMode_ = TreeCache.REPL_SYNC;
+ Configuration.CacheMode cachingMode_ = Configuration.CacheMode.REPL_SYNC;
final String groupName_ = "TreeCacheTestGroup";
final static Properties p_;
// final static Log log_=LogFactory.getLog(ReplicatedSyncPerfAopTest.class);
@@ -91,8 +91,8 @@
PojoCache cache = new PojoCache();
PropertyConfigurator config = new PropertyConfigurator();
config.configure(cache, "META-INF/replSync-service.xml"); // use generic syncRepl xml
- cache.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
- cache.setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
+ cache.getConfiguration().setIsolationLevel(IsolationLevel.REPEATABLE_READ);
+ cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
return cache;
}
@@ -106,7 +106,7 @@
{
log("=== 1 cache with transaction (no concurrent access) ===");
cache1_ = createCache();
- cache1_.setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
+ cache1_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
cache1_.startService();
// Formating
@@ -153,8 +153,8 @@
log("=== 2 caches with transaction (no concurrent access) ===");
cache1_ = createCache();
cache2_ = createCache();
- cache1_.setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
- cache2_.setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
+ cache1_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
+ cache2_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
cache1_.startService();
cache2_.startService();
@@ -203,8 +203,8 @@
log("=== 2 caches with single transaction only (no concurrent access) ===");
cache1_ = createCache();
cache2_ = createCache();
- cache1_.setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
- cache2_.setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
+ cache1_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
+ cache2_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
cache1_.startService();
cache2_.startService();
@@ -254,10 +254,10 @@
cache1_ = createCache();
cache2_ = createCache();
cache3_ = createCache();
- cache1_.setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
- cache2_.setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
- cache2_.setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
- cache3_.setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
+ cache1_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
+ cache2_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
+ cache2_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
+ cache3_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.JBossTransactionManagerLookup");
cache1_.startService();
cache2_.startService();
cache3_.startService();
More information about the jboss-cvs-commits
mailing list