refactor to common method

zinggAI · Apr 25, 2024 · ce80e07 · ce80e07
1 parent ba3503f
commit ce80e07
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 61 deletions.
diff --git a/...n/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionDate.java b/...n/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionDate.java
@@ -7,30 +7,28 @@
 import org.junit.jupiter.api.Test;
 public class TestCheckNullFunctionDate {
 
-
 	@Test
 	public void testFirstNull() {
-		CheckNullFunction<Date> isNull = new CheckNullFunction<Date>("CheckNullFunctionDate");
-		assertEquals(0d, isNull.call(null, new Date(2)));
+		assertEquals(0d, simFunc().call(null, new Date(2)));
 	}
 
-
 	@Test
 	public void testSecondNull() {
-		CheckNullFunction<Date> isNull = new CheckNullFunction<Date>("CheckNullFunctionDate");
-		assertEquals(0d, isNull.call(new Date(1), null));
+		assertEquals(0d, simFunc().call(new Date(1), null));
 	}
 
 	@Test
 	public void testBothNull() {
-		CheckNullFunction<Date> isNull = new CheckNullFunction<Date>("CheckNullFunctionDate");
-		assertEquals(0d, isNull.call(null, null));
+		assertEquals(0d, simFunc().call(null, null));
 	}
 
 	@Test
 	public void testBothNotNull() {
-		CheckNullFunction<Date> isNull = new CheckNullFunction<Date>("CheckNullFunctionDate");
-		assertEquals(1d, isNull.call(new Date(1), new Date(2)));
+		assertEquals(1d, simFunc().call(new Date(1), new Date(2)));
+	}
+
+	protected CheckNullFunction<Date> simFunc() {
+		return new CheckNullFunction<Date>("CheckNullFunctionDate");
 	}
 
 }
diff --git a/...on/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionInt.java b/...on/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionInt.java
@@ -9,27 +9,26 @@ public class TestCheckNullFunctionInt {
 
 	@Test
 	public void testFirstNull() {
-		CheckNullFunction<Integer> isNull = new CheckNullFunction<Integer>("CheckNullFunctionInt");
-		assertEquals(0d, isNull.call(null, 2));
+		assertEquals(0d, simFunc().call(null, 2));
 	}
 
-
 	@Test
 	public void testSecondNull() {
-		CheckNullFunction<Integer> isNull = new CheckNullFunction<Integer>("CheckNullFunctionInt");
-		assertEquals(0d, isNull.call(1, null));
+		assertEquals(0d, simFunc().call(1, null));
 	}
 
 	@Test
 	public void testBothNull() {
-		CheckNullFunction<Integer> isNull = new CheckNullFunction<Integer>("CheckNullFunctionInt");
-		assertEquals(0d, isNull.call(null, null));
+		assertEquals(0d, simFunc().call(null, null));
 	}
 
 	@Test
 	public void testBothNotNull() {
-		CheckNullFunction<Integer> isNull = new CheckNullFunction<Integer>("CheckNullFunctionInt");
-		assertEquals(1d, isNull.call(1, 2));
+		assertEquals(1d, simFunc().call(1, 2));
+	}
+
+	protected CheckNullFunction<Integer> simFunc() {
+		return new CheckNullFunction<Integer>("CheckNullFunctionInt");
 	}
 
 }
diff --git a/...n/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionLong.java b/...n/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionLong.java
@@ -9,27 +9,26 @@ public class TestCheckNullFunctionLong {
 
 	@Test
 	public void testFirstNull() {
-		CheckNullFunction<Long> isNull = new CheckNullFunction<Long>("CheckNullFunctionLong");
-		assertEquals(0d, isNull.call(null, 2l));
+		assertEquals(0d, simFunc().call(null, 2l));
 	}
 
-
 	@Test
 	public void testSecondNull() {
-		CheckNullFunction<Long> isNull = new CheckNullFunction<Long>("CheckNullFunctionLong");
-		assertEquals(0d, isNull.call(1l, null));
+		assertEquals(0d, simFunc().call(1l, null));
 	}
 
 	@Test
 	public void testBothNull() {
-		CheckNullFunction<Long> isNull = new CheckNullFunction<Long>("CheckNullFunctionLong");
-		assertEquals(0d, isNull.call(null, null));
+		assertEquals(0d, simFunc().call(null, null));
 	}
 
 	@Test
 	public void testBothNotNull() {
-		CheckNullFunction<Long> isNull = new CheckNullFunction<Long>("CheckNullFunctionLong");
-		assertEquals(1d, isNull.call(1l, 2l));
+		assertEquals(1d, simFunc().call(1l, 2l));
+	}
+
+	protected CheckNullFunction<Long> simFunc() {
+		return new CheckNullFunction<Long>("CheckNullFunctionLong");
 	}
 
 }
diff --git a/.../src/test/java/zingg/common/core/similarity/function/TestDateSimilarityFunctionExact.java b/.../src/test/java/zingg/common/core/similarity/function/TestDateSimilarityFunctionExact.java
@@ -11,33 +11,32 @@ public class TestDateSimilarityFunctionExact {
 
 	@Test
 	public void testFirstNull() {
-		SimilarityFunctionExact<Date> exact = new SimilarityFunctionExact<Date>("DateSimilarityFunctionExact");
-		assertEquals(1d, exact.call(null, new Date(2)));
+		assertEquals(1d, simFunc().call(null, new Date(2)));
 	}
 
 
 	@Test
 	public void testSecondNull() {
-		SimilarityFunctionExact<Date> exact = new SimilarityFunctionExact<Date>("DateSimilarityFunctionExact");
-		assertEquals(1d, exact.call(new Date(1), null));
+		assertEquals(1d, simFunc().call(new Date(1), null));
 	}
 
 	@Test
 	public void testBothNull() {
-		SimilarityFunctionExact<Date> exact = new SimilarityFunctionExact<Date>("DateSimilarityFunctionExact");
-		assertEquals(1d, exact.call(null, null));
+		assertEquals(1d, simFunc().call(null, null));
 	}
 
 	@Test
 	public void testNotEqual() {
-		SimilarityFunctionExact<Date> exact = new SimilarityFunctionExact<Date>("DateSimilarityFunctionExact");
-		assertEquals(0d, exact.call(new Date(101), new Date(102)));
+		assertEquals(0d, simFunc().call(new Date(101), new Date(102)));
 	}
 
 	@Test
 	public void testEqual() {
-		SimilarityFunctionExact<Date> exact = new SimilarityFunctionExact<Date>("DateSimilarityFunctionExact");
-		assertEquals(1d, exact.call(new Date(101), new Date(101)));
+		assertEquals(1d, simFunc().call(new Date(101), new Date(101)));
+	}
+
+	protected SimilarityFunctionExact<Date> simFunc() {
+		return new SimilarityFunctionExact<Date>("DateSimilarityFunctionExact");
 	}
 
 }
diff --git a/...c/test/java/zingg/common/core/similarity/function/TestIntegerSimilarityFunctionExact.java b/...c/test/java/zingg/common/core/similarity/function/TestIntegerSimilarityFunctionExact.java
@@ -6,36 +6,33 @@
 
 public class TestIntegerSimilarityFunctionExact {
 
-
 	@Test
 	public void testFirstNull() {
-		SimilarityFunctionExact<Integer> exact = new SimilarityFunctionExact<Integer>("IntegerSimilarityFunctionExact");
-		assertEquals(1d, exact.call(null, 2));
+		assertEquals(1d, simFunc().call(null, 2));
 	}
 
-
 	@Test
 	public void testSecondNull() {
-		SimilarityFunctionExact<Integer> exact = new SimilarityFunctionExact<Integer>("IntegerSimilarityFunctionExact");
-		assertEquals(1d, exact.call(1, null));
+		assertEquals(1d, simFunc().call(1, null));
 	}
 
 	@Test
 	public void testBothNull() {
-		SimilarityFunctionExact<Integer> exact = new SimilarityFunctionExact<Integer>("IntegerSimilarityFunctionExact");
-		assertEquals(1d, exact.call(null, null));
+		assertEquals(1d, simFunc().call(null, null));
 	}
 
 	@Test
 	public void testNotEqual() {
-		SimilarityFunctionExact<Integer> exact = new SimilarityFunctionExact<Integer>("IntegerSimilarityFunctionExact");
-		assertEquals(0d, exact.call(101, 102));
+		assertEquals(0d, simFunc().call(101, 102));
 	}
 
 	@Test
 	public void testEqual() {
-		SimilarityFunctionExact<Integer> exact = new SimilarityFunctionExact<Integer>("IntegerSimilarityFunctionExact");
-		assertEquals(1d, exact.call(101, 101));
+		assertEquals(1d, simFunc().call(101, 101));
+	}
+
+	protected SimilarityFunctionExact<Integer> simFunc() {
+		return new SimilarityFunctionExact<Integer>("IntegerSimilarityFunctionExact");
 	}
 
 }
diff --git a/.../src/test/java/zingg/common/core/similarity/function/TestLongSimilarityFunctionExact.java b/.../src/test/java/zingg/common/core/similarity/function/TestLongSimilarityFunctionExact.java
@@ -9,33 +9,31 @@ public class TestLongSimilarityFunctionExact {
 
 	@Test
 	public void testFirstNull() {
-		SimilarityFunctionExact<Long> exact = new SimilarityFunctionExact<Long>("LongSimilarityFunctionExact");
-		assertEquals(1d, exact.call(null, 2l));
+		assertEquals(1d, simFunc().call(null, 2l));
 	}
 
-
 	@Test
 	public void testSecondNull() {
-		SimilarityFunctionExact<Long> exact = new SimilarityFunctionExact<Long>("LongSimilarityFunctionExact");
-		assertEquals(1d, exact.call(1l, null));
+		assertEquals(1d, simFunc().call(1l, null));
 	}
 
 	@Test
 	public void testBothNull() {
-		SimilarityFunctionExact<Long> exact = new SimilarityFunctionExact<Long>("LongSimilarityFunctionExact");
-		assertEquals(1d, exact.call(null, null));
+		assertEquals(1d, simFunc().call(null, null));
 	}
 
 	@Test
 	public void testNotEqual() {
-		SimilarityFunctionExact<Long> exact = new SimilarityFunctionExact<Long>("LongSimilarityFunctionExact");
-		assertEquals(0d, exact.call(101l, 102l));
+		assertEquals(0d, simFunc().call(101l, 102l));
 	}
 
 	@Test
 	public void testEqual() {
-		SimilarityFunctionExact<Long> exact = new SimilarityFunctionExact<Long>("LongSimilarityFunctionExact");
-		assertEquals(1d, exact.call(101l, 101l));
+		assertEquals(1d, simFunc().call(101l, 101l));
 	}
 
+	protected SimilarityFunctionExact<Long> simFunc() {
+		return new SimilarityFunctionExact<Long>("LongSimilarityFunctionExact");
+	}	
+
 }