Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed a unit test related to aspect eventing. Added back in direct setting of compile/script directories. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694118 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2008-09-11 04:55:50 +00:00
parent cacc78b1d0
commit 50a1d13a08
2 changed files with 7 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

261
maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderEventingTest.java
View File

@ -1,261 +0,0 @@
package org.apache.maven.embedder;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.extension.ExtensionScanningException;
import org.apache.maven.monitor.event.AbstractWorkspaceMonitor;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.reactor.MavenExecutionException;
import org.apache.maven.workspace.MavenWorkspaceStore;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import junit.framework.TestCase;
public class MavenEmbedderEventingTest
extends TestCase
{
protected String basedir;
protected void setUp()
throws Exception
{
super.setUp();
basedir = System.getProperty( "basedir" );
if ( basedir == null )
{
basedir = new File( "." ).getCanonicalPath();
}
}
public void testEmbedderInitializeAndStopEventsFired()
throws MavenEmbedderException
{
TestWorkspaceMonitor testWSMonitor = new TestWorkspaceMonitor();
Configuration config = new DefaultConfiguration();
config.setWorkspaceMonitor( testWSMonitor );
assertEquals( 0, testWSMonitor.initializeCaught );
assertEquals( 0, testWSMonitor.setManagerCaught );
MavenEmbedder embedder = new MavenEmbedder( config );
assertEquals( 1, testWSMonitor.initializeCaught );
assertEquals( 1, testWSMonitor.setManagerCaught );
assertEquals( 0, testWSMonitor.stopCaught );
assertEquals( 0, testWSMonitor.clearCaught );
assertSame( embedder.getWorkspaceStore(), testWSMonitor.workspaceManager );
embedder.stop();
assertEquals( 1, testWSMonitor.stopCaught );
assertEquals( 1, testWSMonitor.clearCaught );
assertEquals( 0, testWSMonitor.startMethodCaught );
assertEquals( 0, testWSMonitor.endMethodCaught );
}
public void testStartAndEndMethodEventsFiredOnSimpleReadProject()
throws IOException, MavenEmbedderException, ProjectBuildingException,
ExtensionScanningException, MavenExecutionException
{
EmbedderAndMonitor em = newEmbedder();
assertEquals( 0, em.monitor.startMethodCaught );
assertEquals( 0, em.monitor.endMethodCaught );
File dir = getFile( "simple-read-project" );
File pomFile = new File( dir, "pom.xml" );
em.embedder.readProject( pomFile );
assertEquals( 1, em.monitor.startMethodCaught );
assertEquals( 1, em.monitor.endMethodCaught );
assertEquals( 1, em.monitor.clearCaught );
assertSame( em.embedder.getWorkspaceStore(), em.monitor.workspaceManager );
em.embedder.stop();
}
public void testStartAndEndMethodEventsFiredOnReadWithDeps()
throws IOException, MavenEmbedderException, ProjectBuildingException,
ExtensionScanningException, MavenExecutionException
{
File dir = getFile( "read-with-deps" );
File pomFile = new File( dir, "pom.xml" );
File localRepoDir = new File( dir, "repo" );
EmbedderAndMonitor em = newEmbedder( localRepoDir );
assertEquals( 0, em.monitor.startMethodCaught );
assertEquals( 0, em.monitor.endMethodCaught );
em.embedder.readProject( pomFile );
assertEquals( 1, em.monitor.startMethodCaught );
assertEquals( 1, em.monitor.endMethodCaught );
assertEquals( 1, em.monitor.clearCaught );
assertSame( em.embedder.getWorkspaceStore(), em.monitor.workspaceManager );
em.embedder.stop();
}
public void testStartAndEndMethodEventsFiredOnExecute()
throws IOException, MavenEmbedderException, ProjectBuildingException,
ExtensionScanningException, MavenExecutionException
{
EmbedderAndMonitor em = newEmbedder();
assertEquals( 0, em.monitor.startMethodCaught );
assertEquals( 0, em.monitor.endMethodCaught );
File dir = getFile( "simple-read-project" );
MavenExecutionRequest request = new DefaultMavenExecutionRequest();
request.setGoals( Collections.singletonList( "clean" ) );
request.setBaseDirectory( dir );
em.embedder.execute( request );
assertEquals( 1, em.monitor.startMethodCaught );
assertEquals( 1, em.monitor.endMethodCaught );
assertEquals( 1, em.monitor.clearCaught );
assertSame( em.embedder.getWorkspaceStore(), em.monitor.workspaceManager );
em.embedder.stop();
}
private EmbedderAndMonitor newEmbedder()
throws MavenEmbedderException
{
return newEmbedder( null );
}
private EmbedderAndMonitor newEmbedder( File localRepoDir )
throws MavenEmbedderException
{
TestWorkspaceMonitor testWSMonitor = new TestWorkspaceMonitor();
Configuration config = new DefaultConfiguration();
config.setWorkspaceMonitor( testWSMonitor );
config.setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() );
if ( localRepoDir != null )
{
config.setLocalRepository( localRepoDir );
}
return new EmbedderAndMonitor( new MavenEmbedder( config ), testWSMonitor );
}
private static final class EmbedderAndMonitor
{
private MavenEmbedder embedder;
private TestWorkspaceMonitor monitor;
private EmbedderAndMonitor( MavenEmbedder embedder,
TestWorkspaceMonitor monitor )
{
this.embedder = embedder;
this.monitor = monitor;
}
}
private File getFile( String path )
throws IOException
{
File testDirectory = new File( basedir, "src/test/eventing-projects/" + path );
System.out.println( "Test source dir: " + testDirectory );
File targetDirectory = new File( basedir, "target/eventing-projects/" + path );
System.out.println( "Test temp dir: " + targetDirectory );
targetDirectory.getParentFile().mkdirs();
FileUtils.copyDirectoryStructure( testDirectory, targetDirectory );
return targetDirectory;
}
private static final class TestWorkspaceMonitor
extends AbstractWorkspaceMonitor
{
private int initializeCaught = 0;
private int startMethodCaught = 0;
private int endMethodCaught = 0;
private int stopCaught = 0;
private int setManagerCaught = 0;
private int clearCaught = 0;
private MavenWorkspaceStore workspaceManager;
private boolean clearOnEndMethod = true;
private boolean clearOnStop = true;
public void embedderInitialized( long timestamp )
{
initializeCaught++;
}
public void embedderMethodEnded( String method,
long timestamp )
{
endMethodCaught++;
if ( clearOnEndMethod )
{
clearCache();
}
}
public void embedderMethodStarted( String method,
long timestamp )
{
startMethodCaught++;
}
public void embedderStopped( long timestamp )
{
stopCaught++;
if ( clearOnStop )
{
clearCache();
}
}
public void setWorkspaceStore( MavenWorkspaceStore workspaceManager )
{
setManagerCaught++;
this.workspaceManager = workspaceManager;
super.setWorkspaceStore( workspaceManager );
}
public void clearCache()
{
clearCaught++;
super.clearCache();
}
}
}

7
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -184,6 +184,13 @@ public MavenProject build( File projectDescriptor, ProjectBuilderConfiguration c
project.setFile( projectDescriptor );
project = buildInternal( project.getModel(), config, projectDescriptor, project.getParentFile(), true );
Build build = project.getBuild();
// NOTE: setting this script-source root before path translation, because
// the plugin tools compose basedir and scriptSourceRoot into a single file.
project.addScriptSourceRoot( build.getScriptSourceDirectory() );
project.addCompileSourceRoot( build.getSourceDirectory() );
project.addTestCompileSourceRoot( build.getTestSourceDirectory() );
project.setFile( projectDescriptor );
setBuildOutputDirectoryOnParent( project );