Profile tests. Fixes for negation activation.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749717 13f79535-47bb-0310-9956-ffa450edef68

maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/JdkMatcher.java

@@ -10,21 +10,36 @@ import java.util.List;
 public class JdkMatcher implements ActiveProfileMatcher {
     //TODO: Ranges
     public boolean isMatch(ModelContainer modelContainer, List<InterpolatorProperty> properties) {
-        if(modelContainer == null ) {
+        if(modelContainer == null )
+        {
             throw new IllegalArgumentException("modelContainer: null");
         }
 
-        if(properties == null) {
+        if(properties == null)
+        {
             return false;
         }
 
-        for(InterpolatorProperty property : properties) {
+        for(InterpolatorProperty property : properties)
-            if(property.getKey().equals("${java.specification.version}")) {
+        {
+            if(property.getKey().equals("${java.specification.version}"))
+            {
                 String version = property.getValue();
-                for(ModelProperty modelProperty : modelContainer.getProperties()) {
+                for(ModelProperty modelProperty : modelContainer.getProperties())
-                    if(modelProperty.getUri().equals(ProjectUri.Profiles.Profile.Activation.jdk)) {
+                {
+
+                    if(modelProperty.getUri().equals(ProjectUri.Profiles.Profile.Activation.jdk))
+                    {
+                        if(modelProperty.getValue().startsWith("!"))
+                        {
+                            return !version.equals(modelProperty.getValue().replaceFirst("!", ""));
+                        }
+                        else
+                        {
                             return version.equals(modelProperty.getValue());
                         }
+
+                    }
                 }
                 return false;   
             }

maven-project-builder/src/test/java/org/apache/maven/project/builder/profile/JdkMatcherTest.java

@@ -35,6 +35,39 @@ public class JdkMatcherTest {
         assertTrue(matcher.isMatch(modelContainer, props));
     }
 
+    @org.junit.Test
+    public void jdkVersionDoesNotMatchWithNotSymbol()  {
+        List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
+        modelProperties.add(new ModelProperty(ProjectUri.Profiles.Profile.xUri, null));
+        modelProperties.add(new ModelProperty(ProjectUri.Profiles.Profile.Activation.xUri , null));
+        modelProperties.add(new ModelProperty(ProjectUri.Profiles.Profile.Activation.jdk , "!1.5"));
+
+        ModelContainer modelContainer = new DefaultModelContainer(modelProperties);
+
+        List<InterpolatorProperty> props = new ArrayList<InterpolatorProperty>();
+        props.add(new InterpolatorProperty("${java.specification.version}" , "1.5"));
+
+        JdkMatcher matcher = new JdkMatcher();
+        assertTrue(!matcher.isMatch(modelContainer, props));
+    }
+
+    @org.junit.Test
+    public void jdkVersionDoesMatchWithNotSymbol()  {
+        List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
+        modelProperties.add(new ModelProperty(ProjectUri.Profiles.Profile.xUri, null));
+        modelProperties.add(new ModelProperty(ProjectUri.Profiles.Profile.Activation.xUri , null));
+        modelProperties.add(new ModelProperty(ProjectUri.Profiles.Profile.Activation.jdk , "!1.5"));
+
+        ModelContainer modelContainer = new DefaultModelContainer(modelProperties);
+
+        List<InterpolatorProperty> props = new ArrayList<InterpolatorProperty>();
+        props.add(new InterpolatorProperty("${java.specification.version}" , "1.6"));
+
+        JdkMatcher matcher = new JdkMatcher();
+        assertTrue(matcher.isMatch(modelContainer, props));
+    }
+
+
     @org.junit.Test
     public void jdkVersionNotMatches()  {
         List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();

maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java

@@ -78,6 +78,19 @@ public class PomConstructionTest
     }
     */
 
+    /**
+     * Tests that modules is not overriden by profile
+     * 
+     * @throws Exception
+     */
+    public void testProfileModules()
+        throws Exception
+    {
+        PomTestWrapper pom = buildPomFromMavenProject( "profile-module", "a" );
+        assertEquals( "test-prop", pom.getValue( "properties[1]/b" ) );//verifies profile applied
+        assertEquals( "test-module", pom.getValue( "modules[1]" ) );
+    }
+
     /**
      * Will throw exception if doesn't find parent(s) in build
      *

maven-project/src/test/resources-project-builder/profile-module/pom.xml

@@ -0,0 +1,18 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>gid</groupId>
+  <artifactId>aid</artifactId>
+  <version>1.0</version>
+    <packaging>pom</packaging>
+    <modules>
+        <module>test-module</module>
+    </modules>
+    <profiles>
+        <profile>
+            <id>a</id>
+            <properties>
+                <b>test-prop</b>
+            </properties>
+        </profile>
+    </profiles>
+</project>