From 437ea733be88c8049b7512fe4de11eb366ea4f76 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 9 Apr 2018 09:23:14 +0200 Subject: [PATCH] DATAREDIS-803 - Polishing. Remove DefaultRedisMapEntry as it's no longer required. Simplify test to unit test to reduce test scope and test run time. Original pull request: #326. --- .../support/collections/DefaultRedisMap.java | 35 +---------- .../collections/AbstractRedisMapTests.java | 24 +------- .../DefaultRedisMapUnitUnitTests.java | 58 +++++++++++++++++++ 3 files changed, 60 insertions(+), 57 deletions(-) create mode 100644 src/test/java/org/springframework/data/redis/support/collections/DefaultRedisMapUnitUnitTests.java diff --git a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java index 161d6bcfb..9f18fa1ff 100644 --- a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java +++ b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java @@ -18,8 +18,6 @@ package org.springframework.data.redis.support.collections; import java.util.Collection; import java.util.Collections; import java.util.Date; -import java.util.Iterator; -import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -44,34 +42,6 @@ public class DefaultRedisMap implements RedisMap { private final BoundHashOperations hashOps; - private class DefaultRedisMapEntry implements Map.Entry { - - private final K key; - private @Nullable final V value; - - public DefaultRedisMapEntry(K key, @Nullable V value) { - - this.key = key; - this.value = value; - } - - @Override - public K getKey() { - return key; - } - - @Override - @Nullable - public V getValue() { - return value; - } - - @Override - public V setValue(@Nullable V value) { - throw new UnsupportedOperationException(); - } - } - /** * Constructs a new {@link DefaultRedisMap} instance. * @@ -280,10 +250,7 @@ public class DefaultRedisMap implements RedisMap { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("RedisStore for key:"); - sb.append(getKey()); - return sb.toString(); + return "RedisStore for key:" + getKey(); } /* diff --git a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java index e1a9ce559..aec7491e9 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java @@ -25,7 +25,6 @@ import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; @@ -84,7 +83,7 @@ public abstract class AbstractRedisMapTests { abstract RedisMap createMap(); @Before - public void setUp() throws Exception { + public void setUp() { map = createMap(); } @@ -398,27 +397,6 @@ public abstract class AbstractRedisMapTests { assertThat(values, not(hasItem(v2))); } - @Test // DATAREDIS-803 - @IfProfileValue(name = "runLongTests", value = "true") - public void testBigEntrySet() { - - Set> entries = map.entrySet(); - assertTrue(entries.isEmpty()); - - for (int j = 0; j < 2; j++) { - Map m = new HashMap<>(); - for (int i = 0; i < 1024 * 1024 / 2 - 1; i++) { - m.put(getKey(), getValue()); - } - map.putAll(m); - } - map.put(getKey(), getValue()); - - entries = map.entrySet(); - - assertEquals(1024 * 1024 - 1, entries.size()); - } - @Test public void testPutIfAbsent() { diff --git a/src/test/java/org/springframework/data/redis/support/collections/DefaultRedisMapUnitUnitTests.java b/src/test/java/org/springframework/data/redis/support/collections/DefaultRedisMapUnitUnitTests.java new file mode 100644 index 000000000..815310e3c --- /dev/null +++ b/src/test/java/org/springframework/data/redis/support/collections/DefaultRedisMapUnitUnitTests.java @@ -0,0 +1,58 @@ +/* + * Copyright 2018 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.redis.support.collections; + +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; + +import java.util.Collections; +import java.util.Map.Entry; +import java.util.Set; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.data.redis.core.BoundHashOperations; + +/** + * Unit tests for {@link DefaultRedisMap}. + * + * @author Mark Paluch + */ +@RunWith(MockitoJUnitRunner.class) +public class DefaultRedisMapUnitUnitTests { + + @Mock BoundHashOperations operationsMock; + + DefaultRedisMap map; + + @Before + public void before() { + map = new DefaultRedisMap<>(operationsMock); + } + + @Test // DATAREDIS-803 + public void shouldGetEntrySet() { + + when(operationsMock.entries()).thenReturn(Collections.singletonMap("foo", "bar")); + + Set> result = map.entrySet(); + + assertThat(result).hasSize(1); + } +}