You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/01/12 21:01:38 UTC
[05/14] storm git commit: Refactored unit tests
Refactored unit tests
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3b59ec5d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3b59ec5d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3b59ec5d
Branch: refs/heads/1.x-branch
Commit: 3b59ec5d7f0eb505522495f2f67bba506246554e
Parents: 4623d8f
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Fri Dec 11 01:39:12 2015 +0530
Committer: Arun Mahadevan <ai...@hortonworks.com>
Committed: Tue Jan 12 10:20:59 2016 +0530
----------------------------------------------------------------------
.../redis/state/RedisKeyValueStateTest.java | 25 ++++++++---------
.../storm/state/InMemoryKeyValueStateTest.java | 29 +++++++++-----------
2 files changed, 24 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3b59ec5d/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java b/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java
index 80bab4c..9d8286c 100644
--- a/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java
+++ b/external/storm-redis/src/test/java/org/apache/storm/redis/state/RedisKeyValueStateTest.java
@@ -113,29 +113,26 @@ public class RedisKeyValueStateTest {
keyValueState.put("b", "2");
keyValueState.prepareCommit(1);
keyValueState.put("c", "3");
- assertEquals("1", keyValueState.get("a"));
- assertEquals("2", keyValueState.get("b"));
- assertEquals("3", keyValueState.get("c"));
+ assertArrayEquals(new String[]{"1", "2", "3"}, getValues());
keyValueState.rollback();
- assertEquals(null, keyValueState.get("a"));
- assertEquals(null, keyValueState.get("b"));
- assertEquals(null, keyValueState.get("c"));
-
+ assertArrayEquals(new String[]{null, null, null}, getValues());
keyValueState.put("a", "1");
keyValueState.put("b", "2");
keyValueState.prepareCommit(1);
keyValueState.commit(1);
keyValueState.put("c", "3");
- assertEquals("1", keyValueState.get("a"));
- assertEquals("2", keyValueState.get("b"));
- assertEquals("3", keyValueState.get("c"));
+ assertArrayEquals(new String[]{"1", "2", "3"}, getValues());
keyValueState.rollback();
- assertEquals("1", keyValueState.get("a"));
- assertEquals("2", keyValueState.get("b"));
- assertEquals(null, keyValueState.get("c"));
-
+ assertArrayEquals(new String[]{"1", "2", null}, getValues());
}
+ private String[] getValues() {
+ return new String[]{
+ keyValueState.get("a"),
+ keyValueState.get("b"),
+ keyValueState.get("c")
+ };
+ }
private String hmset(Map<String, Map<String, String>> mockMap, String key, Map value) {
mockMap.put(key, value);
http://git-wip-us.apache.org/repos/asf/storm/blob/3b59ec5d/storm-core/test/jvm/backtype/storm/state/InMemoryKeyValueStateTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/backtype/storm/state/InMemoryKeyValueStateTest.java b/storm-core/test/jvm/backtype/storm/state/InMemoryKeyValueStateTest.java
index 31dbc79..78ace77 100644
--- a/storm-core/test/jvm/backtype/storm/state/InMemoryKeyValueStateTest.java
+++ b/storm-core/test/jvm/backtype/storm/state/InMemoryKeyValueStateTest.java
@@ -38,9 +38,7 @@ public class InMemoryKeyValueStateTest {
public void testPutAndGet() throws Exception {
keyValueState.put("a", "1");
keyValueState.put("b", "2");
- assertEquals("1", keyValueState.get("a"));
- assertEquals("2", keyValueState.get("b"));
- assertEquals(null, keyValueState.get("c"));
+ assertArrayEquals(new String[]{"1", "2", null}, getValues());
}
@Test
@@ -49,25 +47,24 @@ public class InMemoryKeyValueStateTest {
keyValueState.put("b", "2");
keyValueState.prepareCommit(1);
keyValueState.put("c", "3");
- assertEquals("1", keyValueState.get("a"));
- assertEquals("2", keyValueState.get("b"));
- assertEquals("3", keyValueState.get("c"));
+ assertArrayEquals(new String[]{"1", "2", "3"}, getValues());
keyValueState.rollback();
- assertEquals(null, keyValueState.get("a"));
- assertEquals(null, keyValueState.get("b"));
- assertEquals(null, keyValueState.get("c"));
+ assertArrayEquals(new String[]{null, null, null}, getValues());
keyValueState.put("a", "1");
keyValueState.put("b", "2");
keyValueState.prepareCommit(1);
- keyValueState.commit();
+ keyValueState.commit(1);
keyValueState.put("c", "3");
- assertEquals("1", keyValueState.get("a"));
- assertEquals("2", keyValueState.get("b"));
- assertEquals("3", keyValueState.get("c"));
+ assertArrayEquals(new String[]{"1", "2", "3"}, getValues());
keyValueState.rollback();
- assertEquals("1", keyValueState.get("a"));
- assertEquals("2", keyValueState.get("b"));
- assertEquals(null, keyValueState.get("c"));
+ assertArrayEquals(new String[]{"1", "2", null}, getValues());
+ }
+ private String[] getValues() {
+ return new String[]{
+ keyValueState.get("a"),
+ keyValueState.get("b"),
+ keyValueState.get("c")
+ };
}
}
\ No newline at end of file