[jboss-svn-commits] JBL Code SVN: r7899 - labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2006-11-28 16:26:15 -0500 (Tue, 28 Nov 2006)
New Revision: 7899

Modified:
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/ObjectHashMapTest2.java
Log:
-fixed jdk1.5 code

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/ObjectHashMapTest2.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/ObjectHashMapTest2.java	2006-11-28 21:20:59 UTC (rev 7898)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/ObjectHashMapTest2.java	2006-11-28 21:26:15 UTC (rev 7899)
@@ -57,34 +57,36 @@
 		}
 	}
 	
-	public void testStringData2() {
+	public void testJUHashMap1() {
 		int count = 100000;
-		ObjectHashMap map = new ObjectHashMap();
+		java.util.HashMap map = new java.util.HashMap();
 		assertNotNull(map);
-		long start = System.nanoTime();
+		long start = System.currentTimeMillis();
 		for (int idx=0; idx < count; idx++) {
 			String key = "key" + idx;
 			String strval = "value" + idx;
 			map.put(key,strval);
 		}
-		long end = System.nanoTime();
-		System.out.println("Custom ObjectHashMap put(key,value) ET - " + ((end-start)/1000000));
-	}
+		long end = System.currentTimeMillis();
+		System.out.println("java.util.HashMap put(key,value) ET - " + ((end-start)));
+	}	
 	
-	public void testJUHashMap1() {
+	public void testStringData2() {
 		int count = 100000;
-		java.util.HashMap map = new java.util.HashMap();
+		ObjectHashMap map = new ObjectHashMap();
 		assertNotNull(map);
-		long start = System.nanoTime();
+		long start = System.currentTimeMillis();
 		for (int idx=0; idx < count; idx++) {
 			String key = "key" + idx;
 			String strval = "value" + idx;
 			map.put(key,strval);
 		}
-		long end = System.nanoTime();
-		System.out.println("java.util.HashMap put(key,value) ET - " + ((end-start)/1000000));
+		long end = System.currentTimeMillis();
+		System.out.println("Custom ObjectHashMap put(key,value) ET - " + ((end-start)));
 	}
+	
 
+
 	public void testStringData3() {
 		int count = 100000;
 		ObjectHashMap map = new ObjectHashMap();
@@ -94,13 +96,13 @@
 			String strval = "value" + idx;
 			map.put(key,strval);
 		}
-		long start = System.nanoTime();
+		long start = System.currentTimeMillis();
 		for (int idx=0; idx < count; idx++) {
 			String key = "key" + idx;
 			map.get(key);
 		}
-		long end = System.nanoTime();
-		System.out.println("Custom ObjectHashMap get(key) ET - " + ((end-start)/1000000));
+		long end = System.currentTimeMillis();
+		System.out.println("Custom ObjectHashMap get(key) ET - " + ((end-start)));
 	}
 	
 	public void testJUHashMap2() {
@@ -112,13 +114,13 @@
 			String strval = "value" + idx;
 			map.put(key,strval);
 		}
-		long start = System.nanoTime();
+		long start = System.currentTimeMillis();
 		for (int idx=0; idx < count; idx++) {
 			String key = "key" + idx;
 			map.get(key);
 		}
-		long end = System.nanoTime();
-		System.out.println("java.util.HashMap get(key) ET - " + ((end-start)/1000000));
+		long end = System.currentTimeMillis();
+		System.out.println("java.util.HashMap get(key) ET - " + ((end-start)));
 	}
 	
 	public void testStringData4() {
@@ -130,14 +132,14 @@
 			String strval = "value" + idx;
 			map.put(key,strval);
 		}
-		long start = System.nanoTime();
+		long start = System.currentTimeMillis();
 		org.drools.util.Iterator itr = map.iterator();
 		Object val = null;
 		while ( (val = itr.next()) != null) {
 			val.hashCode();
 		}
-		long end = System.nanoTime();
-		System.out.println("Custom ObjectHashMap iterate ET - " + ((end-start)/1000000));
+		long end = System.currentTimeMillis();
+		System.out.println("Custom ObjectHashMap iterate ET - " + ((end-start)));
 	}
 
 	public void testJUHashMap3() {
@@ -149,28 +151,27 @@
 			String strval = "value" + idx;
 			map.put(key,strval);
 		}
-		long start = System.nanoTime();
+		long start = System.currentTimeMillis();
 		java.util.Iterator itr = map.values().iterator();
-		Object val = null;
 		while ( itr.hasNext()) {
 			itr.next().hashCode();
 		}
-		long end = System.nanoTime();
-		System.out.println("java.util.HashMap iterate ET - " + ((end-start)/1000000));
+		long end = System.currentTimeMillis();
+		System.out.println("java.util.HashMap iterate ET - " + ((end-start)));
 	}
 	
 	public void testStringData5() {
 		int count = 100000;
 		ObjectHashMap map = new ObjectHashMap();
 		assertNotNull(map);
-		long start = System.nanoTime();
+		long start = System.currentTimeMillis();
 		for (int idx=0; idx < count; idx++) {
 			String key = "key" + idx;
 			String strval = "value" + idx;
 			map.put(key,strval,false);
 		}
-		long end = System.nanoTime();
-		System.out.println("Custom ObjectHashMap dup false ET - " + ((end-start)/1000000));
+		long end = System.currentTimeMillis();
+		System.out.println("Custom ObjectHashMap dup false ET - " + ((end-start)));
 	}
 	
 	public static void main(String[] args) {