From a773bb984ecdce67f961591eb91008575e5d38b5 Mon Sep 17 00:00:00 2001 From: Nikita Date: Sat, 4 Jan 2014 11:08:12 +0400 Subject: [PATCH] Base test classes renamed --- .../{RedissonConcurrentTest.java => BaseConcurrentTest.java} | 2 +- .../java/org/redisson/{BaseRedissonTest.java => BaseTest.java} | 2 +- src/test/java/org/redisson/RedissonConcurrentMapTest.java | 2 +- src/test/java/org/redisson/RedissonListTest.java | 2 +- src/test/java/org/redisson/RedissonLockTest.java | 2 +- src/test/java/org/redisson/RedissonSetTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/test/java/org/redisson/{RedissonConcurrentTest.java => BaseConcurrentTest.java} (97%) rename src/test/java/org/redisson/{BaseRedissonTest.java => BaseTest.java} (86%) diff --git a/src/test/java/org/redisson/RedissonConcurrentTest.java b/src/test/java/org/redisson/BaseConcurrentTest.java similarity index 97% rename from src/test/java/org/redisson/RedissonConcurrentTest.java rename to src/test/java/org/redisson/BaseConcurrentTest.java index 0fe5fb891..978d7054d 100644 --- a/src/test/java/org/redisson/RedissonConcurrentTest.java +++ b/src/test/java/org/redisson/BaseConcurrentTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -public abstract class RedissonConcurrentTest { +public abstract class BaseConcurrentTest { protected void testMultiInstanceConcurrency(int iterations, final RedissonRunnable runnable) throws InterruptedException { ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()); diff --git a/src/test/java/org/redisson/BaseRedissonTest.java b/src/test/java/org/redisson/BaseTest.java similarity index 86% rename from src/test/java/org/redisson/BaseRedissonTest.java rename to src/test/java/org/redisson/BaseTest.java index a6a8cbbd0..431f15e80 100644 --- a/src/test/java/org/redisson/BaseRedissonTest.java +++ b/src/test/java/org/redisson/BaseTest.java @@ -4,7 +4,7 @@ import java.util.Collection; import org.junit.Assert; -public abstract class BaseRedissonTest { +public abstract class BaseTest { protected void clear(Collection collection, Redisson redisson) { collection.clear(); diff --git a/src/test/java/org/redisson/RedissonConcurrentMapTest.java b/src/test/java/org/redisson/RedissonConcurrentMapTest.java index 12811bc2c..c587f4504 100644 --- a/src/test/java/org/redisson/RedissonConcurrentMapTest.java +++ b/src/test/java/org/redisson/RedissonConcurrentMapTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.ConcurrentMap; import org.junit.Assert; import org.junit.Test; -public class RedissonConcurrentMapTest extends RedissonConcurrentTest { +public class RedissonConcurrentMapTest extends BaseConcurrentTest { @Test public void testSingleReplaceOldValue_SingleInstance() throws InterruptedException { diff --git a/src/test/java/org/redisson/RedissonListTest.java b/src/test/java/org/redisson/RedissonListTest.java index e79223628..f7913213f 100644 --- a/src/test/java/org/redisson/RedissonListTest.java +++ b/src/test/java/org/redisson/RedissonListTest.java @@ -12,7 +12,7 @@ import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Test; -public class RedissonListTest extends BaseRedissonTest { +public class RedissonListTest extends BaseTest { @Test(expected = IllegalStateException.class) public void testListIteratorSetListFail() { diff --git a/src/test/java/org/redisson/RedissonLockTest.java b/src/test/java/org/redisson/RedissonLockTest.java index af0b8bae1..638431a26 100644 --- a/src/test/java/org/redisson/RedissonLockTest.java +++ b/src/test/java/org/redisson/RedissonLockTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.locks.Lock; import org.junit.Assert; import org.junit.Test; -public class RedissonLockTest extends RedissonConcurrentTest { +public class RedissonLockTest extends BaseConcurrentTest { @Test public void testLockUnlock() { diff --git a/src/test/java/org/redisson/RedissonSetTest.java b/src/test/java/org/redisson/RedissonSetTest.java index 8554af848..0ace5072e 100644 --- a/src/test/java/org/redisson/RedissonSetTest.java +++ b/src/test/java/org/redisson/RedissonSetTest.java @@ -9,7 +9,7 @@ import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Test; -public class RedissonSetTest extends BaseRedissonTest { +public class RedissonSetTest extends BaseTest { @Test public void testContainsAll() {