Author: epunzalan
Date: Thu Apr 6 02:24:03 2006
New Revision: 391945
URL: http://svn.apache.org/viewcvs?rev=391945&view=rev
Log:
PR: MIDEA-43
Fixed bug that fail the build when building from the parent
Modified:
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/AbstractIdeaTestCase.java
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaCleanTest.java
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaTest.java
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/stubs/SimpleMavenProjectStub.java
Modified:
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/AbstractIdeaTestCase.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/AbstractIdeaTestCase.java?rev=391945&r1=391944&r2=391945&view=diff
==============================================================================
---
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/AbstractIdeaTestCase.java
(original)
+++
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/AbstractIdeaTestCase.java
Thu Apr 6 02:24:03 2006
@@ -23,6 +23,7 @@
import org.apache.maven.plugin.idea.stubs.TestCounter;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.plugin.Mojo;
+import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
import java.util.Iterator;
@@ -49,7 +50,7 @@
int testCounter = TestCounter.currentCount();
- File outputFile = new File( "target/test-harness/" + testCounter +
+ File outputFile = new File( PlexusTestCase.getBasedir(),
"target/test-harness/" + testCounter +
"/plugin-test-" + testCounter + "." +
targetExtension );
assertTrue( "Target file was created", outputFile.exists() );
Modified:
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaCleanTest.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaCleanTest.java?rev=391945&r1=391944&r2=391945&view=diff
==============================================================================
---
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaCleanTest.java
(original)
+++
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaCleanTest.java
Thu Apr 6 02:24:03 2006
@@ -35,7 +35,7 @@
{
File pluginXmlFile = new File( getBasedir(),
"src/test/clean-plugin-configs/min-plugin-config.xml" );
- File basedir = new File( "target/test-harness/" + (
TestCounter.currentCount() + 1 ) );
+ File basedir = new File(getBasedir(), "target/test-harness/" + (
TestCounter.currentCount() + 1 ) );
assertTrue( "Prepare test base directory", basedir.mkdirs() );
String artifactId = "plugin-test-" + ( TestCounter.currentCount() + 1
);
Modified:
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java?rev=391945&r1=391944&r2=391945&view=diff
==============================================================================
---
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java
(original)
+++
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java
Thu Apr 6 02:24:03 2006
@@ -3,6 +3,7 @@
import org.dom4j.Document;
import org.dom4j.Element;
import org.apache.maven.plugin.idea.stubs.TestCounter;
+import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
import java.util.ArrayList;
@@ -40,7 +41,7 @@
public void testExcludeDirectoryConfig()
throws Exception
{
- File projectBasedir = new File( "target/test-harness/" + (
TestCounter.currentCount() + 1 ) );
+ File projectBasedir = new File( getBasedir(), "target/test-harness/" +
( TestCounter.currentCount() + 1 ) );
projectBasedir.mkdirs();
@@ -243,12 +244,12 @@
}
}
- File srcFile = new File(
"target/local-repo/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1-src.jar"
);
+ File srcFile = new File( PlexusTestCase.getBasedir(),
"target/local-repo/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1-src.jar"
);
assertTrue( "Test maven-model source is downloaded", srcFile.exists()
);
- srcFile = new File(
"target/local-repo/junit/junit/3.8.1/junit-3.8.1-src.jar" );
+ srcFile = new File( PlexusTestCase.getBasedir(),
"target/local-repo/junit/junit/3.8.1/junit-3.8.1-src.jar" );
assertTrue( "Test junit source is downloaded", srcFile.exists() );
- File docFile = new File(
"target/local-repo/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1-doc.jar"
);
+ File docFile = new File( PlexusTestCase.getBasedir(),
"target/local-repo/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1-doc.jar"
);
assertTrue( "Test maven-model javadoc is downloaded", docFile.exists()
);
}
Modified:
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaTest.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaTest.java?rev=391945&r1=391944&r2=391945&view=diff
==============================================================================
---
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaTest.java
(original)
+++
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaTest.java
Thu Apr 6 02:24:03 2006
@@ -42,7 +42,7 @@
mojo.execute();
- File basedir = new File( "target/test-harness/" +
TestCounter.currentCount() );
+ File basedir = new File( getBasedir(), "target/test-harness/" +
TestCounter.currentCount() );
String artifactId = "plugin-test-" + TestCounter.currentCount();
@@ -67,7 +67,7 @@
int testCounter = TestCounter.currentCount();
- File basedir = new File( "target/test-harness/" +
TestCounter.currentCount() );
+ File basedir = new File( getBasedir(), "target/test-harness/" +
TestCounter.currentCount() );
String artifactId = "plugin-test-" + testCounter;
@@ -80,7 +80,7 @@
File iwsFile = new File( basedir, artifactId + ".iws" );
assertTrue( "Test creation of project files", iwsFile.exists() );
- File outputFile = new File( "target/test-harness/" + testCounter +
"/plugin-test-" + testCounter + ".ipr" );
+ File outputFile = new File( getBasedir(), "target/test-harness/" +
testCounter + "/plugin-test-" + testCounter + ".ipr" );
SAXReader reader = new SAXReader();
Modified:
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/stubs/SimpleMavenProjectStub.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/stubs/SimpleMavenProjectStub.java?rev=391945&r1=391944&r2=391945&view=diff
==============================================================================
---
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/stubs/SimpleMavenProjectStub.java
(original)
+++
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/stubs/SimpleMavenProjectStub.java
Thu Apr 6 02:24:03 2006
@@ -24,6 +24,7 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
import java.util.ArrayList;
@@ -81,7 +82,7 @@
public File getBasedir()
{
- File basedir = new File( "target/test-harness/" +
TestCounter.currentCount() );
+ File basedir = new File( PlexusTestCase.getBasedir(),
"target/test-harness/" + TestCounter.currentCount() );
if ( !basedir.exists() )
{
@@ -153,7 +154,7 @@
{
if ( remoteRepositories == null )
{
- File testRepo = new File( "src/test/remote-repo" );
+ File testRepo = new File( PlexusTestCase.getBasedir(),
"src/test/remote-repo" );
ArtifactRepository repository = new DefaultArtifactRepository(
"test-repo",
"file://" + testRepo.getAbsolutePath(),
new
DefaultRepositoryLayout() );
@@ -207,7 +208,7 @@
artifact.setGroupId( groupId );
artifact.setArtifactId( artifactId );
artifact.setVersion( version );
- artifact.setFile( new File( "target/local-repo/" +
artifact.getGroupId().replace( '.', '/' ) +
+ artifact.setFile( new File( PlexusTestCase.getBasedir(),
"target/local-repo/" + artifact.getGroupId().replace( '.', '/' ) +
"/" + artifact.getArtifactId() + "/" +
artifact.getVersion() +
"/" + artifact.getArtifactId() + "-" +
artifact.getVersion() + ".jar" ) );
