Author: fgiust
Date: Sun Jul 16 05:32:00 2006
New Revision: 422433
URL: http://svn.apache.org/viewvc?rev=422433&view=rev
Log:
execute tests in the target/test-classes dir instead of src/test. Avoid
modification of directories stored in svn and be sure to always start from a
clean dir.
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/
- copied from r422431,
maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/
- copied from r422431,
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/test-harness/
- copied from r422431,
maven/plugins/trunk/maven-eclipse-plugin/src/test/test-harness/
Removed:
maven/plugins/trunk/maven-eclipse-plugin/src/test/m2repo/
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/
maven/plugins/trunk/maven-eclipse-plugin/src/test/test-harness/
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/project
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?rev=422433&r1=422432&r2=422433&view=diff
==============================================================================
---
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
Sun Jul 16 05:32:00 2006
@@ -18,7 +18,6 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
@@ -55,7 +54,7 @@
/**
* Test repository directory.
*/
- protected File localRepositoryDir = getTestFile( "src/test/m2repo" );
+ protected File localRepositoryDir = getTestFile(
"target/test-classes/m2repo" );
/**
* @see org.codehaus.plexus.PlexusTestCase#setUp()
@@ -68,6 +67,7 @@
this.maven.setClassLoader(
Thread.currentThread().getContextClassLoader() );
this.maven.setLogger( new MavenEmbedderConsoleLogger() );
this.maven.setLocalRepositoryDirectory( localRepositoryDir );
+ this.maven.setOffline( true );
this.maven.start();
super.setUp();
@@ -104,7 +104,7 @@
throws Exception
{
- File basedir = getTestFile( "src/test/projects/" + projectName );
+ File basedir = getTestFile( "target/test-classes/projects/" +
projectName );
MavenProject project = maven.readProjectWithDependencies( new File(
basedir, "pom.xml" ) );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java?rev=422433&r1=422432&r2=422433&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java
Sun Jul 16 05:32:00 2006
@@ -66,7 +66,8 @@
private AddMavenRepoMojo getConfiguredMojo( String pomXml )
throws Exception
{
- File pomXmlFile = new File( PlexusTestCase.getBasedir(),
"src/test/test-harness/add-maven-repo/" + pomXml );
+ File pomXmlFile = new File( PlexusTestCase.getBasedir(),
"target/test-classes/test-harness/add-maven-repo/"
+ + pomXml );
AddMavenRepoMojo mojo = (AddMavenRepoMojo) lookupMojo(
"add-maven-repo", pomXmlFile );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/classpath?rev=422433&r1=422431&r2=422433&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/classpath
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/classpath
Sun Jul 16 05:32:00 2006
@@ -1,5 +1,5 @@
<classpath>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib"
path="${basedir}/src/test/projects/project-18/sysdep.jar"/>
+ <classpathentry kind="lib"
path="${basedir}/target/test-classes/projects/project-18/sysdep.jar"/>
</classpath>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/project?rev=422433&r1=422431&r2=422433&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/project
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/project
Sun Jul 16 05:32:00 2006
@@ -15,7 +15,7 @@
<link>
<name>pom.xml</name>
<type>1</type>
- <location>${basedir}/src/test/projects/project-18/pom.xml</location>
+
<location>${basedir}/target/test-classes/projects/project-18/pom.xml</location>
</link>
</linkedResources>
</projectDescription>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/project?rev=422433&r1=422431&r2=422433&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/project
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/project
Sun Jul 16 05:32:00 2006
@@ -15,27 +15,27 @@
<link>
<name>pom.xml</name>
<type>1</type>
- <location>${basedir}/src/test/projects/project-4/pom.xml</location>
+
<location>${basedir}/target/test-classes/projects/project-4/pom.xml</location>
</link>
<link>
<name>src-main-java</name>
<type>2</type>
- <location>${basedir}/src/test/projects/project-4/src/main/java</location>
+
<location>${basedir}/target/test-classes/projects/project-4/src/main/java</location>
</link>
<link>
<name>src-main-resources</name>
<type>2</type>
-
<location>${basedir}/src/test/projects/project-4/src/main/resources</location>
+
<location>${basedir}/target/test-classes/projects/project-4/src/main/resources</location>
</link>
<link>
<name>src-test-java</name>
<type>2</type>
- <location>${basedir}/src/test/projects/project-4/src/test/java</location>
+
<location>${basedir}/target/test-classes/projects/project-4/src/test/java</location>
</link>
<link>
<name>src-test-resources</name>
<type>2</type>
-
<location>${basedir}/src/test/projects/project-4/src/test/resources</location>
+
<location>${basedir}/target/test-classes/projects/project-4/src/test/resources</location>
</link>
</linkedResources>
</projectDescription>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/project?rev=422433&r1=422431&r2=422433&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/project
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/project
Sun Jul 16 05:32:00 2006
@@ -15,27 +15,27 @@
<link>
<name>pom.xml</name>
<type>1</type>
- <location>${basedir}/src/test/projects/project-9/pom.xml</location>
+
<location>${basedir}/target/test-classes/projects/project-9/pom.xml</location>
</link>
<link>
<name>src-main-java</name>
<type>2</type>
- <location>${basedir}/src/test/projects/project-9/src/main/java</location>
+
<location>${basedir}/target/test-classes/projects/project-9/src/main/java</location>
</link>
<link>
<name>src-main-resources</name>
<type>2</type>
-
<location>${basedir}/src/test/projects/project-9/src/main/resources</location>
+
<location>${basedir}/target/test-classes/projects/project-9/src/main/resources</location>
</link>
<link>
<name>src-test-java</name>
<type>2</type>
- <location>${basedir}/src/test/projects/project-9/src/test/java</location>
+
<location>${basedir}/target/test-classes/projects/project-9/src/test/java</location>
</link>
<link>
<name>src-test-resources</name>
<type>2</type>
-
<location>${basedir}/src/test/projects/project-9/src/test/resources</location>
+
<location>${basedir}/target/test-classes/projects/project-9/src/test/resources</location>
</link>
</linkedResources>
</projectDescription>
