[maven-surefire] branch SUREFIRE-1602 updated (adb2860 -> 379a6c5)

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven-surefire] branch SUREFIRE-1602 updated (adb2860 -> 379a6c5)

Tibor Digana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a change to branch SUREFIRE-1602
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.


 discard adb2860  [SUREFIRE-1602] Surefire fails loading class ForkedBooter when using a sub-directory pom file and a local maven repo
     new 379a6c5  [SUREFIRE-1602] Surefire fails loading class ForkedBooter when using a sub-directory pom file and a local maven repo

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (adb2860)
            \
             N -- N -- N   refs/heads/SUREFIRE-1602 (379a6c5)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/maven/surefire/its/Surefire1602IT.java    | 11 ++++-------
 .../resources/surefire-1602/integration-tests/pom.xml    | 10 ----------
 .../integration-tests/src/test/java/org/ATest.java       |  8 +++++---
 surefire-its/src/test/resources/surefire-1602/pom.xml    | 16 ++++++++++++++++
 .../src/test/resources/surefire-1602/unit-tests/pom.xml  | 14 --------------
 .../unit-tests/src/test/java/org/ATest.java              |  8 +++++---
 6 files changed, 30 insertions(+), 37 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[maven-surefire] 01/01: [SUREFIRE-1602] Surefire fails loading class ForkedBooter when using a sub-directory pom file and a local maven repo

Tibor Digana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch SUREFIRE-1602
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit 379a6c51d7e9a87253732f42e28f3909f0554de6
Author: Tibor17 <[hidden email]>
AuthorDate: Mon Dec 3 00:18:18 2018 +0100

    [SUREFIRE-1602] Surefire fails loading class ForkedBooter when using a sub-directory pom file and a local maven repo
---
 .../plugin/surefire/AbstractSurefireMojo.java      | 16 +++++++-
 .../apache/maven/surefire/its/Surefire1602IT.java  | 46 ++++++++++++++++++++++
 .../resources/surefire-1602/application/pom.xml    | 15 +++++++
 .../surefire-1602/integration-tests/pom.xml        | 29 ++++++++++++++
 .../integration-tests/src/test/java/org/ATest.java | 11 ++++++
 .../src/test/resources/surefire-1602/pom.xml       | 34 ++++++++++++++++
 .../resources/surefire-1602/unit-tests/pom.xml     | 29 ++++++++++++++
 .../unit-tests/src/test/java/org/ATest.java        | 11 ++++++
 8 files changed, 190 insertions(+), 1 deletion(-)

diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index b18463e..304f449 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -2369,7 +2369,21 @@ public abstract class AbstractSurefireMojo
      */
     File getSurefireTempDir()
     {
-        return IS_OS_WINDOWS ? createSurefireBootDirectoryInTemp() : createSurefireBootDirectoryInBuild();
+        File result = IS_OS_WINDOWS ? createSurefireBootDirectoryInTemp() : createSurefireBootDirectoryInBuild();
+        try
+        {
+            File canonical = result.getCanonicalFile();
+            if ( !result.equals( canonical ) )
+            {
+                logger.debug( "Canonicalized tempDir path '" + result + "' to '" + canonical + "'" );
+            }
+            return canonical;
+        }
+        catch ( IOException e )
+        {
+            logger.error( "Could not canonicalize tempDir path '" + result + "'", e );
+        }
+        return result;
     }
 
     /**
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/Surefire1602IT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/Surefire1602IT.java
new file mode 100644
index 0000000..d26bd4a
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/Surefire1602IT.java
@@ -0,0 +1,46 @@
+package org.apache.maven.surefire.its;
+
+/*
+ * 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.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * Test ability to specify a non canonical path as module root
+ *
+ * @author <a href="mailto:[hidden email]">Enrico Olivelli</a>
+ */
+public class Surefire1602IT
+    extends SurefireJUnit4IntegrationTestCase
+{
+    @Test
+    public void nonCanonicalPath() throws Exception
+    {
+        SurefireLauncher launcher = unpack( "/surefire-1602" );
+        launcher.executeInstall();
+        launcher.addGoal( "--file" )
+                .addGoal( "./integration-tests/pom.xml" )
+                .executeTest();
+        launcher.getSubProjectValidator( "integration-tests" )
+                .assertTestSuiteResults( 1, 0, 0, 0 );
+    }
+}
diff --git a/surefire-its/src/test/resources/surefire-1602/application/pom.xml b/surefire-its/src/test/resources/surefire-1602/application/pom.xml
new file mode 100644
index 0000000..d2a9c65
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1602/application/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org</groupId>
+        <artifactId>testapp</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>testapp-application</artifactId>
+</project>
diff --git a/surefire-its/src/test/resources/surefire-1602/integration-tests/pom.xml b/surefire-its/src/test/resources/surefire-1602/integration-tests/pom.xml
new file mode 100644
index 0000000..c2016a2
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1602/integration-tests/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org</groupId>
+        <artifactId>testapp</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>testapp-integration-tests</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org</groupId>
+            <artifactId>testapp-application</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+ <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/surefire-its/src/test/resources/surefire-1602/integration-tests/src/test/java/org/ATest.java b/surefire-its/src/test/resources/surefire-1602/integration-tests/src/test/java/org/ATest.java
new file mode 100644
index 0000000..603c9d5
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1602/integration-tests/src/test/java/org/ATest.java
@@ -0,0 +1,11 @@
+package org;
+
+import org.junit.Test;
+
+public class ATest
+{
+    @Test
+ public void test()
+    {
+ }
+}
diff --git a/surefire-its/src/test/resources/surefire-1602/pom.xml b/surefire-its/src/test/resources/surefire-1602/pom.xml
new file mode 100644
index 0000000..68d120c
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1602/pom.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='utf-8'?>
+<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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org</groupId>
+    <artifactId>testapp</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+    </properties>
+
+    <modules>
+        <module>application</module>
+        <module>unit-tests</module>
+        <module>integration-tests</module>
+    </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${surefire.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/surefire-its/src/test/resources/surefire-1602/unit-tests/pom.xml b/surefire-its/src/test/resources/surefire-1602/unit-tests/pom.xml
new file mode 100644
index 0000000..2e116a1
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1602/unit-tests/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org</groupId>
+        <artifactId>testapp</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>testapp-unit-tests</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org</groupId>
+            <artifactId>testapp-application</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+ <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/surefire-its/src/test/resources/surefire-1602/unit-tests/src/test/java/org/ATest.java b/surefire-its/src/test/resources/surefire-1602/unit-tests/src/test/java/org/ATest.java
new file mode 100644
index 0000000..603c9d5
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1602/unit-tests/src/test/java/org/ATest.java
@@ -0,0 +1,11 @@
+package org;
+
+import org.junit.Test;
+
+public class ATest
+{
+    @Test
+ public void test()
+    {
+ }
+}