From ce80e072f7885fc10c07687495a8a7f9aa198d50 Mon Sep 17 00:00:00 2001 From: Vikas Gupta Date: Thu, 25 Apr 2024 08:44:37 +0530 Subject: [PATCH] refactor to common method --- .../function/TestCheckNullFunctionDate.java | 18 +++++++--------- .../function/TestCheckNullFunctionInt.java | 17 +++++++-------- .../function/TestCheckNullFunctionLong.java | 17 +++++++-------- .../TestDateSimilarityFunctionExact.java | 19 ++++++++--------- .../TestIntegerSimilarityFunctionExact.java | 21 ++++++++----------- .../TestLongSimilarityFunctionExact.java | 20 ++++++++---------- 6 files changed, 51 insertions(+), 61 deletions(-) diff --git a/common/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionDate.java b/common/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionDate.java index 2f80631d..c886b76e 100644 --- a/common/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionDate.java +++ b/common/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 isNull = new CheckNullFunction("CheckNullFunctionDate"); - assertEquals(0d, isNull.call(null, new Date(2))); + assertEquals(0d, simFunc().call(null, new Date(2))); } - @Test public void testSecondNull() { - CheckNullFunction isNull = new CheckNullFunction("CheckNullFunctionDate"); - assertEquals(0d, isNull.call(new Date(1), null)); + assertEquals(0d, simFunc().call(new Date(1), null)); } @Test public void testBothNull() { - CheckNullFunction isNull = new CheckNullFunction("CheckNullFunctionDate"); - assertEquals(0d, isNull.call(null, null)); + assertEquals(0d, simFunc().call(null, null)); } @Test public void testBothNotNull() { - CheckNullFunction isNull = new CheckNullFunction("CheckNullFunctionDate"); - assertEquals(1d, isNull.call(new Date(1), new Date(2))); + assertEquals(1d, simFunc().call(new Date(1), new Date(2))); + } + + protected CheckNullFunction simFunc() { + return new CheckNullFunction("CheckNullFunctionDate"); } } diff --git a/common/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionInt.java b/common/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionInt.java index 229edcb7..144fc5fa 100644 --- a/common/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionInt.java +++ b/common/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionInt.java @@ -9,27 +9,26 @@ public class TestCheckNullFunctionInt { @Test public void testFirstNull() { - CheckNullFunction isNull = new CheckNullFunction("CheckNullFunctionInt"); - assertEquals(0d, isNull.call(null, 2)); + assertEquals(0d, simFunc().call(null, 2)); } - @Test public void testSecondNull() { - CheckNullFunction isNull = new CheckNullFunction("CheckNullFunctionInt"); - assertEquals(0d, isNull.call(1, null)); + assertEquals(0d, simFunc().call(1, null)); } @Test public void testBothNull() { - CheckNullFunction isNull = new CheckNullFunction("CheckNullFunctionInt"); - assertEquals(0d, isNull.call(null, null)); + assertEquals(0d, simFunc().call(null, null)); } @Test public void testBothNotNull() { - CheckNullFunction isNull = new CheckNullFunction("CheckNullFunctionInt"); - assertEquals(1d, isNull.call(1, 2)); + assertEquals(1d, simFunc().call(1, 2)); + } + + protected CheckNullFunction simFunc() { + return new CheckNullFunction("CheckNullFunctionInt"); } } diff --git a/common/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionLong.java b/common/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionLong.java index 31d9cb59..a7712d07 100644 --- a/common/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionLong.java +++ b/common/core/src/test/java/zingg/common/core/similarity/function/TestCheckNullFunctionLong.java @@ -9,27 +9,26 @@ public class TestCheckNullFunctionLong { @Test public void testFirstNull() { - CheckNullFunction isNull = new CheckNullFunction("CheckNullFunctionLong"); - assertEquals(0d, isNull.call(null, 2l)); + assertEquals(0d, simFunc().call(null, 2l)); } - @Test public void testSecondNull() { - CheckNullFunction isNull = new CheckNullFunction("CheckNullFunctionLong"); - assertEquals(0d, isNull.call(1l, null)); + assertEquals(0d, simFunc().call(1l, null)); } @Test public void testBothNull() { - CheckNullFunction isNull = new CheckNullFunction("CheckNullFunctionLong"); - assertEquals(0d, isNull.call(null, null)); + assertEquals(0d, simFunc().call(null, null)); } @Test public void testBothNotNull() { - CheckNullFunction isNull = new CheckNullFunction("CheckNullFunctionLong"); - assertEquals(1d, isNull.call(1l, 2l)); + assertEquals(1d, simFunc().call(1l, 2l)); + } + + protected CheckNullFunction simFunc() { + return new CheckNullFunction("CheckNullFunctionLong"); } } diff --git a/common/core/src/test/java/zingg/common/core/similarity/function/TestDateSimilarityFunctionExact.java b/common/core/src/test/java/zingg/common/core/similarity/function/TestDateSimilarityFunctionExact.java index 1916fafa..56f81529 100644 --- a/common/core/src/test/java/zingg/common/core/similarity/function/TestDateSimilarityFunctionExact.java +++ b/common/core/src/test/java/zingg/common/core/similarity/function/TestDateSimilarityFunctionExact.java @@ -11,33 +11,32 @@ public class TestDateSimilarityFunctionExact { @Test public void testFirstNull() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("DateSimilarityFunctionExact"); - assertEquals(1d, exact.call(null, new Date(2))); + assertEquals(1d, simFunc().call(null, new Date(2))); } @Test public void testSecondNull() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("DateSimilarityFunctionExact"); - assertEquals(1d, exact.call(new Date(1), null)); + assertEquals(1d, simFunc().call(new Date(1), null)); } @Test public void testBothNull() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("DateSimilarityFunctionExact"); - assertEquals(1d, exact.call(null, null)); + assertEquals(1d, simFunc().call(null, null)); } @Test public void testNotEqual() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("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 exact = new SimilarityFunctionExact("DateSimilarityFunctionExact"); - assertEquals(1d, exact.call(new Date(101), new Date(101))); + assertEquals(1d, simFunc().call(new Date(101), new Date(101))); + } + + protected SimilarityFunctionExact simFunc() { + return new SimilarityFunctionExact("DateSimilarityFunctionExact"); } } diff --git a/common/core/src/test/java/zingg/common/core/similarity/function/TestIntegerSimilarityFunctionExact.java b/common/core/src/test/java/zingg/common/core/similarity/function/TestIntegerSimilarityFunctionExact.java index d8931404..37e1b415 100644 --- a/common/core/src/test/java/zingg/common/core/similarity/function/TestIntegerSimilarityFunctionExact.java +++ b/common/core/src/test/java/zingg/common/core/similarity/function/TestIntegerSimilarityFunctionExact.java @@ -6,36 +6,33 @@ public class TestIntegerSimilarityFunctionExact { - @Test public void testFirstNull() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("IntegerSimilarityFunctionExact"); - assertEquals(1d, exact.call(null, 2)); + assertEquals(1d, simFunc().call(null, 2)); } - @Test public void testSecondNull() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("IntegerSimilarityFunctionExact"); - assertEquals(1d, exact.call(1, null)); + assertEquals(1d, simFunc().call(1, null)); } @Test public void testBothNull() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("IntegerSimilarityFunctionExact"); - assertEquals(1d, exact.call(null, null)); + assertEquals(1d, simFunc().call(null, null)); } @Test public void testNotEqual() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("IntegerSimilarityFunctionExact"); - assertEquals(0d, exact.call(101, 102)); + assertEquals(0d, simFunc().call(101, 102)); } @Test public void testEqual() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("IntegerSimilarityFunctionExact"); - assertEquals(1d, exact.call(101, 101)); + assertEquals(1d, simFunc().call(101, 101)); + } + + protected SimilarityFunctionExact simFunc() { + return new SimilarityFunctionExact("IntegerSimilarityFunctionExact"); } } diff --git a/common/core/src/test/java/zingg/common/core/similarity/function/TestLongSimilarityFunctionExact.java b/common/core/src/test/java/zingg/common/core/similarity/function/TestLongSimilarityFunctionExact.java index 0d8576ca..ee880825 100644 --- a/common/core/src/test/java/zingg/common/core/similarity/function/TestLongSimilarityFunctionExact.java +++ b/common/core/src/test/java/zingg/common/core/similarity/function/TestLongSimilarityFunctionExact.java @@ -9,33 +9,31 @@ public class TestLongSimilarityFunctionExact { @Test public void testFirstNull() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("LongSimilarityFunctionExact"); - assertEquals(1d, exact.call(null, 2l)); + assertEquals(1d, simFunc().call(null, 2l)); } - @Test public void testSecondNull() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("LongSimilarityFunctionExact"); - assertEquals(1d, exact.call(1l, null)); + assertEquals(1d, simFunc().call(1l, null)); } @Test public void testBothNull() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("LongSimilarityFunctionExact"); - assertEquals(1d, exact.call(null, null)); + assertEquals(1d, simFunc().call(null, null)); } @Test public void testNotEqual() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("LongSimilarityFunctionExact"); - assertEquals(0d, exact.call(101l, 102l)); + assertEquals(0d, simFunc().call(101l, 102l)); } @Test public void testEqual() { - SimilarityFunctionExact exact = new SimilarityFunctionExact("LongSimilarityFunctionExact"); - assertEquals(1d, exact.call(101l, 101l)); + assertEquals(1d, simFunc().call(101l, 101l)); } + protected SimilarityFunctionExact simFunc() { + return new SimilarityFunctionExact("LongSimilarityFunctionExact"); + } + }