You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by fg...@apache.org on 2006/11/25 20:29:53 UTC
svn commit: r479177 -
/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
Author: fgiust
Date: Sat Nov 25 11:29:52 2006
New Revision: 479177
URL: http://svn.apache.org/viewvc?view=rev&rev=479177
Log:
Check if expected file exists, before trying to read it (it's only me or tests are failing?)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java?view=diff&rev=479177&r1=479176&r2=479177
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java Sat Nov 25 11:29:52 2006
@@ -15,6 +15,20 @@
*/
package org.apache.maven.plugin.eclipse;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
+import junit.framework.AssertionFailedError;
+
import org.apache.maven.plugin.ide.IdeUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.invoker.InvocationRequest;
@@ -29,18 +43,6 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @author <a href="mailto:fgiust@apache.org">Fabrizio Giustina</a>
@@ -103,7 +105,8 @@
{
PluginTestTool pluginTestTool = (PluginTestTool) lookup( PluginTestTool.ROLE, "default" );
- localRepositoryDirectory = pluginTestTool.preparePluginForUnitTestingWithMavenBuilds( "test", localRepositoryDirectory );
+ localRepositoryDirectory = pluginTestTool
+ .preparePluginForUnitTestingWithMavenBuilds( "test", localRepositoryDirectory );
System.out.println( "*** Installed test-version of the Eclipse plugin to: " + localRepositoryDirectory
+ "\n" );
@@ -225,7 +228,7 @@
throws TestToolsException, ExecutionFailedException
{
new File( BUILD_OUTPUT_DIRECTORY ).mkdirs();
-
+
NullPointerException npe = new NullPointerException();
StackTraceElement[] trace = npe.getStackTrace();
@@ -262,11 +265,11 @@
}
InvocationResult result = buildTool.executeMaven( request );
-
+
if ( result.getExitCode() != 0 )
{
String buildLogUrl = buildLog.getAbsolutePath();
-
+
try
{
buildLogUrl = buildLog.toURL().toExternalForm();
@@ -274,8 +277,10 @@
catch ( MalformedURLException e )
{
}
-
- throw new ExecutionFailedException( "Failed to execute build.\nPOM: " + pom + "\nGoals: " + StringUtils.join( goals.iterator(), ", " ) + "\nExit Code: " + result.getExitCode() + "\nError: " + result.getExecutionException() + "\nBuild Log: " + buildLogUrl + "\n", result );
+
+ throw new ExecutionFailedException( "Failed to execute build.\nPOM: " + pom + "\nGoals: "
+ + StringUtils.join( goals.iterator(), ", " ) + "\nExit Code: " + result.getExitCode() + "\nError: "
+ + result.getExecutionException() + "\nBuild Log: " + buildLogUrl + "\n", result );
}
}
@@ -326,11 +331,16 @@
for ( int j = 0; j < files.length; j++ )
{
- File file = files[j];
+ File expectedFile = files[j];
+ File actualFile = new File( projectOutputDir, additionalDir + expectedFile.getName() )
+ .getCanonicalFile();
+
+ if ( !actualFile.exists() )
+ {
+ throw new AssertionFailedError( "Expected file not found: " + actualFile.getAbsolutePath() );
+ }
- assertFileEquals( localRepositoryDirectory.getCanonicalPath(), file, new File( projectOutputDir,
- additionalDir
- + file.getName() ) );
+ assertFileEquals( localRepositoryDirectory.getCanonicalPath(), expectedFile, actualFile );
}
}