diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-09-11 11:11:45 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-09-11 11:36:41 +0200 |
commit | 24cf3c8611fd7f7b55782c9e7f010bf59cdecc3e (patch) | |
tree | 4990e6fa4d182a594129c391224b7f39c50dda93 | |
parent | b8d8d440ab5f9e47483cc47d82e0e834d12e5794 (diff) |
Add explicit test to equals and compareTo and avoid * imports
-rw-r--r-- | document/src/main/java/com/yahoo/document/datatypes/Array.java | 9 | ||||
-rwxr-xr-x | document/src/test/java/com/yahoo/document/datatypes/ArrayTestCase.java | 51 |
2 files changed, 58 insertions, 2 deletions
diff --git a/document/src/main/java/com/yahoo/document/datatypes/Array.java b/document/src/main/java/com/yahoo/document/datatypes/Array.java index 8f6b68fcc38..660e58efa25 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/Array.java +++ b/document/src/main/java/com/yahoo/document/datatypes/Array.java @@ -11,7 +11,14 @@ import com.yahoo.document.serialization.FieldWriter; import com.yahoo.document.serialization.XmlSerializationHelper; import com.yahoo.document.serialization.XmlStream; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.ListIterator; +import java.util.RandomAccess; /** * FieldValue which encapsulates a Array value diff --git a/document/src/test/java/com/yahoo/document/datatypes/ArrayTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/ArrayTestCase.java index d1c7ce8dcf6..ce250c67658 100755 --- a/document/src/test/java/com/yahoo/document/datatypes/ArrayTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/ArrayTestCase.java @@ -5,9 +5,14 @@ import com.yahoo.document.ArrayDataType; import com.yahoo.document.DataType; import org.junit.Test; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; @@ -269,4 +274,48 @@ public class ArrayTestCase { assertTrue(Arrays.equals(expected, array.toArray(new StringFieldValue[0]))); } + @Test + public void testEquals() { + Array<StringFieldValue> a = new Array<>(new ArrayDataType(DataType.STRING)); + a.add(new StringFieldValue("mumbo jumbo 1")); + a.add(new StringFieldValue("mumbo jumbo 2")); + Array<StringFieldValue> b = new Array<>(new ArrayDataType(DataType.STRING)); + b.add(new StringFieldValue("mumbo jumbo 1")); + b.add(new StringFieldValue("mumbo jumbo 2")); + assertEquals(a, b); + assertEquals(0, a.compareTo(b)); + assertEquals(0, b.compareTo(a)); + + b.clear(); + List<String> l = new ArrayList<>(); + l.add("mumbo jumbo 1"); + l.add("mumbo jumbo 2"); + b.assign(l); + assertEquals(a, b); + assertEquals(0, a.compareTo(b)); + assertEquals(0, b.compareTo(a)); + } + + @Test + public void testLess() { + Array<StringFieldValue> a = new Array<>(new ArrayDataType(DataType.STRING)); + a.add(new StringFieldValue("mumbo jumbo 1")); + a.add(new StringFieldValue("mumbo jumbo 3")); + Array<StringFieldValue> b = new Array<>(new ArrayDataType(DataType.STRING)); + b.add(new StringFieldValue("mumbo jumbo 1")); + b.add(new StringFieldValue("mumbo jumbo 2")); + assertNotEquals(a, b); + assertEquals(1, a.compareTo(b)); + assertEquals(-1, b.compareTo(a)); + + b.clear(); + List<String> l = new ArrayList<>(); + l.add("mumbo jumbo 1"); + l.add("mumbo jumbo 2"); + b.assign(l); + assertNotEquals(a, b); + assertEquals(1, a.compareTo(b)); + assertEquals(-1, b.compareTo(a)); + } + } |