Merge remote branch 'samus/Fields'

Nathan Marz · Nathan Marz · commit 33c9cfdfd06e · 2012-03-18T14:33:40.000-07:00
diff --git a/src/jvm/backtype/storm/tuple/Fields.java b/src/jvm/backtype/storm/tuple/Fields.java
@@ -17,7 +17,14 @@ public Fields(String... fields) {
     }
     
     public Fields(List<String> fields) {
-        _fields = new ArrayList<String>(fields);
+        _fields = new ArrayList<String>(fields.size());
+        for (String field : fields) {
+            if (_fields.contains(field))
+                throw new IllegalArgumentException(
+                    String.format("duplicate field '%s'", field)
+                );
+            _fields.add(field);
+        }
         index();
     }
     
@@ -58,4 +65,4 @@ private void index() {
             _index.put(_fields.get(i), i);
         }
     }
-}
+}
diff --git a/test/clj/backtype/storm/fields_test.clj b/test/clj/backtype/storm/fields_test.clj
@@ -0,0 +1,40 @@
+(ns backtype.storm.fields-test
+  (:use [clojure test])
+  (:import [backtype.storm.tuple Fields])
+  (:import [java.util List])
+  (:import [java.util Iterator]))
+
+(deftest test-fields-constructor
+  (testing "constructor"
+    (testing "with (String... fields)"
+      (is (instance? Fields (Fields. (into-array String '("foo" "bar")))))
+      (is (thrown? IllegalArgumentException (Fields. (into-array String '("foo" "bar" "foo"))))))
+    (testing "with (List<String> fields)"
+      (is (instance? Fields (Fields. '("foo" "bar"))))
+      (is (thrown? IllegalArgumentException (Fields. '("foo" "bar" "foo")))))))
+
+(deftest test-fields-methods
+  (let [fields (Fields. '("foo" "bar"))]
+    (testing "method"
+      (testing ".size"
+        (is (= (.size fields) 2)))
+      (testing ".get"
+        (is (= (.get fields 0) "foo"))
+        (is (= (.get fields 1) "bar"))
+        (is (thrown? IndexOutOfBoundsException (.get fields 2))))
+      (testing ".fieldIndex"
+        (is (= (.fieldIndex fields "foo") 0))
+        (is (= (.fieldIndex fields "bar") 1))
+        (is (thrown? IllegalArgumentException (.fieldIndex fields "baz"))))
+      (testing ".toList"
+        (is (instance? List (.toList fields)))
+        (is (= (count (.toList fields)) 2))
+        (is (not-any? false? (map = (.toList fields) '("foo" "bar")))))
+      (testing ".iterator"
+        (is (instance? Iterator (.iterator fields)))
+        (is (= (count (iterator-seq (.iterator fields))) 2))
+        (is (not-any? false? (map = (iterator-seq (.iterator fields)) '("foo" "bar")))))
+      (testing ".select"
+        (is (instance? List (.select fields (Fields. '("bar")) '("a" "b" "c"))))
+        (is (= (.select fields (Fields. '("bar")) '("a" "b" "c")) '("b")))))))
+

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,14 @@ public Fields(String... fields) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public Fields(List<String> fields) {`
`20`		`- _fields = new ArrayList<String>(fields);`
	`20`	`+ _fields = new ArrayList<String>(fields.size());`
	`21`	`+ for (String field : fields) {`
	`22`	`+ if (_fields.contains(field))`
	`23`	`+ throw new IllegalArgumentException(`
	`24`	`+ String.format("duplicate field '%s'", field)`
	`25`	`+ );`
	`26`	`+ _fields.add(field);`
	`27`	`+ }`
`21`	`28`	`index();`
`22`	`29`	`}`
`23`	`30`
`@@ -58,4 +65,4 @@ private void index() {`
`58`	`65`	`_index.put(_fields.get(i), i);`
`59`	`66`	`}`
`60`	`67`	`}`
`61`		`-}`
	`68`	`+}`