From 076229fabc7c24f15c8a22d5fdbe0b35415deb72 Mon Sep 17 00:00:00 2001 From: Jay J Wylie Date: Mon, 3 Dec 2012 15:35:12 -0800 Subject: [PATCH] Minor changes to tests - renamed base keyedresourcepool test to avoid pattern that ant/junit uses to try and run tests. - tweaked stress tests parameters once more to make it easier to run locally. --- ...2EClientRequestExecutorPoolAndFailureDetectorTest.java | 8 ++++---- .../utils/pool/KeyedResourcePoolContentionTest.java | 2 +- .../voldemort/utils/pool/KeyedResourcePoolRaceTest.java | 2 +- test/unit/voldemort/utils/pool/KeyedResourcePoolTest.java | 2 +- ...cePoolBaseTest.java => KeyedResourcePoolTestBase.java} | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename test/unit/voldemort/utils/pool/{KeyedResourcePoolBaseTest.java => KeyedResourcePoolTestBase.java} (99%) diff --git a/test/integration/voldemort/socketpool/E2EClientRequestExecutorPoolAndFailureDetectorTest.java b/test/integration/voldemort/socketpool/E2EClientRequestExecutorPoolAndFailureDetectorTest.java index cd702de950..49421e1112 100644 --- a/test/integration/voldemort/socketpool/E2EClientRequestExecutorPoolAndFailureDetectorTest.java +++ b/test/integration/voldemort/socketpool/E2EClientRequestExecutorPoolAndFailureDetectorTest.java @@ -312,12 +312,12 @@ public void stressTest() { final int CONNECTIONS_PER_NODE_END = 20; final int CONNECTIONS_PER_NODE_STEP = 5; - final int NUM_PUTTERS_START = 100; - final int NUM_PUTTERS_END = 100; + final int NUM_PUTTERS_START = 50; + final int NUM_PUTTERS_END = 50; final int NUM_PUTTERS_STEP = 25; - final int NUM_GETTERS_START = 100; - final int NUM_GETTERS_END = 100; + final int NUM_GETTERS_START = 50; + final int NUM_GETTERS_END = 50; final int NUM_GETTERS_STEP = 25; final int NUM_OPS = 1000; diff --git a/test/unit/voldemort/utils/pool/KeyedResourcePoolContentionTest.java b/test/unit/voldemort/utils/pool/KeyedResourcePoolContentionTest.java index 528a418a3c..c565f4c0ed 100644 --- a/test/unit/voldemort/utils/pool/KeyedResourcePoolContentionTest.java +++ b/test/unit/voldemort/utils/pool/KeyedResourcePoolContentionTest.java @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; -public class KeyedResourcePoolContentionTest extends KeyedResourcePoolBaseTest { +public class KeyedResourcePoolContentionTest extends KeyedResourcePoolTestBase { protected static int POOL_SIZE = 5; protected static long TIMEOUT_MS = 500; diff --git a/test/unit/voldemort/utils/pool/KeyedResourcePoolRaceTest.java b/test/unit/voldemort/utils/pool/KeyedResourcePoolRaceTest.java index 982558f35f..0ec0f9a2dd 100644 --- a/test/unit/voldemort/utils/pool/KeyedResourcePoolRaceTest.java +++ b/test/unit/voldemort/utils/pool/KeyedResourcePoolRaceTest.java @@ -30,7 +30,7 @@ import org.junit.Before; import org.junit.Test; -public class KeyedResourcePoolRaceTest extends KeyedResourcePoolBaseTest { +public class KeyedResourcePoolRaceTest extends KeyedResourcePoolTestBase { protected static final int POOL_SIZE = 100; protected static final long TIMEOUT_MS = 500; diff --git a/test/unit/voldemort/utils/pool/KeyedResourcePoolTest.java b/test/unit/voldemort/utils/pool/KeyedResourcePoolTest.java index 482e4e6091..cf94885a5f 100644 --- a/test/unit/voldemort/utils/pool/KeyedResourcePoolTest.java +++ b/test/unit/voldemort/utils/pool/KeyedResourcePoolTest.java @@ -30,7 +30,7 @@ import voldemort.utils.Time; -public class KeyedResourcePoolTest extends KeyedResourcePoolBaseTest { +public class KeyedResourcePoolTest extends KeyedResourcePoolTestBase { protected static int POOL_SIZE = 5; protected static long TIMEOUT_MS = 500; diff --git a/test/unit/voldemort/utils/pool/KeyedResourcePoolBaseTest.java b/test/unit/voldemort/utils/pool/KeyedResourcePoolTestBase.java similarity index 99% rename from test/unit/voldemort/utils/pool/KeyedResourcePoolBaseTest.java rename to test/unit/voldemort/utils/pool/KeyedResourcePoolTestBase.java index 1c0064e7ea..d0e5e38daf 100644 --- a/test/unit/voldemort/utils/pool/KeyedResourcePoolBaseTest.java +++ b/test/unit/voldemort/utils/pool/KeyedResourcePoolTestBase.java @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -public class KeyedResourcePoolBaseTest { +public class KeyedResourcePoolTestBase { protected TestResourceFactory factory; protected KeyedResourcePool pool;