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 2016/02/18 20:38:14 UTC
svn commit: r1731128 - in /webservices/axiom/branches/maven-site-plugin-3.5:
./ testing/xml-truth/src/site/markdown/index.md.vm
testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
Author: veithen
Date: Thu Feb 18 19:38:13 2016
New Revision: 1731128
URL: http://svn.apache.org/viewvc?rev=1731128&view=rev
Log:
Revert r1721603 (i.e. reapply r1716530).
Modified:
webservices/axiom/branches/maven-site-plugin-3.5/ (props changed)
webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-truth/src/site/markdown/index.md.vm
webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
Propchange: webservices/axiom/branches/maven-site-plugin-3.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 18 19:38:13 2016
@@ -8,6 +8,7 @@
/webservices/axiom/branches/CHECK_PARENT_BUG:1338398-1338886
/webservices/axiom/branches/CLONE:1337822-1339011
/webservices/axiom/branches/CLONE_NODE:1346607-1353106
+/webservices/axiom/branches/DOXIA-492:1715574-1716528
/webservices/axiom/branches/JAXB2_DS:1366463-1367737
/webservices/axiom/branches/attrs-aspects:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
Modified: webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-truth/src/site/markdown/index.md.vm
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-truth/src/site/markdown/index.md.vm?rev=1731128&r1=1731127&r2=1731128&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-truth/src/site/markdown/index.md.vm (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-truth/src/site/markdown/index.md.vm Thu Feb 18 19:38:13 2016
@@ -49,8 +49,4 @@ By default, comparison is strict. E.g. t
To control how the comparison is performed, use the relevant methods on the
[`XMLSubject`](apidocs/org/apache/axiom/truth/xml/XMLSubject.html) object returned by `that()`:
- assertAbout(xml())
- .that("<p:a xmlns:p='urn:ns'/>")
- .ignoringNamespacePrefixes()
- .ignoringNamespaceDeclarations()
- .hasSameContentAs("<a xmlns='urn:ns'/>");
+<!-- MACRO{snippet|id=sample|file=${project.basedir}/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java} -->
Modified: webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java?rev=1731128&r1=1731127&r2=1731128&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java Thu Feb 18 19:38:13 2016
@@ -42,11 +42,13 @@ public class XMLSubjectTest {
@Test
public void testIgnoringNamespaceDeclarationsAndPrefixes() {
+ // START SNIPPET: sample
assertAbout(xml())
.that("<p:a xmlns:p='urn:ns'/>")
.ignoringNamespacePrefixes()
.ignoringNamespaceDeclarations()
.hasSameContentAs("<a xmlns='urn:ns'/>");
+ // END SNIPPET: sample
}
@Test