[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/pojo/optimistic ...
Manik Surtani
manik at jboss.org
Wed May 23 06:28:49 EDT 2007
User: msurtani
Date: 07/05/23 06:28:49
Modified: tests/functional/org/jboss/cache/pojo/optimistic
LocalTxTest.java CachedListTest.java
AbstractOptimisticTestCase.java
Log:
Initiated a bunch of performance fixes, including replacing CopyOnWriteArraySets with org.jboss.cache.util.concurrent.ConcurrentHashSet.
Also ran an imports optimiser on the code base - there were a lot of unused imports floating about.
Revision Changes Path
1.4 +17 -22 JBossCache/tests/functional/org/jboss/cache/pojo/optimistic/LocalTxTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LocalTxTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/pojo/optimistic/LocalTxTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- LocalTxTest.java 24 Apr 2007 12:46:05 -0000 1.3
+++ LocalTxTest.java 23 May 2007 10:28:49 -0000 1.4
@@ -22,36 +22,31 @@
package org.jboss.cache.pojo.optimistic;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.UserTransaction;
-
import junit.framework.Test;
import junit.framework.TestSuite;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.Cache;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
-import org.jboss.cache.Node;
import org.jboss.cache.pojo.PojoCache;
-import org.jboss.cache.pojo.TestingUtil;
import org.jboss.cache.pojo.test.Address;
import org.jboss.cache.pojo.test.Person;
import org.jboss.cache.pojo.util.CacheApiUtil;
import org.jboss.cache.transaction.DummyTransactionManager;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.UserTransaction;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+
/**
*/
public class LocalTxTest extends AbstractOptimisticTestCase
1.3 +10 -11 JBossCache/tests/functional/org/jboss/cache/pojo/optimistic/CachedListTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CachedListTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/pojo/optimistic/CachedListTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CachedListTest.java 18 Feb 2007 03:37:03 -0000 1.2
+++ CachedListTest.java 23 May 2007 10:28:49 -0000 1.3
@@ -22,18 +22,16 @@
package org.jboss.cache.pojo.optimistic;
-import junit.framework.TestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.pojo.PojoCache;
-import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.test.Address;
-import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.ListIterator;
import java.util.NoSuchElementException;
@@ -165,6 +163,7 @@
/**
* TODO: Failed for optimistic locking during iterator. Need to revisit.
+ *
* @throws Throwable
*/
public void XtestListIterator() throws Throwable
@@ -372,19 +371,19 @@
list1.add("ID1");
list1.add("ID2");
cache_.attach("test1", list1);
- list1 = (List)cache_.find("test1");
+ list1 = (List) cache_.find("test1");
List list2 = new ArrayList();
list2.add("ID1");
list2.add("ID2");
cache_.attach("test2", list2);
- list2 = (List)cache_.find("test2");
+ list2 = (List) cache_.find("test2");
List list3 = new ArrayList();
list3.add("ID2");
list3.add("ID1");
cache_.attach("test3", list3);
- list3 = (List)cache_.find("test3");
+ list3 = (List) cache_.find("test3");
assertEquals("List should be equal: ", list1, list1);
assertTrue("List should be equal: ", list1.equals(list1));
@@ -396,19 +395,19 @@
{
List list1 = new ArrayList();
cache_.attach("test1", list1);
- list1 = (List)cache_.find("test1");
+ list1 = (List) cache_.find("test1");
list1.add("ID1");
list1.add("ID2");
List list2 = new ArrayList();
cache_.attach("test2", list2);
- list2 = (List)cache_.find("test2");
+ list2 = (List) cache_.find("test2");
list2.add("ID1");
list2.add("ID2");
List list3 = new ArrayList();
cache_.attach("test3", list3);
- list3 = (List)cache_.find("test3");
+ list3 = (List) cache_.find("test3");
list3.add("ID2");
list3.add("ID1");
1.3 +43 -43 JBossCache/tests/functional/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractOptimisticTestCase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AbstractOptimisticTestCase.java 7 Feb 2007 22:06:55 -0000 1.2
+++ AbstractOptimisticTestCase.java 23 May 2007 10:28:49 -0000 1.3
@@ -23,38 +23,38 @@
package org.jboss.cache.pojo.optimistic;
import junit.framework.TestCase;
-import org.jboss.cache.Fqn;
import org.jboss.cache.CacheListener;
import org.jboss.cache.CacheSPI;
-import org.jboss.cache.pojo.PojoCache;
-import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.marshall.MethodCall;
-import org.jboss.cache.marshall.MethodCallFactory;
-import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.interceptors.Interceptor;
import org.jboss.cache.interceptors.InvocationContextInterceptor;
-import org.jboss.cache.interceptors.TxInterceptor;
-import org.jboss.cache.interceptors.OptimisticReplicationInterceptor;
import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor;
import org.jboss.cache.interceptors.OptimisticNodeInterceptor;
-import org.jboss.cache.transaction.DummyTransactionManager;
-import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.interceptors.OptimisticReplicationInterceptor;
+import org.jboss.cache.interceptors.TxInterceptor;
import org.jboss.cache.lock.IsolationLevel;
-import org.jboss.cache.factories.XmlConfigurationParser;
-import org.jboss.cache.xml.XmlHelper;
-import org.jboss.cache.optimistic.TestListener;
+import org.jboss.cache.marshall.MethodCall;
+import org.jboss.cache.marshall.MethodCallFactory;
+import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.misc.TestingUtil;
import org.jboss.cache.optimistic.DefaultDataVersion;
-import org.jboss.cache.config.Configuration;
-import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.optimistic.TestListener;
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
-import javax.transaction.TransactionManager;
import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
import java.io.File;
-import java.util.Random;
-import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
/**
* Base test for optimistic locking. Copied from Cache counterpart.
More information about the jboss-cvs-commits
mailing list