You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/11/09 22:56:21 UTC
svn commit: r1540414 - in /maven/plugins/trunk/maven-ear-plugin/src/test:
java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
resources/projects/project-055/expected-META-INF/application.xml
Author: rfscholte
Date: Sat Nov 9 21:56:21 2013
New Revision: 1540414
URL: http://svn.apache.org/r1540414
Log:
Force correct order of elements, it seems like XML validation doesn't work.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-055/expected-META-INF/application.xml
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java?rev=1540414&r1=1540413&r2=1540414&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java Sat Nov 9 21:56:21 2013
@@ -19,26 +19,27 @@ package org.apache.maven.plugin.ear.it;
* under the License.
*/
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
import junit.framework.TestCase;
+
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import org.apache.maven.plugin.ear.util.ResourceEntityResolver;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLAssert;
-import org.custommonkey.xmlunit.examples.RecursiveElementNameAndTextQualifier;
import org.xml.sax.helpers.DefaultHandler;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-
/**
* Base class for ear test cases.
*
@@ -383,13 +384,10 @@ public abstract class AbstractEarPluginI
dbf.setValidating( true );
DocumentBuilder docBuilder = dbf.newDocumentBuilder();
docBuilder.setEntityResolver( new ResourceEntityResolver() );
- docBuilder.setErrorHandler( new DefaultHandler() );
+ docBuilder.setErrorHandler( new DefaultHandler() );
- // Make sure that it matches even if the elements are not in
- // the exact same order
final Diff myDiff = new Diff( docBuilder.parse( expectedDeploymentDescriptor ),
docBuilder.parse( actualDeploymentDescriptor ) );
- myDiff.overrideElementQualifier( new RecursiveElementNameAndTextQualifier() );
XMLAssert.assertXMLEqual(
"Wrong deployment descriptor generated for[" + expectedDeploymentDescriptor.getName() + "]",
myDiff, true );
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-055/expected-META-INF/application.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-055/expected-META-INF/application.xml?rev=1540414&r1=1540413&r2=1540414&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-055/expected-META-INF/application.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-055/expected-META-INF/application.xml Sat Nov 9 21:56:21 2013
@@ -23,12 +23,12 @@ under the License.
<application>
<display-name>maven-ear-plugin-test-project-055</display-name>
<module>
- <java>jar-sample-three-with-deps-1.0.jar</java>
+ <java>jar-sample-one-1.0.jar</java>
</module>
<module>
- <java>jar-sample-two-1.0.jar</java>
+ <java>jar-sample-three-with-deps-1.0.jar</java>
</module>
<module>
- <java>jar-sample-one-1.0.jar</java>
+ <java>jar-sample-two-1.0.jar</java>
</module>
</application>
\ No newline at end of file