You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/08/16 19:30:35 UTC
svn commit: r1696157 - in /webservices/axiom/trunk:
axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/
axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/
systests/integration-tests/src/test/java/org/apache/axiom/om/
systests/old-tests/s...
Author: veithen
Date: Sun Aug 16 17:30:34 2015
New Revision: 1696157
URL: http://svn.apache.org/r1696157
Log:
Simplify the xml-truth API.
Modified:
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java
webservices/axiom/trunk/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultJAXBTest.java
webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java
webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultXMLBeansTest.java
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/NamespaceTest.java
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/SpacesTest.java
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/util/stax/WrappedTextNodeStreamReaderTest.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOM.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromSAXSource.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetSAXResult.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsumeWithIncompleteDescendant.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeMultiple.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDetachWithDifferentBuilder.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardPartiallyBuilt.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransform.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterLastChild.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDetach.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeOMDataSourceWritingToOutputStream.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java
webservices/axiom/trunk/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java
webservices/axiom/trunk/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLTruth.java
webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/DOMCompareTest.java
webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java Sun Aug 16 17:30:34 2015
@@ -69,9 +69,7 @@ public class StreamingOMSerializerTest e
InputSource actual = new InputSource();
actual.setByteStream(new ByteArrayInputStream(out.toByteArray()));
actual.setSystemId(file.getUrl().toString());
- assertAbout(xml())
- .that(xml(actual))
- .hasSameContentAs(xml(file.getUrl()));
+ assertAbout(xml()).that(actual).hasSameContentAs(file.getUrl());
}
public static TestSuite suite() throws Exception {
Modified: webservices/axiom/trunk/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java (original)
+++ webservices/axiom/trunk/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java Sun Aug 16 17:30:34 2015
@@ -61,10 +61,10 @@ public class StreamSourceToOMResultTest
actual.setByteStream(new ByteArrayInputStream(out.toByteArray()));
actual.setSystemId(file.getUrl().toString());
assertAbout(xml())
- .that(xml(actual))
+ .that(actual)
.ignoringWhitespaceInPrologAndEpilog()
.expandingEntityReferences()
- .hasSameContentAs(xml(file.getUrl()));
+ .hasSameContentAs(file.getUrl());
}
public static TestSuite suite() {
Modified: webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultJAXBTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultJAXBTest.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultJAXBTest.java (original)
+++ webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultJAXBTest.java Sun Aug 16 17:30:34 2015
@@ -58,8 +58,6 @@ public class SAXResultJAXBTest {
OMDocument document = OMAbstractFactory.getOMFactory().createOMDocument();
marshaller.marshal(order, document.getSAXResult().getHandler());
- assertAbout(xml())
- .that(xml(document))
- .hasSameContentAs(xml(out.toString()));
+ assertAbout(xml()).that(document).hasSameContentAs(out.toString());
}
}
Modified: webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java (original)
+++ webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java Sun Aug 16 17:30:34 2015
@@ -66,10 +66,10 @@ public class SAXResultSAXParserTest exte
actual.setByteStream(new ByteArrayInputStream(baos.toByteArray()));
actual.setSystemId(file.getUrl().toString());
assertAbout(xml())
- .that(xml(actual))
+ .that(actual)
.ignoringWhitespaceInPrologAndEpilog()
.expandingEntityReferences()
- .hasSameContentAs(xml(file.getUrl()));
+ .hasSameContentAs(file.getUrl());
}
private static void addTests(TestSuite suite, SAXParserFactory factory, String name) throws Exception {
Modified: webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultXMLBeansTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultXMLBeansTest.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultXMLBeansTest.java (original)
+++ webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultXMLBeansTest.java Sun Aug 16 17:30:34 2015
@@ -55,8 +55,6 @@ public class SAXResultXMLBeansTest {
ContentHandler handler = omDocument.getSAXResult().getHandler();
document.save(handler, (LexicalHandler)handler);
- assertAbout(xml())
- .that(xml(omDocument))
- .hasSameContentAs(xml(out.toString()));
+ assertAbout(xml()).that(omDocument).hasSameContentAs(out.toString());
}
}
Modified: webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/NamespaceTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/NamespaceTest.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/NamespaceTest.java (original)
+++ webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/NamespaceTest.java Sun Aug 16 17:30:34 2015
@@ -128,9 +128,9 @@ public class NamespaceTest extends TestC
.getDocumentElement();
String actualXML = documentElement.toString();
assertAbout(xml())
- .that(xml(actualXML))
+ .that(actualXML)
.ignoringRedundantNamespaceDeclarations()
- .hasSameContentAs(xml(xml));
+ .hasSameContentAs(xml);
documentElement.close(false);
} catch (Exception e) {
e.printStackTrace();
@@ -169,10 +169,7 @@ public class NamespaceTest extends TestC
String result = personElem.toString();
-
- assertAbout(xml())
- .that(xml(result))
- .hasSameContentAs(xml(expectedString));
+ assertAbout(xml()).that(result).hasSameContentAs(expectedString);
}
/**
@@ -200,9 +197,7 @@ public class NamespaceTest extends TestC
personElem.addChild(ageElem);
personElem.addChild(weightElem);
- assertAbout(xml())
- .that(xml(personElem.toString()))
- .hasSameContentAs(xml(expectedXML));
+ assertAbout(xml()).that(personElem.toString()).hasSameContentAs(expectedXML);
}
public void testOMElementSerialize() throws Exception {
Modified: webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/SpacesTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/SpacesTest.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/SpacesTest.java (original)
+++ webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/SpacesTest.java Sun Aug 16 17:30:34 2015
@@ -63,9 +63,7 @@ public class SpacesTest extends Abstract
Document dom1 = newDocument(new InputSource(getTestResource(file)));
Document dom2 = newDocument(resultXML);
- assertAbout(xml())
- .that(xml(dom2))
- .hasSameContentAs(xml(dom1));
+ assertAbout(xml()).that(dom2).hasSameContentAs(dom1);
rootElement.close(false);
}
Modified: webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java (original)
+++ webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java Sun Aug 16 17:30:34 2015
@@ -67,8 +67,8 @@ public class CharacterEncoding2Test exte
envelope.serialize(byteOutStr, outputFormat);
assertAbout(xml())
- .that(xml(new InputStreamReader(new ByteArrayInputStream(byteOutStr.toByteArray()),"iso-8859-1")))
- .hasSameContentAs(xml(new InputStreamReader(new ByteArrayInputStream(xml.getBytes("iso-8859-1")),"iso-8859-1")));
+ .that(new InputStreamReader(new ByteArrayInputStream(byteOutStr.toByteArray()),"iso-8859-1"))
+ .hasSameContentAs(new InputStreamReader(new ByteArrayInputStream(xml.getBytes("iso-8859-1")),"iso-8859-1"));
builder.close();
}
Modified: webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/util/stax/WrappedTextNodeStreamReaderTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/util/stax/WrappedTextNodeStreamReaderTest.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/util/stax/WrappedTextNodeStreamReaderTest.java (original)
+++ webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/util/stax/WrappedTextNodeStreamReaderTest.java Sun Aug 16 17:30:34 2015
@@ -100,8 +100,8 @@ public class WrappedTextNodeStreamReader
new StreamingOMSerializer().serialize(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.flush();
assertAbout(xml())
- .that(xml(writer.toString()))
- .hasSameContentAs(xml(expectedXML));
+ .that(writer.toString())
+ .hasSameContentAs(expectedXML);
}
public void testShortStringUsingSerializer() throws Exception {
@@ -146,8 +146,8 @@ public class WrappedTextNodeStreamReader
StringWriter writer = new StringWriter();
element.serializeAndConsume(writer);
assertAbout(xml())
- .that(xml(writer.toString()))
- .hasSameContentAs(xml(expectedXML));
+ .that(writer.toString())
+ .hasSameContentAs(expectedXML);
}
public void testShortStringUsingSerializeAndConsume() throws Exception {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOM.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOM.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOM.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOM.java Sun Aug 16 17:30:34 2015
@@ -69,9 +69,9 @@ public class TestCreateOMBuilderFromDOM
actual.setByteStream(new ByteArrayInputStream(baos.toByteArray()));
actual.setSystemId(file.getUrl().toString());
assertAbout(xml())
- .that(xml(actual))
+ .that(actual)
.ignoringWhitespaceInPrologAndEpilog()
.expandingEntityReferences(expandEntityReferences == null ? false : expandEntityReferences.booleanValue())
- .hasSameContentAs(xml(file.getUrl()));
+ .hasSameContentAs(file.getUrl());
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromSAXSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromSAXSource.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromSAXSource.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromSAXSource.java Sun Aug 16 17:30:34 2015
@@ -66,9 +66,9 @@ public class TestCreateOMBuilderFromSAXS
actual.setByteStream(new ByteArrayInputStream(baos.toByteArray()));
actual.setSystemId(file.getUrl().toString());
assertAbout(xml())
- .that(xml(actual))
+ .that(actual)
.ignoringWhitespaceInPrologAndEpilog()
.expandingEntityReferences(expandEntityReferences == null ? false : expandEntityReferences.booleanValue())
- .hasSameContentAs(xml(file.getUrl()));
+ .hasSameContentAs(file.getUrl());
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java Sun Aug 16 17:30:34 2015
@@ -73,7 +73,7 @@ public class TestGetDocumentElement exte
}
assertAbout(xml())
.that(xml(OMElement.class, newParent))
- .hasSameContentAs(xml("<newParent><root/></newParent>"));
+ .hasSameContentAs("<newParent><root/></newParent>");
assertTrue(element.isComplete());
// Since we discarded the document, the nodes in the epilog will not be accessible.
// Therefore we expect that when the document element changes its completion status,
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java Sun Aug 16 17:30:34 2015
@@ -65,9 +65,9 @@ public class TestSerialize extends Confo
InputSource actualIS = actual.getInputSource();
actualIS.setSystemId(systemId);
assertAbout(xml())
- .that(xml(actualIS))
+ .that(actualIS)
.ignoringElementContentWhitespace() // TODO: shouldn't be necessary
- .hasSameContentAs(xml(control[0]));
+ .hasSameContentAs(control[0]);
} catch (Throwable ex) {
System.out.println("Control:");
dumpInputSource(control[1]);
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetSAXResult.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetSAXResult.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetSAXResult.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestGetSAXResult.java Sun Aug 16 17:30:34 2015
@@ -52,6 +52,6 @@ public class TestGetSAXResult extends Co
.ignoringWhitespaceInPrologAndEpilog()
.ignoringRedundantNamespaceDeclarations()
.expandingEntityReferences()
- .hasSameContentAs(xml(file.getUrl()));
+ .hasSameContentAs(file.getUrl());
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java Sun Aug 16 17:30:34 2015
@@ -82,6 +82,6 @@ public class TestRemoveChildren extends
document.addChild(factory.createOMElement("newroot", null));
assertAbout(xml())
.that(xml(OMDocument.class, document))
- .hasSameContentAs(xml("<newroot/>"));
+ .hasSameContentAs("<newroot/>");
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsumeWithIncompleteDescendant.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsumeWithIncompleteDescendant.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsumeWithIncompleteDescendant.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsumeWithIncompleteDescendant.java Sun Aug 16 17:30:34 2015
@@ -53,8 +53,8 @@ public class TestSerializeAndConsumeWith
StringWriter out = new StringWriter();
document.serializeAndConsume(out);
assertAbout(xml())
- .that(xml(out.toString()))
- .hasSameContentAs(xml("<root><elem>text</elem></root>"));
+ .that(out.toString())
+ .hasSameContentAs("<root><elem>text</elem></root>");
assertConsumed(incompleteElement);
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeMultiple.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeMultiple.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeMultiple.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeMultiple.java Sun Aug 16 17:30:34 2015
@@ -58,6 +58,6 @@ public class TestAddAttributeMultiple ex
assertAbout(xml())
.that(xml(OMElement.class, omElement))
- .hasSameContentAs(xml(expectedXML));
+ .hasSameContentAs(expectedXML);
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDetachWithDifferentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDetachWithDifferentBuilder.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDetachWithDifferentBuilder.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDetachWithDifferentBuilder.java Sun Aug 16 17:30:34 2015
@@ -46,7 +46,7 @@ public class TestDetachWithDifferentBuil
// builder.
child.detach();
ASSERT.that(child.isComplete()).isFalse();
- ASSERT.about(xml()).that(xml(OMElement.class, parent)).hasSameContentAs(xml(xml1));
- ASSERT.about(xml()).that(xml(OMElement.class, child)).hasSameContentAs(xml(xml2));
+ ASSERT.about(xml()).that(xml(OMElement.class, parent)).hasSameContentAs(xml1);
+ ASSERT.about(xml()).that(xml(OMElement.class, child)).hasSameContentAs(xml2);
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardPartiallyBuilt.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardPartiallyBuilt.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardPartiallyBuilt.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardPartiallyBuilt.java Sun Aug 16 17:30:34 2015
@@ -55,7 +55,7 @@ public class TestDiscardPartiallyBuilt e
element.discard();
assertAbout(xml())
.that(xml(OMElement.class, root))
- .hasSameContentAs(xml("<root><sibling/></root>"));
+ .hasSameContentAs("<root><sibling/></root>");
// Force the builder to complete the document. If the discard method didn't adjust the
// element depth correctly, then an exception will occur here
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransform.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransform.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransform.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransform.java Sun Aug 16 17:30:34 2015
@@ -60,7 +60,7 @@ public class TestGetSAXSourceIdentityTra
assertAbout(xml())
.that(xml(OMDocument.class, outputDocument))
.ignoringWhitespaceInPrologAndEpilog()
- .hasSameContentAs(xml(getInput()));
+ .hasSameContentAs(getInput());
element.close(false);
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java Sun Aug 16 17:30:34 2015
@@ -67,6 +67,6 @@ public class TestRemoveChildren extends
element.addChild(factory.createOMElement("c", null));
assertAbout(xml())
.that(xml(OMElement.class, element))
- .hasSameContentAs(xml("<root><c/></root>"));
+ .hasSameContentAs("<root><c/></root>");
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterLastChild.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterLastChild.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterLastChild.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterLastChild.java Sun Aug 16 17:30:34 2015
@@ -54,7 +54,7 @@ public class TestInsertSiblingAfterLastC
assertAbout(xml())
.that(xml(OMElement.class, parent))
.ignoringRedundantNamespaceDeclarations()
- .hasSameContentAs(xml("<ns:parent xmlns:ns=\"http://www.testuri.com\">" +
- "<ns:c1 /><ns:c2 /><ns:c3 /></ns:parent>"));
+ .hasSameContentAs("<ns:parent xmlns:ns=\"http://www.testuri.com\">" +
+ "<ns:c1 /><ns:c2 /><ns:c3 /></ns:parent>");
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDetach.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDetach.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDetach.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDetach.java Sun Aug 16 17:30:34 2015
@@ -56,7 +56,7 @@ public class TestDetach extends AxiomTes
omse.detach();
ASSERT.that(ds.hasUnclosedReaders()).isEqualTo(expansionStrategy == PARTIAL);
ASSERT.that(ds.getReaderRequestCount()).isEqualTo(expansionStrategy == DONT_EXPAND ? 0 : 1);
- ASSERT.about(xml()).that(xml(parent)).hasSameContentAs(xml(xml1));
- ASSERT.about(xml()).that(xml(omse)).hasSameContentAs(xml(xml2));
+ ASSERT.about(xml()).that(parent).hasSameContentAs(xml1);
+ ASSERT.about(xml()).that(omse).hasSameContentAs(xml2);
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java Sun Aug 16 17:30:34 2015
@@ -121,8 +121,8 @@ public class TestSerialize extends Axiom
expectedXML = elementContext.getControl(expectedXML);
}
assertAbout(xml())
- .that(xml(result.getInputSource()))
- .hasSameContentAs(xml(expectedXML));
+ .that(result.getInputSource())
+ .hasSameContentAs(expectedXML);
// If the underlying OMDataSource is non destructive, the expansion status should not have been
// changed during serialization. If it is destructive and caching is enabled, then
// the sourced element should be expanded.
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeOMDataSourceWritingToOutputStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeOMDataSourceWritingToOutputStream.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeOMDataSourceWritingToOutputStream.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeOMDataSourceWritingToOutputStream.java Sun Aug 16 17:30:34 2015
@@ -109,10 +109,10 @@ public class TestSerializeOMDataSourceWr
elementToSerialize = element;
}
assertAbout(xml())
- .that(xml(serializationStrategy.serialize(elementToSerialize).getInputSource()))
- .hasSameContentAs(xml(serializeParent
+ .that(serializationStrategy.serialize(elementToSerialize).getInputSource())
+ .hasSameContentAs(serializeParent
? "<root><test xmlns='urn:test'/></root>"
- : "<test xmlns='urn:test'/>"));
+ : "<test xmlns='urn:test'/>");
assertThat(ds.isOutputStreamUsed()).isEqualTo(serializationStrategy instanceof SerializeToOutputStream);
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java Sun Aug 16 17:30:34 2015
@@ -54,7 +54,7 @@ public class TestSetLocalName extends Ax
}
element.setLocalName("newroot");
assertAbout(xml())
- .that(xml(element.toString()))
- .hasSameContentAs(xml("<p:newroot xmlns:p='urn:test'><child/></p:newroot>"));
+ .that(element.toString())
+ .hasSameContentAs("<p:newroot xmlns:p='urn:test'><child/></p:newroot>");
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayload.java Sun Aug 16 17:30:34 2015
@@ -59,9 +59,9 @@ public class TestRegisterCustomBuilderFo
InputSource is = new InputSource(new ByteArrayInputStream(byteArray.bytes));
is.setEncoding(byteArray.encoding);
assertAbout(xml())
- .that(xml(is))
+ .that(is)
.ignoringNamespaceDeclarations()
- .hasSameContentAs(xml(message.getPayloadInputSource()));
+ .hasSameContentAs(message.getPayloadInputSource());
}
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java Sun Aug 16 17:30:34 2015
@@ -53,8 +53,8 @@ public abstract class CloneTestCase exte
identityCheck(sourceEnv, targetEnv, "");
assertAbout(xml())
- .that(xml(targetEnv.toString()))
- .hasSameContentAs(xml(sourceEnv.toString()));
+ .that(targetEnv.toString())
+ .hasSameContentAs(sourceEnv.toString());
sourceEnv.close(false);
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java Sun Aug 16 17:30:34 2015
@@ -50,10 +50,10 @@ public class TestSerialize extends Axiom
message.getInputStream(), null).getSOAPEnvelope();
expansionStrategy.apply(soapEnvelope);
assertAbout(xml())
- .that(xml(serializationStrategy.serialize(soapEnvelope).getInputSource()))
+ .that(serializationStrategy.serialize(soapEnvelope).getInputSource())
.ignoringRedundantNamespaceDeclarations()
.ignoringPrologAndEpilog()
- .hasSameContentAs(xml(message.getInputStream()));
+ .hasSameContentAs(message.getInputStream());
soapEnvelope.close(false);
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSerialize.java Sun Aug 16 17:30:34 2015
@@ -50,10 +50,10 @@ public class TestSerialize extends Axiom
message.getInputStream(), null).getSOAPMessage();
expansionStrategy.apply(soapMessage);
assertAbout(xml())
- .that(xml(serializationStrategy.serialize(soapMessage).getInputSource()))
+ .that(serializationStrategy.serialize(soapMessage).getInputSource())
.ignoringRedundantNamespaceDeclarations()
.ignoringPrologAndEpilog() // TODO: why???
- .hasSameContentAs(xml(message.getInputStream()));
+ .hasSameContentAs(message.getInputStream());
soapMessage.close(false);
}
}
Modified: webservices/axiom/trunk/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java (original)
+++ webservices/axiom/trunk/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java Sun Aug 16 17:30:34 2015
@@ -30,7 +30,8 @@ import javax.xml.namespace.QName;
import com.google.common.truth.FailureStrategy;
import com.google.common.truth.Subject;
-public final class XMLSubject extends Subject<XMLSubject,XML> {
+public final class XMLSubject extends Subject<XMLSubject,Object> {
+ private final XML xml;
private final Set<Event> ignoredEvents = new HashSet<Event>();
private boolean ignoreWhitespace;
private boolean ignoreWhitespaceInPrologAndEpilog;
@@ -41,8 +42,9 @@ public final class XMLSubject extends Su
private boolean expandEntityReferences;
private boolean treatWhitespaceAsText;
- XMLSubject(FailureStrategy failureStrategy, XML subject) {
+ XMLSubject(FailureStrategy failureStrategy, Object subject) {
super(failureStrategy, subject);
+ xml = XMLTruth.xml(subject);
}
public XMLSubject ignoringComments() {
@@ -200,10 +202,10 @@ public final class XMLSubject extends Su
return result;
}
- public void hasSameContentAs(XML other) {
+ public void hasSameContentAs(Object other) {
try {
- Traverser actual = createTraverser(getSubject());
- Traverser expected = createTraverser(other);
+ Traverser actual = createTraverser(xml);
+ Traverser expected = createTraverser(XMLTruth.xml(other));
while (true) {
Event actualEvent = actual.next();
Event expectedEvent = expected.next();
Modified: webservices/axiom/trunk/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLTruth.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLTruth.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLTruth.java (original)
+++ webservices/axiom/trunk/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLTruth.java Sun Aug 16 17:30:34 2015
@@ -40,9 +40,9 @@ import com.google.common.truth.FailureSt
import com.google.common.truth.SubjectFactory;
public final class XMLTruth {
- private static final SubjectFactory<XMLSubject,XML> SUBJECT_FACTORY = new SubjectFactory<XMLSubject,XML>() {
+ private static final SubjectFactory<XMLSubject,Object> SUBJECT_FACTORY = new SubjectFactory<XMLSubject,Object>() {
@Override
- public XMLSubject getSubject(FailureStrategy fs, XML that) {
+ public XMLSubject getSubject(FailureStrategy fs, Object that) {
return new XMLSubject(fs, that);
}
@@ -52,6 +52,17 @@ public final class XMLTruth {
static {
factories = new ArrayList<>();
+ factories.add(new XMLFactory<XML>() {
+ @Override
+ public Class<XML> getExpectedType() {
+ return XML.class;
+ }
+
+ @Override
+ public XML createXML(XML xml) {
+ return xml;
+ }
+ });
factories.add(new XMLFactory<InputStream>() {
@Override
public Class<InputStream> getExpectedType() {
@@ -179,7 +190,7 @@ public final class XMLTruth {
private XMLTruth() {}
- public static SubjectFactory<XMLSubject,XML> xml() {
+ public static SubjectFactory<XMLSubject,Object> xml() {
return SUBJECT_FACTORY;
}
@@ -202,7 +213,7 @@ public final class XMLTruth {
}
}
- public static XML xml(Object object) {
+ static XML xml(Object object) {
return xml((Class<Object>)null, object);
}
Modified: webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/DOMCompareTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/DOMCompareTest.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/DOMCompareTest.java (original)
+++ webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/DOMCompareTest.java Sun Aug 16 17:30:34 2015
@@ -49,10 +49,10 @@ public class DOMCompareTest extends Matr
// If necessary, let DOMTraverser expand entity references
factory.setExpandEntityReferences(false);
assertAbout(xml())
- .that(xml(factory.newDocumentBuilder().parse(sample.getUrl().toString())))
+ .that(factory.newDocumentBuilder().parse(sample.getUrl().toString()))
.ignoringWhitespaceInPrologAndEpilog()
.expandingEntityReferences(expandEntityReferences)
- .hasSameContentAs(xml(sample.getUrl()));
+ .hasSameContentAs(sample.getUrl());
}
public static TestSuite suite() {
Modified: webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java?rev=1696157&r1=1696156&r2=1696157&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java (original)
+++ webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java Sun Aug 16 17:30:34 2015
@@ -27,16 +27,16 @@ public class XMLSubjectTest {
@Test
public void testIgnoringRedundantNamespaceDeclarations1() {
assertAbout(xml())
- .that(xml("<a xmlns:p='#1' xmlns=''><b xmlns:p='#1'/></a>"))
+ .that("<a xmlns:p='#1' xmlns=''><b xmlns:p='#1'/></a>")
.ignoringRedundantNamespaceDeclarations()
- .hasSameContentAs(xml("<a xmlns:p='#1'><b/></a>"));
+ .hasSameContentAs("<a xmlns:p='#1'><b/></a>");
}
@Test(expected=AssertionError.class)
public void testIgnoringRedundantNamespaceDeclarations2() {
assertAbout(xml())
- .that(xml("<a xmlns:p='#1'><b xmlns:p='#2'/></a>"))
+ .that("<a xmlns:p='#1'><b xmlns:p='#2'/></a>")
.ignoringRedundantNamespaceDeclarations()
- .hasSameContentAs(xml("<a xmlns:p='#1'><b/></a>"));
+ .hasSameContentAs("<a xmlns:p='#1'><b/></a>");
}
}