Metamorph Java map test should verify that no unexpected interactions occurred.

Author: blackwinter

metamorph/src/test/java/org/metafacture/metamorph/maps/JavaMapTest.java

@@ -15,14 +15,11 @@
  */
 package org.metafacture.metamorph.maps;
 
-import static org.mockito.Mockito.inOrder;
+import static org.metafacture.metamorph.TestHelpers.assertMorph;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.metafacture.framework.StreamReceiver;
-import org.metafacture.metamorph.InlineMorph;
-import org.metafacture.metamorph.Metamorph;
-import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
@@ -36,38 +33,36 @@
  */
 public final class JavaMapTest {
 
-  @Rule
-  public final MockitoRule mockitoRule = MockitoJUnit.rule();
+    @Rule
+    public final MockitoRule mockitoRule = MockitoJUnit.rule();
 
-  @Mock
-  private StreamReceiver receiver;
+    @Mock
+    private StreamReceiver receiver;
 
-  private Metamorph metamorph;
-
-  @Test
-  public void shouldLookupValuesInJavaBackedMap() {
-    metamorph = InlineMorph.in(this)
-        .with("<rules>")
-        .with("  <data source='1'>")
-        .with("    <lookup in='map1' />")
-        .with("  </data>")
-        .with("</rules>")
-        .with("<maps>")
-        .with("  <javamap name='map1' class='org.metafacture.metamorph.maps.FileMap' files='org/metafacture/metamorph/maps/java-map-test.txt' />")
-        .with("</maps>")
-        .createConnectedTo(receiver);
-
-    metamorph.startRecord("1");
-    metamorph.literal("1", "gw");
-    metamorph.literal("1", "fj");
-    metamorph.endRecord();
-
-    final InOrder ordered = inOrder(receiver);
-    ordered.verify(receiver).startRecord("1");
-    ordered.verify(receiver).literal("1", "Germany");
-    ordered.verify(receiver).literal("1", "Fiji");
-    ordered.verify(receiver).endRecord();
-    ordered.verifyNoMoreInteractions();
-  }
+    @Test
+    public void shouldLookupValuesInJavaBackedMap() {
+        assertMorph(receiver,
+                "<rules>" +
+                "  <data source='1'>" +
+                "    <lookup in='map1' />" +
+                "  </data>" +
+                "</rules>" +
+                "<maps>" +
+                "  <javamap name='map1' class='org.metafacture.metamorph.maps.FileMap' files='org/metafacture/metamorph/maps/java-map-test.txt' />" +
+                "</maps>",
+                i -> {
+                    i.startRecord("1");
+                    i.literal("1", "gw");
+                    i.literal("1", "fj");
+                    i.endRecord();
+                },
+                o -> {
+                    o.get().startRecord("1");
+                    o.get().literal("1", "Germany");
+                    o.get().literal("1", "Fiji");
+                    o.get().endRecord();
+                }
+        );
+    }
 
 }