Author: baerrach
Date: Sat Oct 4 03:19:59 2008
New Revision: 701627
URL: http://svn.apache.org/viewvc?rev=701627&view=rev
Log:
Changed to XmlUnit check.
echoxml has a defect in the <?xml header added by ant only uses a unix newline,
not a system dependent newline.
Modified:
maven/plugins/trunk/maven-antrun-plugin/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh
Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=701627&r1=701626&r2=701627&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Sat Oct 4 03:19:59 2008
@@ -113,6 +113,20 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh?rev=701627&r1=701626&r2=701627&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh
(original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh
Sat Oct 4 03:19:59 2008
@@ -1,14 +1,13 @@
import java.io.*;
-import java.util.*;
-import java.util.regex.*;
-
-import org.codehaus.plexus.util.*;
-
+import org.custommonkey.xmlunit.*;
try
{
File actual = new File( basedir, "echo.xml" );
File expected = new File( basedir, "echo.xml.expected" );
- return FileUtils.contentEquals(expected, actual);
+ FileReader actualReader = new FileReader(actual);
+ FileReader expectedReader = new FileReader(expected);
+ XMLAssert.assertXMLEqual(expectedReader, actualReader);
+ return true;
}
catch( Throwable t )
{
