You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/07/22 16:29:14 UTC
svn commit: r796740 - in
/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder:
./ validation/
Author: jvanzyl
Date: Wed Jul 22 14:29:14 2009
New Revision: 796740
URL: http://svn.apache.org/viewvc?rev=796740&view=rev
Log:
o cleaning up tests in order to move them to the core using core components, and removing superfluous/repeated tests
Removed:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractCoreMavenComponentTestCase.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderAligningBasedirTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractCoreMavenComponentTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractCoreMavenComponentTestCase.java?rev=796740&r1=796739&r2=796740&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractCoreMavenComponentTestCase.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractCoreMavenComponentTestCase.java Wed Jul 22 14:29:14 2009
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.Properties;
+import org.apache.maven.Maven;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -36,11 +37,15 @@
@Requirement
protected org.apache.maven.project.ProjectBuilder projectBuilder;
+ @Requirement
+ protected Maven maven;
+
protected void setUp()
throws Exception
{
repositorySystem = lookup( RepositorySystem.class );
projectBuilder = lookup( org.apache.maven.project.ProjectBuilder.class );
+ maven = lookup( Maven.class );
}
@Override
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderAligningBasedirTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderAligningBasedirTest.java?rev=796740&r1=796739&r2=796740&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderAligningBasedirTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderAligningBasedirTest.java Wed Jul 22 14:29:14 2009
@@ -91,13 +91,6 @@
MavenExecutionRequest request = createMavenExecutionRequest( new File( targetDirectory, "pom.xml" ) );
- /*
- MavenExecutionRequest request = new DefaultMavenExecutionRequest()
- .setBaseDirectory( targetDirectory )
- .setShowErrors( true )
- .setGoals( Arrays.asList( new String[]{"package"} ) );
- */
-
MavenExecutionResult result = mavenEmbedder.execute( request );
assertNoExceptions( result );
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=796740&r1=796739&r2=796740&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java Wed Jul 22 14:29:14 2009
@@ -27,7 +27,6 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.model.Build;
@@ -95,41 +94,6 @@
fail( "Encountered Exceptions in MavenExecutionResult during " + getName() );
}
- // ----------------------------------------------------------------------
- // Goal/Phase execution tests
- // ----------------------------------------------------------------------
-
- public void testExecutionUsingABaseDirectory()
- throws Exception
- {
- File testDirectory = new File( basedir, "src/test/embedder-test-project" );
-
- File targetDirectory = new File( basedir, "target/embedder-test-project0" );
-
- FileUtils.copyDirectoryStructure( testDirectory, targetDirectory );
-
- MavenExecutionRequest request = createMavenExecutionRequest( new File( targetDirectory, "pom.xml" ) );
-
- /*
- MavenExecutionRequest request = new DefaultMavenExecutionRequest()
- .setBaseDirectory( targetDirectory )
- .setShowErrors( true )
- .setGoals( Arrays.asList( new String[]{"package"} ) );
- */
-
- MavenExecutionResult result = mavenEmbedder.execute( request );
-
- assertNoExceptions( result );
-
- MavenProject project = result.getProject();
-
- assertEquals( "embedder-test-project", project.getArtifactId() );
-
- File jar = new File( targetDirectory, "target/embedder-test-project-1.0-SNAPSHOT.jar" );
-
- assertTrue( jar.exists() );
- }
-
public void testWithOptionalDependencies()
throws Exception
{
@@ -141,13 +105,6 @@
MavenExecutionRequest request = createMavenExecutionRequest( new File( targetDirectory, "pom.xml" ) );
- /*
- MavenExecutionRequest request = new DefaultMavenExecutionRequest()
- .setBaseDirectory( targetDirectory )
- .setShowErrors( true )
- .setGoals( Arrays.asList( new String[] { "install" } ) );
- */
-
MavenExecutionResult result = mavenEmbedder.execute( request );
if (result.hasExceptions() )
@@ -156,8 +113,7 @@
fail( "Project didn't execute correctly.");
}
}
-
-
+
/*MNG-3919*/
public void testWithInvalidGoal()
throws Exception
@@ -168,10 +124,8 @@
FileUtils.copyDirectoryStructure( testDirectory, targetDirectory );
- MavenExecutionRequest request = new DefaultMavenExecutionRequest()
- .setBaseDirectory( targetDirectory )
- .setShowErrors( true )
- .setGoals( Arrays.asList( new String[]{"validate"} ) );
+ MavenExecutionRequest request = createMavenExecutionRequest( new File( targetDirectory, "pom.xml" ) );
+ request.setGoals( Arrays.asList( new String[]{"validate"} ) );
MavenExecutionResult result = mavenEmbedder.execute( request );
List<Exception> exceptions = result.getExceptions();
@@ -194,12 +148,6 @@
MavenExecutionRequest request = createMavenExecutionRequest( new File( targetDirectory, "pom.xml" ) );
- /*
- MavenExecutionRequest request = new DefaultMavenExecutionRequest()
- .setPom( new File( targetDirectory, "pom.xml" ) ).setShowErrors( true )
- .setGoals( Arrays.asList( new String[] { "package" } ) );
- */
-
MavenExecutionResult result = mavenEmbedder.execute( request );
assertNoExceptions( result );
@@ -226,13 +174,6 @@
MavenExecutionRequest requestWithoutProfile = createMavenExecutionRequest( new File( targetDirectory, "pom.xml" ) );
- /*
- MavenExecutionRequest requestWithoutProfile = new DefaultMavenExecutionRequest()
- .setPom( new File( targetDirectory, "pom.xml" ) )
- .setShowErrors( true )
- .setGoals( Arrays.asList( new String[] { "validate" } ) );
- */
-
MavenExecutionResult r0 = mavenEmbedder.execute( requestWithoutProfile );
assertNoExceptions( r0 );
@@ -250,21 +191,10 @@
MavenExecutionRequest request = createMavenExecutionRequest( new File( targetDirectory, "pom.xml" ) );
request.addActiveProfile( "embedderProfile" );
- /*
- MavenExecutionRequest request = new DefaultMavenExecutionRequest()
- .setPom( new File( targetDirectory, "pom.xml" ) )
- .setShowErrors( true )
- .setGoals( Arrays.asList( new String[] { "validate" } ) )
- .addActiveProfile( "embedderProfile" );
- */
-
MavenExecutionResult r1 = mavenEmbedder.execute( request );
MavenProject p1 = r1.getProject();
- System.out.println( p1 );
- System.out.println( p1.getProperties() );
-
assertEquals( "true", p1.getProperties().getProperty( "embedderProfile" ) );
assertEquals( "jason", p1.getProperties().getProperty( "name" ) );
@@ -303,11 +233,6 @@
MavenExecutionRequest request = createMavenExecutionRequest( pom );
- /*
- MavenExecutionRequest request = new DefaultMavenExecutionRequest().setPom( pom ).setShowErrors( true )
- .setGoals( Arrays.asList( new String[] { "package" } ) );
- */
-
MavenExecutionResult result = mavenEmbedder.execute( request );
assertNoExceptions( result );
@@ -324,12 +249,7 @@
writer.close();
request = createMavenExecutionRequest( pom );
-
- /*
- request = new DefaultMavenExecutionRequest().setPom( pom ).setShowErrors( true )
- .setGoals( Arrays.asList( new String[] { "package" } ) );
- */
-
+
result = mavenEmbedder.execute( request );
assertNoExceptions( result );
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java?rev=796740&r1=796739&r2=796740&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java Wed Jul 22 14:29:14 2009
@@ -36,8 +36,6 @@
public void testEmbedderWillStillStartupWhenTheSettingsConfigurationIsCrap()
throws Exception
{
- // START SNIPPET: simple-embedder-example
-
File projectDirectory = getTestFile( "src/examples/simple-project" );
File user = new File( projectDirectory, "invalid-settings.xml" );
@@ -51,23 +49,10 @@
MavenEmbedder embedder = new MavenEmbedder( configuration );
- //assertNotNull( embedder.getLocalRepository().getBasedir() );
-
MavenExecutionRequest request = createMavenExecutionRequest( new File( projectDirectory, "pom.xml" ) );
- /*
- MavenExecutionRequest request = new DefaultMavenExecutionRequest()
- .setBaseDirectory( projectDirectory )
- .setGoals( Arrays.asList( new String[]{"validate"} ) );
- */
-
MavenExecutionResult result = embedder.execute( request );
-
- for ( Exception e : result.getExceptions() )
- {
- e.printStackTrace();
- }
-
+
assertFalse( result.hasExceptions() );
assertNotNull( result.getProject() );
@@ -77,8 +62,6 @@
String environment = project.getProperties().getProperty( "environment" );
assertEquals( "development", environment );
-
- // END SNIPPET: simple-embedder-example
}
@Override