[refactor] Make functions reusable

Author: adamretter

exist-core/src/main/java/org/exist/test/DiffMatcher.java

@@ -37,9 +37,11 @@
 import org.exist.xquery.value.Sequence;
 import org.hamcrest.Description;
 import org.hamcrest.DiagnosingMatcher;
+import org.w3c.dom.Node;
 import org.xmlunit.builder.DiffBuilder;
 import org.xmlunit.builder.Input;
 import org.xmlunit.diff.Diff;
+import org.xmlunit.util.Convert;
 
 import javax.xml.transform.Source;
 
@@ -142,4 +144,28 @@ public void describeTo(final Description description) {
                 .appendText("nodes match ")
                 .appendValue(expectedSource);
     }
+
+    /**
+     * Creates an Document Source form an XML String.
+     *
+     * @param str a string representation of XML.
+     *
+     * @return a Document Source.
+     */
+    public static Source docSource(final String str) {
+        return Input.fromString(str).build();
+    }
+
+    /**
+     * Creates an Element Source form an XML String.
+     *
+     * @param str a string representation of XML.
+     *
+     * @return an Element Source.
+     */
+    public static Source elemSource(final String str) {
+        final Node documentNode = Convert.toNode(docSource(str));
+        final Node firstElement = documentNode.getFirstChild();
+        return Input.fromNode(firstElement).build();
+    }
 }

exist-core/src/test/java/org/exist/xquery/AbsolutePathTests.java

@@ -28,14 +28,14 @@
 import org.exist.xquery.value.IntegerValue;
 import org.exist.xquery.value.Sequence;
 import org.junit.Test;
-import org.w3c.dom.Node;
-import org.xmlunit.builder.Input;
-import org.xmlunit.util.Convert;
 
 import javax.xml.transform.Source;
 
+import static org.exist.test.DiffMatcher.docSource;
+import static org.exist.test.DiffMatcher.elemSource;
 import static org.exist.test.XQueryAssertions.assertThatXQResult;
 import static org.exist.test.XQueryAssertions.assertXQStaticError;
+import static org.exist.test.XQueryAssertions.assertXQResultIdentical;
 import static org.exist.test.XQueryAssertions.assertXQResultSimilar;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -95,7 +95,7 @@ public void immediateLambdaWithDocumentAndDoubleSlash() throws EXistException, P
                 "  <result>{ $f($d) }</result>";
         final Either<XPathException, Sequence> actual = executeQuery(query);
 
-        assertXQResultSimilar(expected, actual);
+        assertXQResultIdentical(expected, actual);
     }
 
     @Test
@@ -108,7 +108,7 @@ public void immediateLambdaWithDocumentAndSlash() throws EXistException, Permiss
                 "  $f($d)";
         final Either<XPathException, Sequence> actual = executeQuery(query);
 
-        assertXQResultSimilar(expected, actual);
+        assertXQResultIdentical(expected, actual);
     }
 
     @Test
@@ -133,28 +133,4 @@ public void topLevelAbsolutePath() throws EXistException, PermissionDeniedExcept
 
         assertThatXQResult(actual, equalTo(expected));
     }
-
-    /**
-     * Creates an Document6 Source form an XML String.
-     *
-     * @param str a string representation of XML.
-     *
-     * @return a Document Source.
-     */
-    private static Source docSource(final String str) {
-        return Input.fromString(str).build();
-    }
-
-    /**
-     * Creates an Element Source form an XML String.
-     *
-     * @param str a string representation of XML.
-     *
-     * @return an Element Source.
-     */
-    private static Source elemSource(final String str) {
-        final Node documentNode = Convert.toNode(docSource(str));
-        final Node firstElement = documentNode.getFirstChild();
-        return Input.fromNode(firstElement).build();
-    }
 }