diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-01-09 10:42:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-09 10:42:30 +0100 |
commit | 46d808803c2bf8bb974cdf3d38ef6ceab4fc95f7 (patch) | |
tree | 2cef36d25946bc04f067ad1da3a51c7af0263e23 /vespa-http-client/src | |
parent | 9d8d631be0c4c4ad01036442bb005830eb0c77c6 (diff) | |
parent | 324d166fcfd519b361e091ba460a2250c4615b65 (diff) |
Merge pull request #11701 from vespa-engine/revert-11693-revert-11681-bjorncs/apache-commons-libraries-cleanup
Reapply "Bjorncs/apache commons libraries cleanup""
Diffstat (limited to 'vespa-http-client/src')
-rw-r--r-- | vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/XmlFeedReaderTest.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/XmlFeedReaderTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/XmlFeedReaderTest.java index 9abbf916cff..925f3105878 100644 --- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/XmlFeedReaderTest.java +++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/XmlFeedReaderTest.java @@ -1,8 +1,9 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.http.client.core; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.yahoo.vespa.http.client.FeedClient; -import org.apache.commons.lang3.StringEscapeUtils; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -17,7 +18,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.mockito.ArgumentMatchers.any; @@ -32,6 +32,8 @@ public class XmlFeedReaderTest { private final static String feedResource3 = "/xml-challenge2.xml"; private final static String feedResource4 = "/xml-challenge3.xml"; + private static final XmlMapper xmlMapper = new XmlMapper(); + private final String updateDocUpdate = "<?xml version=\"1.0\"?>\n" + "<vespafeed>\n" + @@ -232,13 +234,9 @@ public class XmlFeedReaderTest { InputStream inputStream2 = XmlFeedReaderTest.class.getResourceAsStream(filename); String rawXML = new java.util.Scanner(inputStream2, "UTF-8").useDelimiter("\\A").next(); - String rawDoc = rawXML.toString().split("<document")[1].split("</document>")[0]; - assertThat(rawDoc.length() > 30, is(true)); - - String decodedRawXml = StringEscapeUtils.unescapeXml(rawDoc); - String decodedDoc = StringEscapeUtils.unescapeXml(document); - - assertThat(decodedDoc, containsString(decodedRawXml)); + JsonNode decodedDocument = xmlMapper.readTree(document); + JsonNode rawDocuments = xmlMapper.readTree(rawXML); + assertThat(decodedDocument, is(rawDocuments.get("document"))); } @Test public void testCData() throws Exception { |