You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/01/25 14:40:42 UTC
svn commit: r737509 - in
/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it:
AbstractEarPluginIT.java EarMojoIT.java
Author: bentmann
Date: Sun Jan 25 13:40:41 2009
New Revision: 737509
URL: http://svn.apache.org/viewvc?rev=737509&view=rev
Log:
o Stabilized tests
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/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
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=737509&r1=737508&r2=737509&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 Sun Jan 25 13:40:41 2009
@@ -23,14 +23,15 @@
import org.apache.maven.it.Verifier;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.util.ResourceExtractor;
+import org.codehaus.plexus.util.ReaderFactory;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.examples.RecursiveElementNameAndTextQualifier;
import java.io.File;
-import java.io.FileReader;
import java.io.FilenameFilter;
import java.io.IOException;
+import java.io.Reader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -384,12 +385,12 @@
assertEquals( "File name mismatch", expectedDeploymentDescriptor.getName(),
actualDeploymentDescriptor.getName() );
- FileReader expected = null;
- FileReader actual = null;
+ Reader expected = null;
+ Reader actual = null;
try
{
- expected = new FileReader( expectedDeploymentDescriptor );
- actual = new FileReader( actualDeploymentDescriptor );
+ expected = ReaderFactory.newXmlReader( expectedDeploymentDescriptor );
+ actual = ReaderFactory.newXmlReader( actualDeploymentDescriptor );
// Make sure that it matches even if the elements are not in
// the exact same order
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java?rev=737509&r1=737508&r2=737509&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java Sun Jan 25 13:40:41 2009
@@ -21,9 +21,9 @@
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
import java.io.File;
-import java.io.FileReader;
import java.util.Properties;
/**
@@ -481,7 +481,7 @@
{
final File baseDir = doTestProject( "project-045", new String[]{"README.txt", "ejb-sample-one-1.0.jar"} );
final File actualReadme = new File( getEarDirectory( baseDir, "project-045" ), "README.txt" );
- final String content = IOUtil.toString(new FileReader(actualReadme));
+ final String content = IOUtil.toString( ReaderFactory.newReader( actualReadme, "UTF-8" ) );
assertTrue("application name and version was not filtered properly",
content.indexOf("my-app 99.0") != -1);
assertTrue("Escaping did not work properly",
@@ -497,7 +497,7 @@
{
final File baseDir = doTestProject( "project-046", new String[]{"README.txt", "ejb-sample-one-1.0.jar"} );
final File actualReadme = new File( getEarDirectory( baseDir, "project-046" ), "README.txt" );
- final String content = IOUtil.toString(new FileReader(actualReadme));
+ final String content = IOUtil.toString( ReaderFactory.newReader( actualReadme, "UTF-8" ) );
assertTrue("application name and version was not filtered properly",
content.indexOf("my-app 99.0") != -1);
assertTrue("application build was not filtered properly",
@@ -514,7 +514,7 @@
{
final File baseDir = doTestProject( "project-047", new String[]{"README.txt", "ejb-sample-one-1.0.jar"} );
final File actualReadme = new File( getEarDirectory( baseDir, "project-047" ), "README.txt" );
- final String content = IOUtil.toString(new FileReader(actualReadme));
+ final String content = IOUtil.toString( ReaderFactory.newReader( actualReadme, "UTF-8" ) );
assertTrue("application name and version should not have been filtered",
content.indexOf("my-app 99.0") == -1);
assertTrue("orignial properties not found",