You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by es...@apache.org on 2008/03/02 05:25:27 UTC
svn commit: r632711 - in /portals/pluto/trunk: ./
pluto-util/src/test/java/org/apache/pluto/util/assemble/
pluto-util/src/test/java/org/apache/pluto/util/assemble/file/
pluto-util/src/test/resources/org/apache/pluto/util/assemble/
Author: esm
Date: Sat Mar 1 20:25:27 2008
New Revision: 632711
URL: http://svn.apache.org/viewvc?rev=632711&view=rev
Log:
[PLUTO-360]: Upgrade to XMLUnit 1.1. Supplied custom entity resolver to FileAssemblerTest which reads the DTD of the local file system. (merged from pluto-1.1.x r632710)
Added:
portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ResourceEntityResolver.java
- copied unchanged from r632710, portals/pluto/branches/pluto-1.1.x/pluto-util/src/test/java/org/apache/pluto/util/assemble/ResourceEntityResolver.java
portals/pluto/trunk/pluto-util/src/test/resources/org/apache/pluto/util/assemble/web-app_2_3.dtd
- copied unchanged from r632710, portals/pluto/branches/pluto-1.1.x/pluto-util/src/test/resources/org/apache/pluto/util/assemble/web-app_2_3.dtd
Modified:
portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java?rev=632711&r1=632710&r2=632711&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java (original)
+++ portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java Sat Mar 1 20:25:27 2008
@@ -16,15 +16,16 @@
*/
package org.apache.pluto.util.assemble.file;
-import java.io.File;
-import java.io.FileReader;
-import java.net.URL;
-
import org.apache.commons.io.FileUtils;
import org.apache.pluto.util.assemble.AssemblerConfig;
+import org.apache.pluto.util.assemble.ResourceEntityResolver;
import org.custommonkey.xmlunit.XMLTestCase;
import org.custommonkey.xmlunit.XMLUnit;
+import java.io.File;
+import java.io.FileReader;
+import java.net.URL;
+
/**
* @version $Revision$
*/
@@ -36,6 +37,8 @@
protected void setUp() throws Exception {
XMLUnit.setIgnoreWhitespace(true);
+ XMLUnit.setControlEntityResolver( new ResourceEntityResolver() );
+ XMLUnit.setTestEntityResolver( new ResourceEntityResolver() );
final URL webXmlUrl = this.getClass().getResource("/org/apache/pluto/util/assemble/file/web.xml");
this.webXmlFile = new File(webXmlUrl.getFile());
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=632711&r1=632710&r2=632711&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Sat Mar 1 20:25:27 2008
@@ -255,7 +255,7 @@
<junit.version>4.0</junit.version>
<jmock.version>1.2.0</jmock.version>
<commons-io.version>1.3.1</commons-io.version>
- <xmlunit.version>1.0</xmlunit.version>
+ <xmlunit.version>1.1</xmlunit.version>
<activation.version>1.1</activation.version>
<ccpp-api.version>1.0</ccpp-api.version>
<ccpp-ri.version>1.0</ccpp-ri.version>