You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/01/19 20:15:21 UTC
svn commit: r497911 [2/2] - in /maven/components/trunk: ./
maven-build-context/ maven-build-context/src/ maven-build-context/src/main/
maven-build-context/src/main/java/ maven-build-context/src/main/java/org/
maven-build-context/src/main/java/org/apach...
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivatorTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivatorTest.java?view=diff&rev=497911&r1=497910&r2=497911
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivatorTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivatorTest.java Fri Jan 19 11:15:18 2007
@@ -1,21 +1,37 @@
package org.apache.maven.profiles.activation;
+import org.apache.maven.context.BuildContextManager;
+import org.apache.maven.context.DefaultBuildContextManager;
+import org.apache.maven.context.SystemBuildContext;
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile;
+import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.context.DefaultContext;
import java.util.Properties;
-import junit.framework.TestCase;
-
public class SystemPropertyProfileActivatorTest
- extends TestCase
+ extends PlexusTestCase
{
+
+ private BuildContextManager buildContextManager;
+ private SystemPropertyProfileActivator activator;
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ buildContextManager = (BuildContextManager) lookup( BuildContextManager.ROLE, DefaultBuildContextManager.ROLE_HINT );
+
+ SystemBuildContext sysContext = SystemBuildContext.getSystemBuildContext( buildContextManager, true );
+ sysContext.store( buildContextManager );
+
+ activator = (SystemPropertyProfileActivator) lookup( ProfileActivator.ROLE, "system-property" );
+ }
public void testCanDetect_ShouldReturnTrueWhenActivationPropertyIsPresent()
- throws ContextException
+ throws Exception
{
ActivationProperty prop = new ActivationProperty();
prop.setName( "test" );
@@ -28,11 +44,11 @@
profile.setActivation( activation );
- assertTrue( buildProfileActivator().canDetermineActivation( profile ) );
+ assertTrue( activator.canDetermineActivation( profile ) );
}
public void testCanDetect_ShouldReturnFalseWhenActivationPropertyIsNotPresent()
- throws ContextException
+ throws Exception
{
Activation activation = new Activation();
@@ -40,11 +56,11 @@
profile.setActivation( activation );
- assertFalse( buildProfileActivator().canDetermineActivation( profile ) );
+ assertFalse( activator.canDetermineActivation( profile ) );
}
public void testIsActive_ShouldReturnTrueWhenPropertyNameSpecifiedAndPresent()
- throws ContextException
+ throws Exception
{
ActivationProperty prop = new ActivationProperty();
prop.setName( "test" );
@@ -59,11 +75,11 @@
System.setProperty( "test", "true" );
- assertTrue( buildProfileActivator().isActive( profile ) );
+ assertTrue( activator.isActive( profile ) );
}
public void testIsActive_ShouldReturnFalseWhenPropertyNameSpecifiedAndMissing()
- throws ContextException
+ throws Exception
{
ActivationProperty prop = new ActivationProperty();
prop.setName( "test" );
@@ -80,16 +96,7 @@
props.remove( "test" );
System.setProperties( props );
- assertFalse( buildProfileActivator().isActive( profile ) );
- }
-
- private SystemPropertyProfileActivator buildProfileActivator()
- throws ContextException
- {
- SystemPropertyProfileActivator activator = new SystemPropertyProfileActivator();
- activator.contextualize( new DefaultContext() );
-
- return activator;
+ assertFalse( activator.isActive( profile ) );
}
}
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/build/model/AbstractModelLineageTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/build/model/AbstractModelLineageTest.java?view=diff&rev=497911&r1=497910&r2=497911
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/build/model/AbstractModelLineageTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/build/model/AbstractModelLineageTest.java Fri Jan 19 11:15:18 2007
@@ -71,6 +71,54 @@
assertEquals( 1, ml.size() );
}
+ public void testLineageIterator_ShouldAddTwoEntriesAndIterateInFIFOOrder()
+ throws IOException
+ {
+ ModelLineage ml = newModelLineage();
+
+ String gOne = "group1";
+ String aOne = "artifact1";
+ String vOne = "1";
+
+ Model mOne = new Model();
+
+ mOne.setGroupId( gOne );
+ mOne.setArtifactId( aOne );
+ mOne.setVersion( vOne );
+
+ File fOne = File.createTempFile( "ModelLineageTest.modelLineageIterator-test.", "" );
+ fOne.deleteOnExit();
+
+ ml.setOrigin( mOne, fOne, null );
+
+ String gTwo = "group2";
+ String aTwo = "artifact2";
+ String vTwo = "2";
+
+ Model mTwo = new Model();
+
+ mOne.setGroupId( gTwo );
+ mOne.setArtifactId( aTwo );
+ mOne.setVersion( vTwo );
+
+ File fTwo = File.createTempFile( "ModelLineageTest.fileIterator-test.", "" );
+ fTwo.deleteOnExit();
+
+ ml.addParent( mTwo, fTwo, null );
+
+ ModelLineageIterator it = ml.lineageIterator();
+
+ assertTrue( it.hasNext() );
+ assertEquals( mOne.getId(), ( (Model) it.next() ).getId() );
+ assertEquals( mOne.getId(), it.getModel().getId() );
+ assertEquals( fOne, it.getPOMFile() );
+
+ assertTrue( it.hasNext() );
+ assertEquals( mTwo.getId(), ( (Model) it.next() ).getId() );
+ assertEquals( mTwo.getId(), it.getModel().getId() );
+ assertEquals( fTwo, it.getPOMFile() );
+ }
+
public void testModelIterator_ShouldAddTwoModelsAndIterateInFIFOOrder()
{
ModelLineage ml = newModelLineage();
@@ -162,7 +210,7 @@
File fOne = File.createTempFile( "ModelLineageTest.fileIterator-test.", "" );
fOne.deleteOnExit();
-
+
Model mOne = new Model();
String gOne = "group";
@@ -272,7 +320,7 @@
assertSame( arOne, ml.getOriginatingArtifactRepositoryList().get( 0 ) );
}
-
+
public void testGetModelsInDescendingOrder_ShouldAddTwoAndRetrieveInLIFOOrder()
{
ModelLineage ml = newModelLineage();
@@ -302,7 +350,7 @@
ml.addParent( mTwo, null, null );
Iterator it = ml.getModelsInDescendingOrder().iterator();
-
+
assertTrue( it.hasNext() );
assertEquals( mTwo.getId(), ( (Model) it.next() ).getId() );
Modified: maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?view=diff&rev=497911&r1=497910&r2=497911
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml (original)
+++ maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml Fri Jan 19 11:15:18 2007
@@ -20,6 +20,23 @@
<implementation>org.apache.maven.project.injection.TestProfileInjector</implementation>
</component>
<component>
+ <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+ <role-hint>default</role-hint>
+ <implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.MavenTools</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.project.injection.ProfileInjector</role>
+ <role-hint>test</role-hint>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
<role>org.apache.maven.project.TestArtifactResolver</role>
<implementation>org.apache.maven.project.TestArtifactResolver</implementation>
<requirements>
@@ -57,10 +74,6 @@
<role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.injection.ProfileInjector</role>
- <role-hint>test</role-hint>
- </requirement>
- <requirement>
<role>org.apache.maven.project.interpolation.ModelInterpolator</role>
</requirement>
<requirement>
@@ -79,7 +92,8 @@
<role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
</requirement>
<requirement>
- <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+ <role>org.apache.maven.context.BuildContextManager</role>
+ <role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.MavenTools</role>
Modified: maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?view=diff&rev=497911&r1=497910&r2=497911
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml (original)
+++ maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml Fri Jan 19 11:15:18 2007
@@ -38,6 +38,23 @@
</requirements>
</component>
<component>
+ <role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
+ <role-hint>default</role-hint>
+ <implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.MavenTools</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.project.injection.ProfileInjector</role>
+ <role-hint>test</role-hint>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
<role>org.apache.maven.project.MavenProjectBuilder</role>
<role-hint>test</role-hint>
<implementation>org.apache.maven.project.TestProjectBuilder</implementation>
@@ -57,10 +74,6 @@
<role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.injection.ProfileInjector</role>
- <role-hint>test</role-hint>
- </requirement>
- <requirement>
<role>org.apache.maven.project.interpolation.ModelInterpolator</role>
</requirement>
<requirement>
@@ -79,10 +92,11 @@
<role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
</requirement>
<requirement>
- <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+ <role>org.apache.maven.MavenTools</role>
</requirement>
<requirement>
- <role>org.apache.maven.MavenTools</role>
+ <role>org.apache.maven.context.BuildContextManager</role>
+ <role-hint>default</role-hint>
</requirement>
</requirements>
</component>
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?view=diff&rev=497911&r1=497910&r2=497911
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Fri Jan 19 11:15:18 2007
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
@@ -16,7 +15,7 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -149,6 +148,7 @@
<module>maven-artifact</module>
<module>maven-artifact-manager</module>
<module>maven-artifact-test</module>
+ <module>maven-build-context</module>
<module>maven-core</module>
<module>maven-error-diagnostics</module>
<module>maven-model</module>