[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/loader ...
Manik Surtani
manik at jboss.org
Wed May 23 06:28:54 EDT 2007
User: msurtani
Date: 07/05/23 06:28:54
Modified: tests/functional/org/jboss/cache/loader
BdbjeCacheLoaderTest.java
C3p0ConnectionFactoryTest.java
ChainingCacheLoaderBasicTest.java
C3p0JDBCCacheLoaderTest.java
CacheLoaderTestsBase.java
ChainingCacheLoaderFullTest.java
JdbmCacheLoaderTest.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.20 +14 -16 JBossCache/tests/functional/org/jboss/cache/loader/BdbjeCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BdbjeCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/BdbjeCacheLoaderTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- BdbjeCacheLoaderTest.java 1 Feb 2007 16:33:10 -0000 1.19
+++ BdbjeCacheLoaderTest.java 23 May 2007 10:28:54 -0000 1.20
@@ -2,16 +2,13 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-
-import java.io.File;
-import java.io.FileFilter;
-
import org.jboss.cache.misc.TestingUtil;
/**
* Runs the same tests as {@link FileCacheLoaderTest}, but with Berkeley DB instead of a file-based CacheLoader
+ *
* @author Bela Ban
- * @version $Id: BdbjeCacheLoaderTest.java,v 1.19 2007/02/01 16:33:10 msurtani Exp $
+ * @version $Id: BdbjeCacheLoaderTest.java,v 1.20 2007/05/23 10:28:54 msurtani Exp $
*/
public class BdbjeCacheLoaderTest extends CacheLoaderTestsBase
{
@@ -24,7 +21,8 @@
TestingUtil.recursiveFileRemove(tmpCLLoc);
}
- public static Test suite() {
+ public static Test suite()
+ {
return new TestSuite(BdbjeCacheLoaderTest.class);
}
1.4 +5 -5 JBossCache/tests/functional/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: C3p0ConnectionFactoryTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- C3p0ConnectionFactoryTest.java 5 Mar 2007 21:10:48 -0000 1.3
+++ C3p0ConnectionFactoryTest.java 23 May 2007 10:28:54 -0000 1.4
@@ -8,13 +8,12 @@
import com.mchange.v2.c3p0.PooledDataSource;
import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import java.sql.Connection;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Unit test for C3p0ConnectionFactory
*
@@ -113,7 +112,8 @@
{
prop.load(this.getClass().getClassLoader().getResourceAsStream(resource));
return prop;
- } catch (Exception e)
+ }
+ catch (Exception e)
{
log("Error loading jdbc properties ");
throw (e);
1.7 +56 -57 JBossCache/tests/functional/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChainingCacheLoaderBasicTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ChainingCacheLoaderBasicTest.java 2 Feb 2007 13:32:01 -0000 1.6
+++ ChainingCacheLoaderBasicTest.java 23 May 2007 10:28:54 -0000 1.7
@@ -8,11 +8,10 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.factories.XmlConfigurationParser;
-import org.jboss.cache.xml.XmlHelper;
import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
import java.io.File;
1.3 +10 -11 JBossCache/tests/functional/org/jboss/cache/loader/C3p0JDBCCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: C3p0JDBCCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/C3p0JDBCCacheLoaderTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- C3p0JDBCCacheLoaderTest.java 10 Feb 2007 17:47:02 -0000 1.2
+++ C3p0JDBCCacheLoaderTest.java 23 May 2007 10:28:54 -0000 1.3
@@ -6,14 +6,13 @@
*/
package org.jboss.cache.loader;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.util.Properties;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* Unit test that runs the the tests defined JDBCCacheLoaderTest using a standalone
* connection pool factory based on c3p0 library.
1.48 +23 -24 JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderTestsBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderTestsBase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderTestsBase.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- CacheLoaderTestsBase.java 7 Feb 2007 22:06:49 -0000 1.47
+++ CacheLoaderTestsBase.java 23 May 2007 10:28:54 -0000 1.48
@@ -17,7 +17,6 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import javax.transaction.Status;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -32,7 +31,7 @@
* Commons tests for all CacheLoaders
*
* @author Bela Ban
- * @version $Id: CacheLoaderTestsBase.java,v 1.47 2007/02/07 22:06:49 genman Exp $
+ * @version $Id: CacheLoaderTestsBase.java,v 1.48 2007/05/23 10:28:54 msurtani Exp $
*/
abstract public class CacheLoaderTestsBase extends AbstractCacheLoaderTestBase
{
1.14 +22 -22 JBossCache/tests/functional/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChainingCacheLoaderFullTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ChainingCacheLoaderFullTest.java 7 Feb 2007 22:06:49 -0000 1.13
+++ ChainingCacheLoaderFullTest.java 23 May 2007 10:28:54 -0000 1.14
@@ -13,9 +13,9 @@
import org.jboss.cache.CacheImpl;
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
-import org.jboss.cache.misc.TestingUtil;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.misc.TestingUtil;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
1.8 +1 -5 JBossCache/tests/functional/org/jboss/cache/loader/JdbmCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JdbmCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/JdbmCacheLoaderTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- JdbmCacheLoaderTest.java 1 Feb 2007 16:33:10 -0000 1.7
+++ JdbmCacheLoaderTest.java 23 May 2007 10:28:54 -0000 1.8
@@ -2,17 +2,13 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-
-import java.io.File;
-import java.io.FileFilter;
-
import org.jboss.cache.misc.TestingUtil;
/**
* Tests {@link org.jboss.cache.loader.jdbm.JdbmCacheLoader}.
*
* @author Elias Ross
- * @version $Id: JdbmCacheLoaderTest.java,v 1.7 2007/02/01 16:33:10 msurtani Exp $
+ * @version $Id: JdbmCacheLoaderTest.java,v 1.8 2007/05/23 10:28:54 msurtani Exp $
*/
public class JdbmCacheLoaderTest extends CacheLoaderTestsBase
{
More information about the jboss-cvs-commits
mailing list