Author: olamy
Date: Tue Mar 13 10:10:03 2012
New Revision: 1300050
URL: http://svn.apache.org/viewvc?rev=1300050&view=rev
Log:
use xmlunit for xml comparaison test case rather than string comparaison
Modified:
maven/plugins/trunk/maven-shade-plugin/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1300050&r1=1300049&r2=1300050&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Tue Mar 13 10:10:03 2012
@@ -126,6 +126,14 @@ under the License.
<version>3.8.2</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java?rev=1300050&r1=1300049&r2=1300050&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
Tue Mar 13 10:10:03 2012
@@ -19,16 +19,17 @@ package org.apache.maven.plugins.shade.r
* under the License.
*/
-import java.io.IOException;
-import java.util.Collections;
-
import junit.framework.TestCase;
-
import org.codehaus.plexus.util.IOUtil;
+import org.custommonkey.xmlunit.Diff;
+import org.custommonkey.xmlunit.XMLAssert;
+import org.custommonkey.xmlunit.XMLUnit;
+
+import java.util.Collections;
/**
* Test for {@link ComponentsXmlResourceTransformer}.
- *
+ *
* @author Brett Porter
* @version $Id$
*/
@@ -42,14 +43,21 @@ public class ComponentsXmlResourceTransf
this.transformer = new ComponentsXmlResourceTransformer();
}
- public void testConfigurationMerging() throws IOException
+ public void testConfigurationMerging()
+ throws Exception
{
+
+ XMLUnit.setNormalizeWhitespace( true );
+
transformer.processResource( "components-1.xml",
getClass().getResourceAsStream( "/components-1.xml" ),
Collections.EMPTY_LIST );
transformer.processResource( "components-1.xml",
getClass().getResourceAsStream( "/components-2.xml" ),
Collections.EMPTY_LIST );
-
- assertEquals( IOUtil.toString( getClass().getResourceAsStream(
"/components-expected.xml" ), "UTF-8" ),
- IOUtil.toString( transformer.getTransformedResource(),
"UTF-8" ).replaceAll("\r\n", "\n") );
+ Diff diff = XMLUnit.compareXML(
+ IOUtil.toString( getClass().getResourceAsStream(
"/components-expected.xml" ), "UTF-8" ),
+ IOUtil.toString( transformer.getTransformedResource(), "UTF-8" ) );
+ //assertEquals( IOUtil.toString( getClass().getResourceAsStream(
"/components-expected.xml" ), "UTF-8" ),
+ // IOUtil.toString( transformer.getTransformedResource(),
"UTF-8" ).replaceAll("\r\n", "\n") );
+ XMLAssert.assertXMLIdentical( diff, true );
}
}
\ No newline at end of file
