From 748919d770fa5d4b6bd70a9f781797d71d236f7b Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Wed, 14 Jun 2023 23:38:59 +0200 Subject: [PATCH] #3673 - Update dependencies - DKPro Core 2.3.1 -> 2.4.0 - RDf4J 4.2.3 -> 4.3.2 --- .../io/html/dkprocore/HtmlDocumentReaderTest.java | 5 ----- .../kb/querybuilder/SPARQLQueryBuilderTest.java | 8 ++++++-- inception/pom.xml | 10 +++++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/inception/inception-io-html/src/test/java/de/tudarmstadt/ukp/inception/io/html/dkprocore/HtmlDocumentReaderTest.java b/inception/inception-io-html/src/test/java/de/tudarmstadt/ukp/inception/io/html/dkprocore/HtmlDocumentReaderTest.java index c202d6c3803..6cb03794996 100644 --- a/inception/inception-io-html/src/test/java/de/tudarmstadt/ukp/inception/io/html/dkprocore/HtmlDocumentReaderTest.java +++ b/inception/inception-io-html/src/test/java/de/tudarmstadt/ukp/inception/io/html/dkprocore/HtmlDocumentReaderTest.java @@ -32,9 +32,7 @@ import org.apache.uima.jcas.JCas; import org.custommonkey.xmlunit.XMLAssert; import org.dkpro.core.io.xmi.XmiWriter; -import org.dkpro.core.testing.DkproTestContext; import org.dkpro.core.testing.TestOptions; -import org.junit.Rule; import org.junit.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -153,7 +151,4 @@ private void assertXmlEquals(File expected, File actual) throw new RuntimeException(e); } } - - @Rule - public DkproTestContext testContext = new DkproTestContext(); } diff --git a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilderTest.java b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilderTest.java index bf11e01a981..992c77d08ff 100644 --- a/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilderTest.java +++ b/inception/inception-kb/src/test/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilderTest.java @@ -48,6 +48,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.function.FailableBiConsumer; import org.apache.commons.lang3.tuple.Pair; +import org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration; import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.eclipse.rdf4j.model.vocabulary.OWL; import org.eclipse.rdf4j.model.vocabulary.RDF; @@ -514,8 +515,11 @@ static void thatMatchingAgainstAdditionalSearchPropertiesWorks2(Repository aRepo queryPair.getValue().forEach(v -> expectedKBHandle.addMatchTerm(v, null)); assertThat(results) // - .usingRecursiveFieldByFieldElementComparatorOnFields("identifier", "name", - "matchTerms") // + .usingRecursiveFieldByFieldElementComparator( + RecursiveComparisonConfiguration.builder() // + .withComparedFields("identifier", "name", "matchTerms") // + .withIgnoredCollectionOrderInFields("matchTerms") // + .build()) .containsExactlyInAnyOrder(expectedKBHandle); } } diff --git a/inception/pom.xml b/inception/pom.xml index de7031750d0..baae179b679 100644 --- a/inception/pom.xml +++ b/inception/pom.xml @@ -61,15 +61,15 @@ ${session.executionRootDirectory}/cache/dkpro-core-datasets slow - 5.9.2 - 1.9.2 + 5.9.3 + 1.9.3 4.11.0 3.24.2 4.2.0 1.6 - 2.3.1 + 2.4.0 3.4.1 3.4.0 0.5.0 @@ -124,8 +124,8 @@ - 4.2.3 - + 4.3.2 + 4.6.1