Simplify two tests with the new PairMatcher. #42 (#44)

dmfs · Oct 12, 2017 · d2aba88 · d2aba88
1 parent bdbd1cb
commit d2aba88
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 37 deletions.
diff --git a/essentials/build.gradle b/essentials/build.gradle
@@ -10,6 +10,7 @@ configurations {
 apply from: '../publish.gradle'
 
 dependencies {
+    testCompile project(':jems-testing')
     testCompile 'junit:junit:' + JUNIT
     testCompile 'org.hamcrest:hamcrest-all:' + HAMCREST
 }
diff --git a/essentials/src/test/java/org/dmfs/jems/function/elementary/PairingFunctionTest.java b/essentials/src/test/java/org/dmfs/jems/function/elementary/PairingFunctionTest.java
@@ -19,6 +19,7 @@
 
 import org.junit.Test;
 
+import static org.dmfs.jems.pair.hamcrest.PairMatcher.pair;
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.junit.Assert.assertThat;
 
@@ -34,27 +35,12 @@ public final class PairingFunctionTest
     @Test
     public void test()
     {
-        LeftHand leftHand = new LeftHand();
-        RightHand rightHand = new RightHand();
+        String left = new String("a");
+        Integer right = new Integer(1);
 
-        PairingFunction<LeftHand, RightHand> pairingFunction = new PairingFunction<>();
-        assertThat(pairingFunction.value(leftHand, rightHand).left(), sameInstance(leftHand));
-        assertThat(pairingFunction.value(leftHand, rightHand).right(), sameInstance(rightHand));
-
-        assertThat(PairingFunction.<LeftHand, RightHand>instance().value(leftHand, rightHand).left(), sameInstance(leftHand));
-        assertThat(PairingFunction.<LeftHand, RightHand>instance().value(leftHand, rightHand).right(), sameInstance(rightHand));
-    }
-
-
-    private static final class LeftHand
-    {
-
-    }
-
-
-    private static final class RightHand
-    {
+        assertThat(new PairingFunction<String, Integer>().value(left, right), pair(sameInstance(left), sameInstance(right)));
 
+        assertThat(PairingFunction.<String, Integer>instance().value(left, right), pair(sameInstance(left), sameInstance(right)));
     }
 
 }
diff --git a/essentials/src/test/java/org/dmfs/jems/pair/elementary/ValuePairTest.java b/essentials/src/test/java/org/dmfs/jems/pair/elementary/ValuePairTest.java
@@ -19,6 +19,7 @@
 
 import org.junit.Test;
 
+import static org.dmfs.jems.pair.hamcrest.PairMatcher.pair;
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.junit.Assert.assertThat;
 
@@ -33,25 +34,10 @@ public final class ValuePairTest
     @Test
     public void testThatSameInstancesAreReturned()
     {
-        LeftHand leftHand = new LeftHand();
-        RightHand rightHand = new RightHand();
-
-        ValuePair<LeftHand, RightHand> hands = new ValuePair<>(leftHand, rightHand);
-
-        assertThat(hands.left(), sameInstance(leftHand));
-        assertThat(hands.right(), sameInstance(rightHand));
-    }
-
-
-    private final static class LeftHand
-    {
-
-    }
-
-
-    private final static class RightHand
-    {
+        String left = new String("a");
+        Integer right = new Integer(1);
 
+        assertThat(new ValuePair<>(left, right), pair(sameInstance(left), sameInstance(right)));
     }
 
 }