You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ba...@apache.org on 2008/09/09 03:36:26 UTC
svn commit: r693338 - in
/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it:
AbstractEclipsePluginIT.java EclipsePluginMasterProjectIT.java
RadPluginIT.java
Author: baerrach
Date: Mon Sep 8 18:36:25 2008
New Revision: 693338
URL: http://svn.apache.org/viewvc?rev=693338&view=rev
Log:
Removed unused argument "mavenRepo" from assertFileEquals().
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=693338&r1=693337&r2=693338&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java Mon Sep 8 18:36:25 2008
@@ -459,13 +459,13 @@
throw new AssertionFailedError( "Expected file not found: " + actualFile.getAbsolutePath() );
}
- assertFileEquals( localRepositoryDirectory.getCanonicalPath(), expectedFile, actualFile );
+ assertFileEquals( expectedFile, actualFile );
}
}
}
- protected void assertFileEquals( String mavenRepo, File expectedFile, File actualFile )
+ protected void assertFileEquals( File expectedFile, File actualFile )
throws IOException
{
List expectedLines = getLines( expectedFile );
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java?rev=693338&r1=693337&r2=693338&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java Mon Sep 8 18:36:25 2008
@@ -103,8 +103,7 @@
throws Exception
{
executeMaven2();
- assertFileEquals( null, new File( basedir, "module-1/expected/.project" ), //
- new File( basedir, "module-1/.project" ) );
+ assertFileEquals( new File( basedir, "module-1/expected/.project" ), new File( basedir, "module-1/.project" ) );
}
public void testModule1Classpath()
@@ -134,16 +133,14 @@
throws Exception
{
executeMaven2();
- assertFileEquals( null, new File( basedir, "module-1/expected/.wtpmodules" ), //
- new File( basedir, "module-1/.wtpmodules" ) );
+ assertFileEquals( new File( basedir, "module-1/expected/.wtpmodules" ), new File( basedir, "module-1/.wtpmodules" ) );
}
public void testModule2Project()
throws Exception
{
executeMaven2();
- assertFileEquals( null, new File( basedir, "module-2/expected/.project" ), //
- new File( basedir, "module-2/.project" ) );
+ assertFileEquals( new File( basedir, "module-2/expected/.project" ), new File( basedir, "module-2/.project" ) );
}
public void testModule2Classpath()
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java?rev=693338&r1=693337&r2=693338&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java Mon Sep 8 18:36:25 2008
@@ -62,7 +62,7 @@
File generatedManifest = getTestFile( PROJECTS_BASEDIR + "/project-rad-3/ejbModule/META-INF/MANIFEST.MF" );
File expectedManifest =
getTestFile( PROJECTS_BASEDIR + "/project-rad-3/ejbModule/META-INF/expected_MANIFEST.MF" );
- assertFileEquals( localRepositoryDirectory.getCanonicalPath(), expectedManifest, generatedManifest );
+ assertFileEquals( expectedManifest, generatedManifest );
}
public void testProject4()