Add and refactor tests.

Author: Mike Davis

core-api/src/test/java/com/optimizely/ab/config/audience/SemanticVersionTest.java

@@ -17,6 +17,7 @@
 package com.optimizely.ab.config.audience;
 
 import com.optimizely.ab.config.audience.match.SemanticVersion;
+import com.optimizely.ab.config.audience.match.UnexpectedValueTypeException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -141,108 +142,29 @@ public void semanticVersionInvalidShouldBeOfSizeLessThan3() throws Exception {
     }
 
     @Test
-    public void semanticVersionCompareTo() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("3.7.1");
-        SemanticVersion actualSV = new SemanticVersion("3.7.1");
-        assertTrue(actualSV.compare(targetSV) == 0);
+    public void testEquals() throws Exception {
+        assertEquals(0, SemanticVersion.compare("3.7.1", "3.7.1"));
+        assertEquals(0, SemanticVersion.compare("3.7.1", "3.7"));
+        assertEquals(0, SemanticVersion.compare("2.1.3+build", "2.1.3"));
+        assertEquals(0, SemanticVersion.compare("3.7.1-beta.1+2.3", "3.7.1-beta.1+2.3"));
     }
 
     @Test
-    public void semanticVersionCompareToActualLess() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("3.7.1");
-        SemanticVersion actualSV = new SemanticVersion("3.7.0");
-        assertTrue(actualSV.compare(targetSV) < 0);
+    public void testLessThan() throws Exception {
+        assertTrue(SemanticVersion.compare("3.7.0", "3.7.1") < 0);
+        assertTrue(SemanticVersion.compare("3.7", "3.7.1") < 0);
+        assertTrue(SemanticVersion.compare("2.1.3-beta+1", "2.1.3-beta+1.2.3") < 0);
+        assertTrue(SemanticVersion.compare("2.1.3-beta-1", "2.1.3-beta-1.2.3") < 0);
     }
 
     @Test
-    public void semanticVersionCompareToActualGreater() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("3.7.1");
-        SemanticVersion actualSV = new SemanticVersion("3.7.2");
-        assertTrue(actualSV.compare(targetSV) > 0);
-    }
-
-    @Test
-    public void semanticVersionCompareToPatchMissing() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("3.7");
-        SemanticVersion actualSV = new SemanticVersion("3.7.1");
-        assertTrue(actualSV.compare(targetSV) == 0);
-    }
-
-    @Test
-    public void semanticVersionCompareToActualPatchMissing() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("3.7.1");
-        SemanticVersion actualSV = new SemanticVersion("3.7");
-        assertTrue(actualSV.compare(targetSV) < 0);
-    }
-
-    @Test
-    public void semanticVersionCompareToActualPreReleaseMissing() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("3.7.1-beta");
-        SemanticVersion actualSV = new SemanticVersion("3.7.1");
-        assertTrue(actualSV.compare(targetSV) > 0);
-    }
-
-    @Test
-    public void semanticVersionCompareTargetBetaComplex() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("2.1.3-beta+1");
-        SemanticVersion actualSV = new SemanticVersion("2.1.3-beta+1.2.3");
-        assertTrue(actualSV.compare(targetSV) > 0);
-    }
-
-    @Test
-    public void semanticVersionCompareTargetBuildIgnores() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("2.1.3");
-        SemanticVersion actualSV = new SemanticVersion("2.1.3+build");
-        assertTrue(actualSV.compare(targetSV) == 0);
-    }
-
-    @Test
-    public void semanticVersionCompareTargetBuildComplex() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("2.1.3-beta+1.2.3");
-        SemanticVersion actualSV = new SemanticVersion("2.1.3-beta+1");
-        assertTrue(actualSV.compare(targetSV) < 0);
-    }
-
-    @Test
-    public void semanticVersionCompareMultipleDash() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("2.1.3-beta-1.2.3");
-        SemanticVersion actualSV = new SemanticVersion("2.1.3-beta-1");
-        assertTrue(actualSV.compare(targetSV) < 0);
-    }
-
-    @Test
-    public void semanticVersionCompareToAlphaBetaAsciiComparision() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("3.7.1-alpha");
-        SemanticVersion actualSV = new SemanticVersion("3.7.1-beta");
-        assertTrue(actualSV.compare(targetSV) > 0);
-    }
-
-    @Test
-    public void semanticVersionComparePrereleaseSmallerThanBuild() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("3.7.1-prerelease");
-        SemanticVersion actualSV = new SemanticVersion("3.7.1+build");
-        assertTrue(actualSV.compare(targetSV) > 0);
-    }
-
-
-    @Test
-    public void semanticVersionCompareAgainstPreReleaseToPreRelease() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("3.7.1-prerelease+build");
-        SemanticVersion actualSV = new SemanticVersion("3.7.1-prerelease-prerelease+rc");
-        assertTrue(actualSV.compare(targetSV) > 0);
-    }
-
-    @Test
-    public void semanticVersionCompareToIgnoreMetaComparision() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("3.7.1-beta.1+2.3");
-        SemanticVersion actualSV = new SemanticVersion("3.7.1-beta.1+2.3");
-        assertTrue(actualSV.compare(targetSV) == 0);
-    }
-
-    @Test
-    public void semanticVersionCompareToPreReleaseComparision() throws Exception {
-        SemanticVersion targetSV = new SemanticVersion("3.7.1-beta.1");
-        SemanticVersion actualSV = new SemanticVersion("3.7.1-beta.2");
-        assertTrue(actualSV.compare(targetSV) > 0);
+    public void testGreaterThan() throws Exception {
+        assertTrue(SemanticVersion.compare("3.7.2", "3.7.1") > 0);
+        assertTrue(SemanticVersion.compare("3.7.1", "3.7.1-beta") > 0);
+        assertTrue(SemanticVersion.compare("2.1.3-beta+1.2.3", "2.1.3-beta+1") > 0);
+        assertTrue(SemanticVersion.compare("3.7.1-beta", "3.7.1-alpha") > 0);
+        assertTrue(SemanticVersion.compare("3.7.1+build", "3.7.1-prerelease") > 0);
+        assertTrue(SemanticVersion.compare("3.7.1-prerelease-prerelease+rc", "3.7.1-prerelease+build") > 0);
+        assertTrue(SemanticVersion.compare("3.7.1-beta.2", "3.7.1-beta.1") > 0);
     }
 }

core-api/src/test/java/com/optimizely/ab/config/audience/match/NumberComparatorTest.java

@@ -0,0 +1,75 @@
+/**
+ *
+ *    Copyright 2020, Optimizely and contributors
+ *
+ *    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 com.optimizely.ab.config.audience.match;
+
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class NumberComparatorTest {
+
+    private static final List<Object> INVALIDS = Collections.unmodifiableList(Arrays.asList(null, "test", "", true));
+
+    @Test
+    public void testLessThan() throws UnknownValueTypeException {
+        assertTrue(NumberComparator.compare(0,1) < 0);
+        assertTrue(NumberComparator.compare(0,1.0) < 0);
+        assertTrue(NumberComparator.compare(0,1L) < 0);
+    }
+
+    @Test
+    public void testGreaterThan() throws UnknownValueTypeException {
+        assertTrue(NumberComparator.compare(1,0) > 0);
+        assertTrue(NumberComparator.compare(1.0,0) > 0);
+        assertTrue(NumberComparator.compare(1L,0) > 0);
+    }
+
+    @Test
+    public void testEquals() throws UnknownValueTypeException {
+        assertEquals(0, NumberComparator.compare(1, 1));
+        assertEquals(0, NumberComparator.compare(1, 1.0));
+        assertEquals(0, NumberComparator.compare(1L, 1));
+    }
+
+    @Test
+    public void testInvalidRight() {
+        for (Object invalid: INVALIDS) {
+            try {
+                NumberComparator.compare(0, invalid);
+                fail("should have failed for invalid object");
+            } catch (UnknownValueTypeException e) {
+                // pass
+            }
+        }
+    }
+
+    @Test
+    public void testInvalidLeft() {
+        for (Object invalid: INVALIDS) {
+            try {
+                NumberComparator.compare(invalid, 0);
+                fail("should have failed for invalid object");
+            } catch (UnknownValueTypeException e) {
+                // pass
+            }
+        }
+    }
+}