From 48b255327d0b4ba263dd2abb1a0159ceca7fedb4 Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 1 May 2014 17:23:03 +0400 Subject: [PATCH] RedissonQueueTest added --- src/test/java/org/redisson/BaseTest.java | 6 +- .../org/redisson/RedissonAtomicLongTest.java | 6 +- .../java/org/redisson/RedissonQueueTest.java | 85 +++++++++++++++++++ .../org/redisson/RedissonSortedSetTest.java | 22 ++--- 4 files changed, 100 insertions(+), 19 deletions(-) create mode 100644 src/test/java/org/redisson/RedissonQueueTest.java diff --git a/src/test/java/org/redisson/BaseTest.java b/src/test/java/org/redisson/BaseTest.java index 77eb0dc83..cb0400c5d 100644 --- a/src/test/java/org/redisson/BaseTest.java +++ b/src/test/java/org/redisson/BaseTest.java @@ -9,11 +9,7 @@ import org.junit.Before; public abstract class BaseTest { - private Redisson redisson; - - public Redisson currentRedisson() { - return redisson; - } + protected Redisson redisson; @Before public void before() { diff --git a/src/test/java/org/redisson/RedissonAtomicLongTest.java b/src/test/java/org/redisson/RedissonAtomicLongTest.java index 34f814114..ba642bed9 100644 --- a/src/test/java/org/redisson/RedissonAtomicLongTest.java +++ b/src/test/java/org/redisson/RedissonAtomicLongTest.java @@ -10,16 +10,16 @@ public class RedissonAtomicLongTest extends BaseTest { @Test public void test() { - RAtomicLong al = currentRedisson().getAtomicLong("test"); + RAtomicLong al = redisson.getAtomicLong("test"); Assert.assertEquals(0, al.get()); Assert.assertEquals(0, al.getAndIncrement()); Assert.assertEquals(1, al.get()); - long state = currentRedisson().getAtomicLong("test").get(); + long state = redisson.getAtomicLong("test").get(); Assert.assertEquals(1, state); al.set(Long.MAX_VALUE - 1000); - long newState = currentRedisson().getAtomicLong("test").get(); + long newState = redisson.getAtomicLong("test").get(); Assert.assertEquals(Long.MAX_VALUE - 1000, newState); } diff --git a/src/test/java/org/redisson/RedissonQueueTest.java b/src/test/java/org/redisson/RedissonQueueTest.java new file mode 100644 index 000000000..cf4df47bb --- /dev/null +++ b/src/test/java/org/redisson/RedissonQueueTest.java @@ -0,0 +1,85 @@ +package org.redisson; + +import java.util.LinkedList; +import java.util.NoSuchElementException; +import java.util.Queue; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Test; +import org.redisson.core.RQueue; + +public class RedissonQueueTest extends BaseTest { + + @Test + public void testAddOfferOrigin() { + Queue queue = new LinkedList(); + queue.add(1); + queue.offer(2); + queue.add(3); + queue.offer(4); + + MatcherAssert.assertThat(queue, Matchers.contains(1, 2, 3, 4)); + Assert.assertEquals((Integer)1, queue.poll()); + MatcherAssert.assertThat(queue, Matchers.contains(2, 3, 4)); + Assert.assertEquals((Integer)2, queue.element()); + } + + @Test + public void testAddOffer() { + RQueue queue = redisson.getQueue("queue"); + queue.add(1); + queue.offer(2); + queue.add(3); + queue.offer(4); + + MatcherAssert.assertThat(queue, Matchers.contains(1, 2, 3, 4)); + Assert.assertEquals((Integer)1, queue.poll()); + MatcherAssert.assertThat(queue, Matchers.contains(2, 3, 4)); + Assert.assertEquals((Integer)2, queue.element()); + } + + @Test + public void testRemoveOrigin() { + Queue queue = new LinkedList(); + queue.add(1); + queue.add(2); + queue.add(3); + queue.add(4); + + queue.remove(); + queue.remove(); + + MatcherAssert.assertThat(queue, Matchers.contains(3, 4)); + queue.remove(); + queue.remove(); + + Assert.assertTrue(queue.isEmpty()); + } + + @Test + public void testRemove() { + RQueue queue = redisson.getQueue("queue"); + queue.add(1); + queue.add(2); + queue.add(3); + queue.add(4); + + queue.remove(); + queue.remove(); + + MatcherAssert.assertThat(queue, Matchers.contains(3, 4)); + queue.remove(); + queue.remove(); + + Assert.assertTrue(queue.isEmpty()); + } + + @Test(expected = NoSuchElementException.class) + public void testRemoveEmpty() { + RQueue queue = redisson.getQueue("queue"); + queue.remove(); + } + +} diff --git a/src/test/java/org/redisson/RedissonSortedSetTest.java b/src/test/java/org/redisson/RedissonSortedSetTest.java index 029a6058c..7cf072fd8 100644 --- a/src/test/java/org/redisson/RedissonSortedSetTest.java +++ b/src/test/java/org/redisson/RedissonSortedSetTest.java @@ -16,7 +16,7 @@ public class RedissonSortedSetTest extends BaseTest { @Test public void testTrySetComparator() { - RSortedSet set = currentRedisson().getSortedSet("set"); + RSortedSet set = redisson.getSortedSet("set"); boolean setRes = set.trySetComparator(Collections.reverseOrder()); Assert.assertTrue(setRes); @@ -58,7 +58,7 @@ public class RedissonSortedSetTest extends BaseTest { @Test(expected = IllegalArgumentException.class) public void testTailSet() { - RSortedSet set = currentRedisson().getSortedSet("set"); + RSortedSet set = redisson.getSortedSet("set"); set.add(1); set.add(2); @@ -85,7 +85,7 @@ public class RedissonSortedSetTest extends BaseTest { @Test(expected = IllegalArgumentException.class) public void testHeadSet() { - RSortedSet set = currentRedisson().getSortedSet("set"); + RSortedSet set = redisson.getSortedSet("set"); set.add(1); set.add(2); @@ -163,7 +163,7 @@ public class RedissonSortedSetTest extends BaseTest { @Test public void testSort() { - RSortedSet set = currentRedisson().getSortedSet("set"); + RSortedSet set = redisson.getSortedSet("set"); Assert.assertTrue(set.add(2)); Assert.assertTrue(set.add(3)); Assert.assertTrue(set.add(1)); @@ -180,7 +180,7 @@ public class RedissonSortedSetTest extends BaseTest { @Test public void testRemove() { - RSortedSet set = currentRedisson().getSortedSet("set"); + RSortedSet set = redisson.getSortedSet("set"); set.add(5); set.add(3); set.add(1); @@ -195,7 +195,7 @@ public class RedissonSortedSetTest extends BaseTest { @Test public void testRetainAll() { - Set set = currentRedisson().getSortedSet("set"); + Set set = redisson.getSortedSet("set"); for (int i = 0; i < 200; i++) { set.add(i); } @@ -206,7 +206,7 @@ public class RedissonSortedSetTest extends BaseTest { @Test public void testContainsAll() { - Set set = currentRedisson().getSortedSet("set"); + Set set = redisson.getSortedSet("set"); for (int i = 0; i < 200; i++) { set.add(i); } @@ -217,7 +217,7 @@ public class RedissonSortedSetTest extends BaseTest { @Test public void testToArray() { - Set set = currentRedisson().getSortedSet("set"); + Set set = redisson.getSortedSet("set"); set.add("1"); set.add("4"); set.add("2"); @@ -232,7 +232,7 @@ public class RedissonSortedSetTest extends BaseTest { @Test public void testContains() { - Set set = currentRedisson().getSortedSet("set"); + Set set = redisson.getSortedSet("set"); set.add(new TestObject("1", "2")); set.add(new TestObject("1", "2")); @@ -247,7 +247,7 @@ public class RedissonSortedSetTest extends BaseTest { @Test public void testDuplicates() { - Set set = currentRedisson().getSortedSet("set"); + Set set = redisson.getSortedSet("set"); Assert.assertTrue(set.add(new TestObject("1", "2"))); Assert.assertFalse(set.add(new TestObject("1", "2"))); @@ -260,7 +260,7 @@ public class RedissonSortedSetTest extends BaseTest { @Test public void testSize() { - Set set = currentRedisson().getSortedSet("set"); + Set set = redisson.getSortedSet("set"); set.add(1); set.add(2); set.add(3);