[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/mgmt ...
Manik Surtani
msurtani at jboss.com
Sat Dec 30 14:48:46 EST 2006
User: msurtani
Date: 06/12/30 14:48:46
Modified: tests/functional/org/jboss/cache/mgmt MgmtCoreTest.java
InvalidationTest.java TxTest.java
CacheLoaderTest.java PassivationTest.java
Log:
Genericised, autoboxed
Revision Changes Path
1.9 +19 -19 JBossCache/tests/functional/org/jboss/cache/mgmt/MgmtCoreTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MgmtCoreTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/mgmt/MgmtCoreTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- MgmtCoreTest.java 30 Dec 2006 17:49:57 -0000 1.8
+++ MgmtCoreTest.java 30 Dec 2006 19:48:46 -0000 1.9
@@ -15,7 +15,7 @@
* Simple functional tests for CacheMgmtInterceptor
*
* @author Jerry Gauthier
- * @version $Id: MgmtCoreTest.java,v 1.8 2006/12/30 17:49:57 msurtani Exp $
+ * @version $Id: MgmtCoreTest.java,v 1.9 2006/12/30 19:48:46 msurtani Exp $
*/
public class MgmtCoreTest extends TestCase
{
@@ -107,8 +107,8 @@
assertEquals("Evictions count error: ", new Long(0), new Long(mgmt.getEvictions()));
assertEquals("Hits count error: ", new Long(18), new Long(mgmt.getHits()));
assertEquals("Misses count error: ", new Long(6), new Long(mgmt.getMisses()));
- assertEquals("HitMissRatio error: ", new Double(0.75), new Double(mgmt.getHitMissRatio()));
- assertEquals("ReadWriteRatio error: ", new Double(0.60), new Double(mgmt.getReadWriteRatio()));
+ assertEquals("HitMissRatio error: ", 0.75, mgmt.getHitMissRatio());
+ assertEquals("ReadWriteRatio error: ", 0.60, mgmt.getReadWriteRatio());
// now evict some nodes (each node has 3 attributes)
cache.evict(Fqn.fromString("Europe/Czech Republic"));
@@ -178,41 +178,41 @@
cache.put("Europe/Poland", CURRENCY, "Zloty");
cache.put("Europe/Switzerland", CURRENCY, "Swiss Franc");
- cache.put("Europe/Austria", POPULATION, new Integer(8184691));
- cache.put("Europe/Czech Republic", POPULATION, new Integer(10241138));
- cache.put("Europe/England", POPULATION, new Integer(60441457));
- cache.put("Europe/France", POPULATION, new Integer(60656178));
- cache.put("Europe/Germany", POPULATION, new Integer(82431390));
- cache.put("Europe/Italy", POPULATION, new Integer(58103033));
- cache.put("Europe/Poland", POPULATION, new Integer(38635144));
- cache.put("Europe/Switzerland", POPULATION, new Integer(7489370));
+ cache.put("Europe/Austria", POPULATION, 8184691);
+ cache.put("Europe/Czech Republic", POPULATION, 10241138);
+ cache.put("Europe/England", POPULATION, 60441457);
+ cache.put("Europe/France", POPULATION, 60656178);
+ cache.put("Europe/Germany", POPULATION, 82431390);
+ cache.put("Europe/Italy", POPULATION, 58103033);
+ cache.put("Europe/Poland", POPULATION, 38635144);
+ cache.put("Europe/Switzerland", POPULATION, 7489370);
HashMap albania = new HashMap(4);
albania.put(CAPITAL, "Tirana");
albania.put(CURRENCY, "Lek");
- albania.put(POPULATION, new Integer(3563112));
- albania.put(AREA, new Integer(28748));
+ albania.put(POPULATION, 3563112);
+ albania.put(AREA, 28748);
cache.put("Europe/Albania", albania);
HashMap hungary = new HashMap(4);
hungary.put(CAPITAL, "Budapest");
hungary.put(CURRENCY, "Forint");
- hungary.put(POPULATION, new Integer(10006835));
- hungary.put(AREA, new Integer(93030));
+ hungary.put(POPULATION, 10006835);
+ hungary.put(AREA, 93030);
cache.put("Europe/Hungary", hungary);
HashMap romania = new HashMap(4);
romania.put(CAPITAL, "Bucharest");
romania.put(CURRENCY, "Leu");
- romania.put(POPULATION, new Integer(22329977));
- romania.put(AREA, new Integer(237500));
+ romania.put(POPULATION, 22329977);
+ romania.put(AREA, 237500);
cache.put("Europe/Romania", romania);
HashMap slovakia = new HashMap(4);
slovakia.put(CAPITAL, "Bratislava");
slovakia.put(CURRENCY, "Slovak Koruna");
- slovakia.put(POPULATION, new Integer(5431363));
- slovakia.put(AREA, new Integer(48845));
+ slovakia.put(POPULATION, 5431363);
+ slovakia.put(AREA, 48845);
cache.put("Europe/Slovakia", slovakia);
}
1.10 +7 -7 JBossCache/tests/functional/org/jboss/cache/mgmt/InvalidationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InvalidationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/mgmt/InvalidationTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- InvalidationTest.java 30 Dec 2006 17:49:57 -0000 1.9
+++ InvalidationTest.java 30 Dec 2006 19:48:46 -0000 1.10
@@ -16,7 +16,7 @@
* Simple functional tests for InvalidationInterceptor statistics
*
* @author Jerry Gauthier
- * @version $Id: InvalidationTest.java,v 1.9 2006/12/30 17:49:57 msurtani Exp $
+ * @version $Id: InvalidationTest.java,v 1.10 2006/12/30 19:48:46 msurtani Exp $
*/
public class InvalidationTest extends TestCase
{
@@ -115,13 +115,13 @@
cache.put("Europe/Austria", new HashMap());
cache.put("Europe/Austria", CAPITAL, "Vienna");
cache.put("Europe/Austria", CURRENCY, "Euro");
- cache.put("Europe/Austria", POPULATION, new Integer(8184691));
+ cache.put("Europe/Austria", POPULATION, 8184691);
HashMap albania = new HashMap(4);
albania.put(CAPITAL, "Tirana");
albania.put(CURRENCY, "Lek");
- albania.put(POPULATION, new Integer(3563112));
- albania.put(AREA, new Integer(28748));
+ albania.put(POPULATION, 3563112);
+ albania.put(AREA, 28748);
cache.put("Europe/Albania", albania);
}
@@ -132,13 +132,13 @@
cache.put("Europe/Austria", new HashMap());
cache.put("Europe/Austria", CAPITAL, "Vienna");
cache.put("Europe/Austria", CURRENCY, "Euro");
- cache.put("Europe/Austria", POPULATION, new Integer(8184691));
+ cache.put("Europe/Austria", POPULATION, 8184691);
cache.put("Europe/Romania", new HashMap());
cache.put("Europe/Romania", CAPITAL, "Bucharest");
cache.put("Europe/Romania", CURRENCY, "Leu");
- cache.put("Europe/Romania", POPULATION, new Integer(22329977));
- cache.put("Europe/Romania", AREA, new Integer(237500));
+ cache.put("Europe/Romania", POPULATION, 22329977);
+ cache.put("Europe/Romania", AREA, 237500);
}
1.10 +12 -12 JBossCache/tests/functional/org/jboss/cache/mgmt/TxTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TxTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/mgmt/TxTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- TxTest.java 30 Dec 2006 17:49:57 -0000 1.9
+++ TxTest.java 30 Dec 2006 19:48:46 -0000 1.10
@@ -17,7 +17,7 @@
* Simple functional tests for TxInterceptor statistics
*
* @author Jerry Gauthier
- * @version $Id: TxTest.java,v 1.9 2006/12/30 17:49:57 msurtani Exp $
+ * @version $Id: TxTest.java,v 1.10 2006/12/30 19:48:46 msurtani Exp $
*/
public class TxTest extends TestCase
{
@@ -140,13 +140,13 @@
cache.put("Europe/Austria", new HashMap());
cache.put("Europe/Austria", CAPITAL, "Vienna");
cache.put("Europe/Austria", CURRENCY, "Euro");
- cache.put("Europe/Austria", POPULATION, new Integer(8184691));
+ cache.put("Europe/Austria", POPULATION, 8184691);
HashMap albania = new HashMap(4);
albania.put(CAPITAL, "Tirana");
albania.put(CURRENCY, "Lek");
- albania.put(POPULATION, new Integer(3563112));
- albania.put(AREA, new Integer(28748));
+ albania.put(POPULATION, 3563112);
+ albania.put(AREA, 28748);
cache.put("Europe/Albania", albania);
}
@@ -157,12 +157,12 @@
cache.put("Europe/Czech Republic", new HashMap());
cache.put("Europe/Czech Republic", CAPITAL, "Prague");
cache.put("Europe/Czech Republic", CURRENCY, "Czech Koruna");
- cache.put("Europe/Czech Republic", POPULATION, new Integer(10241138));
+ cache.put("Europe/Czech Republic", POPULATION, 10241138);
cache.put("Europe/England", new HashMap());
cache.put("Europe/England", CAPITAL, "London");
cache.put("Europe/England", CURRENCY, "British Pound");
- cache.put("Europe/England", POPULATION, new Integer(60441457));
+ cache.put("Europe/England", POPULATION, 60441457);
tm.commit();
}
@@ -174,15 +174,15 @@
HashMap hungary = new HashMap(4);
hungary.put(CAPITAL, "Budapest");
hungary.put(CURRENCY, "Forint");
- hungary.put(POPULATION, new Integer(10006835));
- hungary.put(AREA, new Integer(93030));
+ hungary.put(POPULATION, 10006835);
+ hungary.put(AREA, 93030);
cache.put("Europe/Hungary", hungary);
HashMap romania = new HashMap(4);
romania.put(CAPITAL, "Bucharest");
romania.put(CURRENCY, "Leu");
- romania.put(POPULATION, new Integer(22329977));
- romania.put(AREA, new Integer(237500));
+ romania.put(POPULATION, 22329977);
+ romania.put(AREA, 237500);
cache.put("Europe/Romania", romania);
tm.commit();
@@ -195,12 +195,12 @@
cache.put("Europe/France", new HashMap());
cache.put("Europe/France", CAPITAL, "Paris");
cache.put("Europe/France", CURRENCY, "Euro");
- cache.put("Europe/France", POPULATION, new Integer(60656178));
+ cache.put("Europe/France", POPULATION, 60656178);
cache.put("Europe/Germany", new HashMap());
cache.put("Europe/Germany", CAPITAL, "Berlin");
cache.put("Europe/Germany", CURRENCY, "Euro");
- cache.put("Europe/Germany", POPULATION, new Integer(82431390));
+ cache.put("Europe/Germany", POPULATION, 82431390);
tm.rollback();
}
1.11 +7 -7 JBossCache/tests/functional/org/jboss/cache/mgmt/CacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/mgmt/CacheLoaderTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- CacheLoaderTest.java 30 Dec 2006 17:49:57 -0000 1.10
+++ CacheLoaderTest.java 30 Dec 2006 19:48:46 -0000 1.11
@@ -21,7 +21,7 @@
* Simple functional tests for CacheLoaderInterceptor and CacheStoreInterceptor statistics
*
* @author Jerry Gauthier
- * @version $Id: CacheLoaderTest.java,v 1.10 2006/12/30 17:49:57 msurtani Exp $
+ * @version $Id: CacheLoaderTest.java,v 1.11 2006/12/30 19:48:46 msurtani Exp $
*/
public class CacheLoaderTest extends TestCase
{
@@ -177,25 +177,25 @@
cache.put("Europe/Austria", new HashMap());
cache.put("Europe/Austria", CAPITAL, "Vienna");
cache.put("Europe/Austria", CURRENCY, "Euro");
- cache.put("Europe/Austria", POPULATION, new Integer(8184691));
+ cache.put("Europe/Austria", POPULATION, 8184691);
cache.put("Europe/England", new HashMap());
cache.put("Europe/England", CAPITAL, "London");
cache.put("Europe/England", CURRENCY, "British Pound");
- cache.put("Europe/England", POPULATION, new Integer(60441457));
+ cache.put("Europe/England", POPULATION, 60441457);
HashMap albania = new HashMap(4);
albania.put(CAPITAL, "Tirana");
albania.put(CURRENCY, "Lek");
- albania.put(POPULATION, new Integer(3563112));
- albania.put(AREA, new Integer(28748));
+ albania.put(POPULATION, 3563112);
+ albania.put(AREA, 28748);
cache.put("Europe/Albania", albania);
HashMap hungary = new HashMap(4);
hungary.put(CAPITAL, "Budapest");
hungary.put(CURRENCY, "Forint");
- hungary.put(POPULATION, new Integer(10006835));
- hungary.put(AREA, new Integer(93030));
+ hungary.put(POPULATION, 10006835);
+ hungary.put(AREA, 93030);
cache.put("Europe/Hungary", hungary);
}
1.9 +7 -7 JBossCache/tests/functional/org/jboss/cache/mgmt/PassivationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PassivationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/mgmt/PassivationTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- PassivationTest.java 30 Dec 2006 17:49:57 -0000 1.8
+++ PassivationTest.java 30 Dec 2006 19:48:46 -0000 1.9
@@ -21,7 +21,7 @@
* Simple functional tests for ActivationInterceptor and PassivationInterceptor statistics
*
* @author Jerry Gauthier
- * @version $Id: PassivationTest.java,v 1.8 2006/12/30 17:49:57 msurtani Exp $
+ * @version $Id: PassivationTest.java,v 1.9 2006/12/30 19:48:46 msurtani Exp $
*/
public class PassivationTest extends TestCase
{
@@ -202,25 +202,25 @@
cache.put("Europe/Austria", new HashMap());
cache.put("Europe/Austria", CAPITAL, "Vienna");
cache.put("Europe/Austria", CURRENCY, "Euro");
- cache.put("Europe/Austria", POPULATION, new Integer(8184691));
+ cache.put("Europe/Austria", POPULATION, 8184691);
cache.put("Europe/England", new HashMap());
cache.put("Europe/England", CAPITAL, "London");
cache.put("Europe/England", CURRENCY, "British Pound");
- cache.put("Europe/England", POPULATION, new Integer(60441457));
+ cache.put("Europe/England", POPULATION, 60441457);
HashMap albania = new HashMap(4);
albania.put(CAPITAL, "Tirana");
albania.put(CURRENCY, "Lek");
- albania.put(POPULATION, new Integer(3563112));
- albania.put(AREA, new Integer(28748));
+ albania.put(POPULATION, 3563112);
+ albania.put(AREA, 28748);
cache.put("Europe/Albania", albania);
HashMap hungary = new HashMap(4);
hungary.put(CAPITAL, "Budapest");
hungary.put(CURRENCY, "Forint");
- hungary.put(POPULATION, new Integer(10006835));
- hungary.put(AREA, new Integer(93030));
+ hungary.put(POPULATION, 10006835);
+ hungary.put(AREA, 93030);
cache.put("Europe/Hungary", hungary);
}
More information about the jboss-cvs-commits
mailing list