From 55449e2c7b88e01882eb17c96e9c938858ee8736 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Thu, 25 Nov 2010 20:39:38 +0200 Subject: [PATCH] + add redis set tests + add dedicated testArray/testIterator/testGenericArray for non ordered collections --- .../util/AbstractRedisCollectionTests.java | 4 +- .../redis/util/AbstractRedisSetTests.java | 265 ++++++++++++++++++ 2 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisSetTests.java diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollectionTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollectionTests.java index 291b0ab74..f816ce26f 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollectionTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollectionTests.java @@ -194,8 +194,9 @@ public abstract class AbstractRedisCollectionTests { T t1 = getT(); T t2 = getT(); T t3 = getT(); + T t4 = getT(); - List list = Arrays.asList(t1, t2, t3); + List list = Arrays.asList(t1, t2, t3, t4); assertThat(collection.addAll(list), is(true)); Iterator iterator = collection.iterator(); @@ -203,6 +204,7 @@ public abstract class AbstractRedisCollectionTests { assertEquals(t1, iterator.next()); assertEquals(t2, iterator.next()); assertEquals(t3, iterator.next()); + assertEquals(t4, iterator.next()); assertFalse(iterator.hasNext()); } diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisSetTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisSetTests.java new file mode 100644 index 000000000..948c2c7c0 --- /dev/null +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisSetTests.java @@ -0,0 +1,265 @@ +/* + * Copyright 2010 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.keyvalue.redis.util; + +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; +import static org.junit.matchers.JUnitMatchers.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.data.keyvalue.redis.core.BoundSetOperations; +import org.springframework.data.keyvalue.redis.core.RedisTemplate; + +/** + * Integration test for Redis set. + * + * @author Costin Leau + */ +public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTests { + + protected RedisSet set; + + + /** + * Constructs a new AbstractRedisSetTests instance. + * + * @param factory + * @param template + */ + public AbstractRedisSetTests(ObjectFactory factory, RedisTemplate template) { + super(factory, template); + } + + + @SuppressWarnings("unchecked") + @Before + public void setUp() throws Exception { + super.setUp(); + set = (RedisSet) collection; + } + + private RedisSet createSetFor(String key) { + return new DefaultRedisSet((BoundSetOperations) set.getOperations().forSet(key)); + } + + @Test + public void testDiff() { + RedisSet diffSet1 = createSetFor("test:set:diff1"); + RedisSet diffSet2 = createSetFor("test:set:diff2"); + + T t1 = getT(); + T t2 = getT(); + T t3 = getT(); + + set.add(t1); + set.add(t2); + set.add(t3); + + diffSet1.add(t2); + diffSet2.add(t3); + + Set diff = set.diff(diffSet1, diffSet2); + assertEquals(1, diff.size()); + assertThat(diff, hasItem(t1)); + } + + @Test + public void testDiffAndStore() { + RedisSet diffSet1 = createSetFor("test:set:diff1"); + RedisSet diffSet2 = createSetFor("test:set:diff2"); + + T t1 = getT(); + T t2 = getT(); + T t3 = getT(); + T t4 = getT(); + + set.add(t1); + set.add(t2); + set.add(t3); + + diffSet1.add(t2); + diffSet2.add(t3); + diffSet2.add(t4); + + String resultName = "test:set:diff:result:1"; + RedisSet diff = set.diffAndStore(resultName, diffSet1, diffSet2); + + assertEquals(1, diff.size()); + assertThat(diff, hasItem(t1)); + assertEquals(resultName, diff.getKey()); + } + + @Test + public void testIntersect() { + RedisSet intSet1 = createSetFor("test:set:int1"); + RedisSet intSet2 = createSetFor("test:set:int2"); + + T t1 = getT(); + T t2 = getT(); + T t3 = getT(); + T t4 = getT(); + + set.add(t1); + set.add(t2); + set.add(t3); + + intSet1.add(t2); + intSet1.add(t4); + intSet2.add(t2); + intSet2.add(t3); + + Set inter = set.intersect(intSet1, intSet2); + assertEquals(1, inter.size()); + assertThat(inter, hasItem(t2)); + } + + + public void testIntersectAndStore() { + RedisSet intSet1 = createSetFor("test:set:int1"); + RedisSet intSet2 = createSetFor("test:set:int2"); + + T t1 = getT(); + T t2 = getT(); + T t3 = getT(); + T t4 = getT(); + + set.add(t1); + set.add(t2); + set.add(t3); + + intSet1.add(t2); + intSet1.add(t4); + intSet2.add(t2); + intSet2.add(t3); + + String resultName = "test:set:intersect:result:1"; + RedisSet inter = set.intersectAndStore(resultName, intSet1, intSet2); + assertEquals(1, inter.size()); + assertThat(inter, hasItem(t2)); + assertEquals(resultName, inter.getKey()); + } + + @Test + public void testUnion() { + RedisSet unionSet1 = createSetFor("test:set:union1"); + RedisSet unionSet2 = createSetFor("test:set:union2"); + + T t1 = getT(); + T t2 = getT(); + T t3 = getT(); + T t4 = getT(); + + set.add(t1); + set.add(t2); + + unionSet1.add(t2); + unionSet1.add(t4); + unionSet2.add(t3); + + Set union = set.union(unionSet1, unionSet2); + assertEquals(4, union.size()); + assertThat(union, hasItems(t1, t2, t3, t4)); + } + + @Test + public void testUnionAndStore() { + RedisSet unionSet1 = createSetFor("test:set:union1"); + RedisSet unionSet2 = createSetFor("test:set:union2"); + + T t1 = getT(); + T t2 = getT(); + T t3 = getT(); + T t4 = getT(); + + set.add(t1); + set.add(t2); + + unionSet1.add(t2); + unionSet1.add(t4); + unionSet2.add(t3); + + String resultName = "test:set:union:result:1"; + RedisSet union = set.unionAndStore(resultName, unionSet1, unionSet2); + assertEquals(4, union.size()); + assertThat(union, hasItems(t1, t2, t3, t4)); + assertEquals(resultName, union.getKey()); + } + + @Test + public void testIterator() { + T t1 = getT(); + T t2 = getT(); + T t3 = getT(); + T t4 = getT(); + + List list = Arrays.asList(t1, t2, t3, t4); + + assertThat(collection.addAll(list), is(true)); + Iterator iterator = collection.iterator(); + + List result = new ArrayList(list); + + while (iterator.hasNext()) { + result.remove(iterator.next()); + } + + assertEquals(0, result.size()); + } + + @SuppressWarnings("unchecked") + @Test + public void testToArray() { + Object[] expectedArray = new Object[] { getT(), getT(), getT() }; + List list = (List) Arrays.asList(expectedArray); + + assertThat(collection.addAll(list), is(true)); + + Object[] array = collection.toArray(); + + List result = new ArrayList(list); + + for (int i = 0; i < array.length; i++) { + result.remove(array[i]); + } + + assertEquals(0, result.size()); + } + + @SuppressWarnings("unchecked") + @Test + public void testToArrayWithGenerics() { + Object[] expectedArray = new Object[] { getT(), getT(), getT() }; + List list = (List) Arrays.asList(expectedArray); + + assertThat(collection.addAll(list), is(true)); + + Object[] array = collection.toArray(new Object[expectedArray.length]); + List result = new ArrayList(list); + + for (int i = 0; i < array.length; i++) { + result.remove(array[i]); + } + + assertEquals(0, result.size()); + } +} \ No newline at end of file