Skip to content

Commit aaeab2b

Browse files
adamretteradamretter
committed
[refactor] Remove dependency on Legacy XMLUnit
1 parent 6b8a553 commit aaeab2b

File tree

23 files changed

+750
-470
lines changed

23 files changed

+750
-470
lines changed

‎exist-core/pom.xml‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@
633633
</dependency>
634634
<dependency>
635635
<groupId>org.xmlunit</groupId>
636-
<artifactId>xmlunit-legacy</artifactId>
636+
<artifactId>xmlunit-matchers</artifactId>
637637
<scope>test</scope>
638638
</dependency>
639639
<dependency>
@@ -976,6 +976,7 @@
976976
<include>src/test/java/org/exist/storage/RecoveryTest.java</include>
977977
<include>src/test/java/org/exist/storage/Recovery2Test.java</include>
978978
<include>src/main/java/org/exist/storage/StorageAddress.java</include>
979+
<include>src/test/java/org/exist/storage/XIncludeSerializerTest.java</include>
979980
<include>src/test/java/org/exist/storage/btree/BTreeTest.java</include>
980981
<include>src/main/java/org/exist/storage/btree/TreeMetrics.java</include>
981982
<include>src/main/java/org/exist/storage/index/BFile.java</include>
@@ -1082,10 +1083,12 @@
10821083
<include>src/main/java/org/exist/xquery/UserDefinedFunction.java</include>
10831084
<include>src/test/java/org/exist/xquery/WindowClauseTest.java</include>
10841085
<include>src/test/java/org/exist/xquery/XmldbBinariesTest.java</include>
1086+
<include>src/test/java/org/exist/xquery/XPathQueryTest.java</include>
10851087
<include>src/test/java/org/exist/xquery/XPathOpOrSpecialCaseTest.java</include>
10861088
<include>src/main/java/org/exist/xquery/XPathUtil.java</include>
10871089
<include>src/main/java/org/exist/xquery/XQueryContext.java</include>
10881090
<include>src/test/java/org/exist/xquery/XQueryFunctionsTest.java</include>
1091+
<include>src/main/java/org/exist/xquery/XQueryProcessingInstruction.java</include>
10891092
<include>src/test/java/org/exist/xquery/XQueryProcessingInstructionTest.java</include>
10901093
<include>src/test/java/org/exist/xquery/XQueryTest.java</include>
10911094
<include>src/main/java/org/exist/xquery/functions/array/ArrayType.java</include>
@@ -1197,11 +1200,14 @@
11971200
<include>src/main/java/org/exist/xquery/functions/fn/transform/Transform.java</include>
11981201
<include>src/main/java/org/exist/xquery/functions/fn/transform/TreeUtils.java</include>
11991202
<include>src/main/java/org/exist/xquery/functions/integer/WordPicture.java</include>
1203+
<include>src/test/java/org/exist/xquery/functions/request/GetHeaderTest.java</include>
12001204
<include>src/test/java/org/exist/xquery/functions/securitymanager/GetPermissionsTest.java</include>
12011205
<include>src/test/java/org/exist/xquery/functions/securitymanager/GroupManagementFunctionRemoveGroupTest.java</include>
12021206
<include>src/test/java/org/exist/xquery/functions/securitymanager/GroupMembershipFunctionRemoveGroupMemberTest.java</include>
1207+
<include>src/test/java/org/exist/xquery/functions/securitymanager/IdFunctionTest.java</include>
12031208
<include>src/test/java/org/exist/xquery/functions/securitymanager/PermissionsFunctionChmodTest.java</include>
12041209
<include>src/test/java/org/exist/xquery/functions/securitymanager/PermissionsFunctionChownTest.java</include>
1210+
<include>src/test/java/org/exist/xquery/functions/system/GetRunningXQueriesTest.java</include>
12051211
<include>src/main/java/org/exist/xquery/functions/system/GetUptime.java</include>
12061212
<include>src/main/java/org/exist/xquery/functions/system/Shutdown.java</include>
12071213
<include>src/main/java/org/exist/xquery/functions/system/SystemModule.java</include>
@@ -1214,11 +1220,19 @@
12141220
<include>src/main/java/org/exist/xquery/functions/util/FunctionFunction.java</include>
12151221
<include>src/main/java/org/exist/xquery/functions/util/LogFunction.java</include>
12161222
<include>src/main/java/org/exist/xquery/functions/util/ModuleInfo.java</include>
1223+
<include>src/test/java/org/exist/xquery/functions/validate/JaxpDtdCatalogTest.java</include>
1224+
<include>src/test/java/org/exist/xquery/functions/validate/JaxpParseTest.java</include>
1225+
<include>src/test/java/org/exist/xquery/functions/validate/JaxpXsdCatalogTest.java</include>
12171226
<include>src/test/java/org/exist/xquery/functions/validate/JaxvTest.java</include>
1227+
<include>src/test/java/org/exist/xquery/functions/validate/JingOnvdlTest.java</include>
1228+
<include>src/test/java/org/exist/xquery/functions/validate/JingRelaxNgTest.java</include>
1229+
<include>src/test/java/org/exist/xquery/functions/validate/JingSchematronTest.java</include>
1230+
<include>src/test/java/org/exist/xquery/functions/validate/JingXsdTest.java</include>
12181231
<include>src/main/java/org/exist/xquery/functions/validation/Jaxp.java</include>
12191232
<include>src/test/java/org/exist/xquery/functions/xmldb/DbStore2Test.java</include>
12201233
<include>src/main/java/org/exist/xquery/functions/xmldb/XMLDBStore.java</include>
12211234
<include>src/main/java/org/exist/xquery/functions/xmldb/XMLDBXUpdate.java</include>
1235+
<include>src/test/java/org/exist/xquery/functions/xquery3/TryCatchTest.java</include>
12221236
<include>src/main/antlr/org/exist/xquery/parser/XQueryTree.g</include>
12231237
<include>src/test/java/org/exist/xquery/update/AbstractUpdateTest.java</include>
12241238
<include>src/test/java/org/exist/xquery/update/IndexIntegrationTest.java</include>
@@ -1502,6 +1516,7 @@
15021516
<exclude>src/test/java/org/exist/storage/RecoveryTest.java</exclude>
15031517
<exclude>src/test/java/org/exist/storage/Recovery2Test.java</exclude>
15041518
<exclude>src/main/java/org/exist/storage/StorageAddress.java</exclude>
1519+
<exclude>src/test/java/org/exist/storage/XIncludeSerializerTest.java</exclude>
15051520
<exclude>src/main/java/org/exist/storage/XQueryPool.java</exclude>
15061521
<exclude>src/main/java/org/exist/storage/blob/**</exclude>
15071522
<exclude>src/test/java/org/exist/storage/blob/**</exclude>
@@ -1678,10 +1693,12 @@
16781693
<exclude>src/test/java/org/exist/xquery/WindowClauseTest.java</exclude>
16791694
<exclude>src/test/java/org/exist/xquery/XmldbBinariesTest.java</exclude>
16801695
<exclude>src/test/java/org/exist/xquery/XPathOpOrSpecialCaseTest.java</exclude>
1696+
<exclude>src/test/java/org/exist/xquery/XPathQueryTest.java</exclude>
16811697
<exclude>src/main/java/org/exist/xquery/XPathUtil.java</exclude>
16821698
<exclude>src/main/java/org/exist/xquery/XQueryContext.java</exclude>
16831699
<exclude>src/test/java/org/exist/xquery/XQueryContextAttributesTest.java</exclude>
16841700
<exclude>src/test/java/org/exist/xquery/XQueryFunctionsTest.java</exclude>
1701+
<exclude>src/main/java/org/exist/xquery/XQueryProcessingInstruction.java</exclude>
16851702
<exclude>src/test/java/org/exist/xquery/XQueryProcessingInstructionTest.java</exclude>
16861703
<exclude>src/test/java/org/exist/xquery/XQueryTest.java</exclude>
16871704
<exclude>src/main/java/org/exist/xquery/functions/array/ArrayType.java</exclude>
@@ -1799,16 +1816,19 @@
17991816
<exclude>src/main/java/org/exist/xquery/functions/fn/transform/TreeUtils.java</exclude>
18001817
<exclude>src/main/java/org/exist/xquery/functions/integer/WordPicture.java</exclude>
18011818
<exclude>src/main/java/org/exist/xquery/functions/map/MapType.java</exclude>
1819+
<exclude>src/test/java/org/exist/xquery/functions/request/GetHeaderTest.java</exclude>
18021820
<exclude>src/test/java/org/exist/xquery/functions/securitymanager/AccountMetadataFunctionsTest.java</exclude>
18031821
<exclude>src/test/java/org/exist/xquery/functions/securitymanager/GetPermissionsTest.java</exclude>
18041822
<exclude>src/test/java/org/exist/xquery/functions/securitymanager/GroupManagementFunctionRemoveGroupTest.java</exclude>
18051823
<exclude>src/test/java/org/exist/xquery/functions/securitymanager/GroupMembershipFunctionRemoveGroupMemberTest.java</exclude>
1824+
<exclude>src/test/java/org/exist/xquery/functions/securitymanager/IdFunctionTest.java</exclude>
18061825
<exclude>src/test/java/org/exist/xquery/functions/securitymanager/PermissionsFunctionChmodTest.java</exclude>
18071826
<exclude>src/test/java/org/exist/xquery/functions/securitymanager/PermissionsFunctionChownTest.java</exclude>
18081827
<exclude>src/test/java/org/exist/xquery/functions/securitymanager/SecurityManagerTestUtil.java</exclude>
18091828
<exclude>src/test/java/org/exist/xquery/functions/session/AbstractSessionTest.java</exclude>
18101829
<exclude>src/test/java/org/exist/xquery/functions/session/AttributeTest.java</exclude>
18111830
<exclude>src/main/java/org/exist/xquery/functions/system/FunctionAvailable.java</exclude>
1831+
<exclude>src/test/java/org/exist/xquery/functions/system/GetRunningXQueriesTest.java</exclude>
18121832
<exclude>src/main/java/org/exist/xquery/functions/system/GetUptime.java</exclude>
18131833
<exclude>src/main/java/org/exist/xquery/functions/system/Shutdown.java</exclude>
18141834
<exclude>src/main/java/org/exist/xquery/functions/system/SystemModule.java</exclude>
@@ -1822,7 +1842,14 @@
18221842
<exclude>src/main/java/org/exist/xquery/functions/util/FunctionFunction.java</exclude>
18231843
<exclude>src/main/java/org/exist/xquery/functions/util/LogFunction.java</exclude>
18241844
<exclude>src/main/java/org/exist/xquery/functions/util/ModuleInfo.java</exclude>
1845+
<exclude>src/test/java/org/exist/xquery/functions/validate/JaxpDtdCatalogTest.java</exclude>
1846+
<exclude>src/test/java/org/exist/xquery/functions/validate/JaxpParseTest.java</exclude>
1847+
<exclude>src/test/java/org/exist/xquery/functions/validate/JaxpXsdCatalogTest.java</exclude>
18251848
<exclude>src/test/java/org/exist/xquery/functions/validate/JaxvTest.java</exclude>
1849+
<exclude>src/test/java/org/exist/xquery/functions/validate/JingOnvdlTest.java</exclude>
1850+
<exclude>src/test/java/org/exist/xquery/functions/validate/JingRelaxNgTest.java</exclude>
1851+
<exclude>src/test/java/org/exist/xquery/functions/validate/JingSchematronTest.java</exclude>
1852+
<exclude>src/test/java/org/exist/xquery/functions/validate/JingXsdTest.java</exclude>
18261853
<exclude>src/main/java/org/exist/xquery/functions/validation/Jaxp.java</exclude>
18271854
<exclude>src/test/java/org/exist/xquery/functions/xmldb/AbstractXMLDBTest.java</exclude>
18281855
<exclude>src/test/java/org/exist/xquery/functions/xmldb/DbStore2Test.java</exclude>
@@ -1831,6 +1858,7 @@
18311858
<exclude>src/test/java/org/exist/xquery/functions/xmldb/XMLDBStoreTest.java</exclude>
18321859
<exclude>src/main/java/org/exist/xquery/functions/xmldb/XMLDBXUpdate.java</exclude>
18331860
<exclude>src/test/java/org/exist/xquery/functions/xquery3/SerializeTest.java</exclude>
1861+
<exclude>src/test/java/org/exist/xquery/functions/xquery3/TryCatchTest.java</exclude>
18341862
<exclude>src/main/antlr/org/exist/xquery/parser/XQueryTree.g</exclude>
18351863
<exclude>src/main/java/org/exist/xquery/pragmas/TimePragma.java</exclude>
18361864
<exclude>src/test/java/org/exist/xquery/update/AbstractUpdateTest.java</exclude>

‎exist-core/src/test/java/org/exist/storage/XIncludeSerializerTest.java‎

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
/*
2+
* Elemental
3+
* Copyright (C) 2024, Evolved Binary Ltd
4+
*
5+
* [email protected]
6+
* https://www.evolvedbinary.com | https://www.elemental.xyz
7+
*
8+
* This library is free software; you can redistribute it and/or
9+
* modify it under the terms of the GNU Lesser General Public
10+
* License as published by the Free Software Foundation; version 2.1.
11+
*
12+
* This library is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
* Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public
18+
* License along with this library; if not, write to the Free Software
19+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+
*
21+
* NOTE: Parts of this file contain code from 'The eXist-db Authors'.
22+
* The original license header is included below.
23+
*
24+
* =====================================================================
25+
*
226
* eXist-db Open Source Native XML Database
327
* Copyright (C) 2001 The eXist-db Authors
428
*
@@ -24,15 +48,16 @@
2448
import org.apache.xmlrpc.XmlRpcException;
2549
import org.apache.xmlrpc.client.XmlRpcClient;
2650
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
27-
import org.custommonkey.xmlunit.Diff;
2851
import org.exist.Namespaces;
2952
import org.exist.test.ExistWebServer;
3053
import org.exist.xmldb.XmldbURI;
3154
import org.junit.BeforeClass;
3255
import org.junit.ClassRule;
3356
import org.junit.Test;
34-
import static org.junit.Assert.assertTrue;
57+
58+
import static org.hamcrest.MatcherAssert.assertThat;
3559
import org.xml.sax.SAXException;
60+
import org.xmlunit.matchers.CompareMatcher;
3661

3762
import java.io.BufferedReader;
3863
import java.io.IOException;
@@ -164,10 +189,7 @@ public void absSimpleREST() throws IOException, SAXException {
164189
}
165190

166191
final String responseXML = out.toString();
167-
168-
final Diff myDiff = new Diff(XML_RESULT, responseXML);
169-
assertTrue("pieces of XML are similar " + myDiff, myDiff.similar());
170-
assertTrue("but are they identical? " + myDiff, myDiff.identical());
192+
assertThat(responseXML, CompareMatcher.isIdenticalTo(XML_RESULT));
171193
}
172194

173195
@Test
@@ -186,10 +208,7 @@ public void relSimpleREST1() throws IOException, SAXException {
186208
out.append("\r\n");
187209
}
188210
final String responseXML = out.toString();
189-
190-
final Diff myDiff = new Diff(XML_RESULT, responseXML);
191-
assertTrue("pieces of XML are similar " + myDiff, myDiff.similar());
192-
assertTrue("but are they identical? " + myDiff, myDiff.identical());
211+
assertThat(responseXML, CompareMatcher.isIdenticalTo(XML_RESULT));
193212
}
194213

195214
@Test
@@ -209,10 +228,7 @@ public void relSimpleREST2() throws IOException, SAXException {
209228
out.append("\r\n");
210229
}
211230
final String responseXML = out.toString();
212-
213-
final Diff myDiff = new Diff(XML_RESULT, responseXML);
214-
assertTrue("pieces of XML are similar " + myDiff, myDiff.similar());
215-
assertTrue("but are they identical? " + myDiff, myDiff.identical());
231+
assertThat(responseXML, CompareMatcher.isIdenticalTo(XML_RESULT));
216232
}
217233

218234
@Test
@@ -231,10 +247,7 @@ public void xpointerREST3() throws IOException, SAXException {
231247
out.append("\r\n");
232248
}
233249
final String responseXML = out.toString();
234-
235-
final Diff myDiff = new Diff(XML_RESULT_XPOINTER, responseXML);
236-
assertTrue("pieces of XML are similar " + myDiff, myDiff.similar());
237-
assertTrue("but are they identical? " + myDiff, myDiff.identical());
250+
assertThat(responseXML, CompareMatcher.isIdenticalTo(XML_RESULT_XPOINTER));
238251
}
239252

240253
@Test
@@ -253,10 +266,7 @@ public void xpointerREST4() throws IOException, SAXException {
253266
out.append("\r\n");
254267
}
255268
final String responseXML = out.toString();
256-
257-
final Diff myDiff = new Diff(XML_RESULT_XPOINTER, responseXML);
258-
assertTrue("pieces of XML are similar " + myDiff, myDiff.similar());
259-
assertTrue("but are they identical? " + myDiff, myDiff.identical());
269+
assertThat(responseXML, CompareMatcher.isIdenticalTo(XML_RESULT_XPOINTER));
260270
}
261271

262272
@Test
@@ -274,11 +284,8 @@ public void fallback1() throws IOException, SAXException {
274284
out.append(line);
275285
out.append("\r\n");
276286
}
277-
String responseXML = out.toString();
278-
279-
final Diff myDiff = new Diff(XML_RESULT_FALLBACK1, responseXML);
280-
assertTrue("pieces of XML are similar " + myDiff, myDiff.similar());
281-
assertTrue("but are they identical? " + myDiff, myDiff.identical());
287+
final String responseXML = out.toString();
288+
assertThat(responseXML, CompareMatcher.isIdenticalTo(XML_RESULT_FALLBACK1));
282289
}
283290

284291
@Test(expected = IOException.class)

0 commit comments

Comments
 (0)