From 8a95808d3762ee4645dd5de1f0b0844c254e8638 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 2 Jul 2010 02:35:07 +0300 Subject: Fix: Add missing imports; Add warmup phase to primitive hashmap test --- src/junit/com/jogamp/common/util/IntIntHashMapTest.java | 13 ++++++++++--- src/junit/com/jogamp/common/util/LongIntHashMapTest.java | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) (limited to 'src/junit') diff --git a/src/junit/com/jogamp/common/util/IntIntHashMapTest.java b/src/junit/com/jogamp/common/util/IntIntHashMapTest.java index bc02947..9d58db0 100644 --- a/src/junit/com/jogamp/common/util/IntIntHashMapTest.java +++ b/src/junit/com/jogamp/common/util/IntIntHashMapTest.java @@ -105,6 +105,11 @@ public class IntIntHashMapTest { @Test public void benchmark() { + benchmark(true); + benchmark(false); + } + + void benchmark(boolean warmup) { // simple benchmark final IntIntHashMap intmap = new IntIntHashMap(1024); @@ -158,9 +163,11 @@ public class IntIntHashMapTest { map.remove(rndValues[i]); } - assertTrue("'put' to slow", intmapPutTime <= mapPutTime); - assertTrue("'get' to slow", intmapGetTime <= mapGetTime); - assertTrue("'remove' to slow", intmapRemoveTime <= mapRemoveTime); + if(!warmup) { + assertTrue("'put' too slow", intmapPutTime <= mapPutTime); + assertTrue("'get' too slow", intmapGetTime <= mapGetTime); + assertTrue("'remove' too slow", intmapRemoveTime <= mapRemoveTime); + } } diff --git a/src/junit/com/jogamp/common/util/LongIntHashMapTest.java b/src/junit/com/jogamp/common/util/LongIntHashMapTest.java index b51211c..7fc8978 100644 --- a/src/junit/com/jogamp/common/util/LongIntHashMapTest.java +++ b/src/junit/com/jogamp/common/util/LongIntHashMapTest.java @@ -105,6 +105,11 @@ public class LongIntHashMapTest { @Test public void benchmark() { + benchmark(true); + benchmark(false); + } + + void benchmark(boolean warmup) { // simple benchmark final LongIntHashMap intmap = new LongIntHashMap(1024); @@ -158,9 +163,11 @@ public class LongIntHashMapTest { map.remove(rndValues[i]); } - assertTrue("'put' to slow", intmapPutTime <= mapPutTime); - assertTrue("'get' to slow", intmapGetTime <= mapGetTime); - assertTrue("'remove' to slow", intmapRemoveTime <= mapRemoveTime); + if(!warmup) { + assertTrue("'put' too slow", intmapPutTime <= mapPutTime); + assertTrue("'get' too slow", intmapGetTime <= mapGetTime); + assertTrue("'remove' too slow", intmapRemoveTime <= mapRemoveTime); + } } -- cgit v1.2.3