maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r738054 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/IntegrationTestSuite.java java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java resources/mng-4007/ resources/mng-4007/pom.xml
Date Tue, 27 Jan 2009 11:08:38 GMT
Author: bentmann
Date: Tue Jan 27 11:08:38 2009
New Revision: 738054

URL: http://svn.apache.org/viewvc?rev=738054&view=rev
Log:
[MNG-4007] [regression] Effective model contains paths with non-normalized file separators

o Added IT

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
  (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4007/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4007/pom.xml
  (with props)
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=738054&r1=738053&r2=738054&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Tue Jan 27 11:08:38 2009
@@ -90,6 +90,7 @@
         // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
         // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
 
+        suite.addTestSuite( MavenITmng4007PlatformFileSeparatorTest.class );
         suite.addTestSuite( MavenITmng4000MultiPluginExecutionsTest.class );
         suite.addTestSuite( MavenITmng3998PluginExecutionConfigTest.class );
         suite.addTestSuite( MavenITmng3983PluginResolutionFromProfileReposTest.class );

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java?rev=738054&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
Tue Jan 27 11:08:38 2009
@@ -0,0 +1,98 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4007">MNG-4007</a>.
+ * 
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng4007PlatformFileSeparatorTest
+    extends AbstractMavenIntegrationTestCase
+{
+
+    public MavenITmng4007PlatformFileSeparatorTest()
+    {
+        super();
+    }
+
+    /**
+     * Verify that paths to project directories use the platform-specific file separator.
+     */
+    public void testitMNG4007()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4007"
);
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "target" );
+        verifier.executeGoal( "validate" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+        Properties modelProps = verifier.loadProperties( "target/model.properties" );
+
+        assertPath( modelProps.getProperty( "project.build.directory" ) );
+
+        assertPath( modelProps.getProperty( "project.build.outputDirectory" ) );
+
+        assertPath( modelProps.getProperty( "project.build.testOutputDirectory" ) );
+
+        assertPath( modelProps.getProperty( "project.build.sourceDirectory" ) );
+        assertPath( modelProps.getProperty( "project.compileSourceRoots.0" ) );
+
+        assertPath( modelProps.getProperty( "project.build.testSourceDirectory" ) );
+        assertPath( modelProps.getProperty( "project.testCompileSourceRoots.0" ) );
+
+        assertPath( modelProps.getProperty( "project.build.resources.0.directory" ) );
+
+        assertPath( modelProps.getProperty( "project.build.testResources.0.directory" ) );
+
+        assertPath( modelProps.getProperty( "project.build.filters.0" ) );
+
+        /*
+         * NOTE: The script source directory is deliberately excluded from the checks due
to MNG-3741.
+         */
+
+        // FIXME: MNG-3877
+        if ( matchesVersionRange( "(4,)" ) )
+        {
+            assertPath( modelProps.getProperty( "project.reporting.outputDirectory" ) );
+        }
+    }
+
+    private void assertPath( String actual )
+    {
+        /*
+         * NOTE: Whether the path is absolute is another issue (MNG-3877), we are only interested
in the proper
+         * file separator here.
+         */
+        assertEquals( new File( actual ).getPath(), actual );
+    }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4007/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4007/pom.xml?rev=738054&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4007/pom.xml
(added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4007/pom.xml
Tue Jan 27 11:08:38 2009
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<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>
+
+  <groupId>org.apache.maven.its.mng3877</groupId>
+  <artifactId>test</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-3877</name> 
+  <description>
+    Verify that paths to project directories use the platform-specific file separator.
+  </description>
+
+  <build>
+    <filters>
+      <filter>src/main/filters/it.properties</filter>
+    </filters>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-expression</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <outputFile>target/model.properties</outputFile>
+          <expressions>
+            <expression>project/build/directory</expression>
+            <expression>project/build/outputDirectory</expression>
+            <expression>project/build/testOutputDirectory</expression>
+            <expression>project/build/sourceDirectory</expression>
+            <expression>project/build/testSourceDirectory</expression>
+            <expression>project/build/scriptSourceDirectory</expression>
+            <expression>project/build/resources/0/directory</expression>
+            <expression>project/build/testResources/0/directory</expression>
+            <expression>project/build/filters/0</expression>
+            <expression>project/reporting/outputDirectory</expression>
+            <expression>project/compileSourceRoots</expression>
+            <expression>project/testCompileSourceRoots</expression>
+            <expression>project/scriptSourceRoots</expression>
+          </expressions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>effective-model</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>eval</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4007/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4007/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message