This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch MNG-7129-maven-caching
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-7129-maven-caching by this
push:
new 8f60781 Move integration tests into the extension module
8f60781 is described below
commit 8f60781cfa3c10988d9bcdb35e998e90d69e61c9
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Dec 10 09:06:37 2021 +0100
Move integration tests into the extension module
---
maven-caching-extension/pom.xml | 37 ++++++++++++
.../maven/caching/its}/BuildExtensionTest.java | 6 +-
.../maven/caching/its}/CoreExtensionTest.java | 6 +-
.../maven/caching/its}/junit/IntegrationTest.java | 2 +-
.../its}/junit/IntegrationTestExtension.java | 7 +--
.../org/apache/maven/caching/its}/junit/Test.java | 2 +-
.../build-extension}/.mvn/maven-cache-config.xml | 0
.../src/test/projects/build-extension/pom.xml | 0
.../main/java/org/apache/maven/caching/Test.java | 0
.../projects/core-extension/.mvn/extensions.xml | 0
.../core-extension}/.mvn/maven-cache-config.xml | 0
.../src/test/projects/core-extension/pom.xml | 0
.../main/java/org/apache/maven/caching/Test.java | 0
maven-caching-its/pom.xml | 69 ----------------------
pom.xml | 1 -
15 files changed, 48 insertions(+), 82 deletions(-)
diff --git a/maven-caching-extension/pom.xml b/maven-caching-extension/pom.xml
index 5e54668..1891a3d 100644
--- a/maven-caching-extension/pom.xml
+++ b/maven-caching-extension/pom.xml
@@ -93,6 +93,12 @@ under the License.
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-verifier</artifactId>
+ <version>1.7.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -152,6 +158,37 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M5</version>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <excludes>**/its/**</excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <includes>**/its/**</includes>
+ <systemPropertyVariables>
+
<project.version>${project.version}</project.version>
+
<maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git
a/maven-caching-its/src/test/java/org/apache/maven/caching/BuildExtensionTest.java
b/maven-caching-extension/src/test/java/org/apache/maven/caching/its/BuildExtensionTest.java
similarity index 90%
rename from
maven-caching-its/src/test/java/org/apache/maven/caching/BuildExtensionTest.java
rename to
maven-caching-extension/src/test/java/org/apache/maven/caching/its/BuildExtensionTest.java
index 42a0b86..e3b7231 100644
---
a/maven-caching-its/src/test/java/org/apache/maven/caching/BuildExtensionTest.java
+++
b/maven-caching-extension/src/test/java/org/apache/maven/caching/its/BuildExtensionTest.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.caching.its;
-import org.apache.maven.caching.junit.IntegrationTest;
-import org.apache.maven.caching.junit.Test;
+import org.apache.maven.caching.its.junit.IntegrationTest;
+import org.apache.maven.caching.its.junit.Test;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
diff --git
a/maven-caching-its/src/test/java/org/apache/maven/caching/CoreExtensionTest.java
b/maven-caching-extension/src/test/java/org/apache/maven/caching/its/CoreExtensionTest.java
similarity index 90%
rename from
maven-caching-its/src/test/java/org/apache/maven/caching/CoreExtensionTest.java
rename to
maven-caching-extension/src/test/java/org/apache/maven/caching/its/CoreExtensionTest.java
index 7166b93..afe8a0c 100644
---
a/maven-caching-its/src/test/java/org/apache/maven/caching/CoreExtensionTest.java
+++
b/maven-caching-extension/src/test/java/org/apache/maven/caching/its/CoreExtensionTest.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.caching.its;
-import org.apache.maven.caching.junit.IntegrationTest;
-import org.apache.maven.caching.junit.Test;
+import org.apache.maven.caching.its.junit.IntegrationTest;
+import org.apache.maven.caching.its.junit.Test;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
diff --git
a/maven-caching-its/src/test/java/org/apache/maven/caching/junit/IntegrationTest.java
b/maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/IntegrationTest.java
similarity index 96%
rename from
maven-caching-its/src/test/java/org/apache/maven/caching/junit/IntegrationTest.java
rename to
maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/IntegrationTest.java
index a586deb..cfb6574 100644
---
a/maven-caching-its/src/test/java/org/apache/maven/caching/junit/IntegrationTest.java
+++
b/maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/IntegrationTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.junit;
+package org.apache.maven.caching.its.junit;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git
a/maven-caching-its/src/test/java/org/apache/maven/caching/junit/IntegrationTestExtension.java
b/maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/IntegrationTestExtension.java
similarity index 97%
rename from
maven-caching-its/src/test/java/org/apache/maven/caching/junit/IntegrationTestExtension.java
rename to
maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/IntegrationTestExtension.java
index 86da423..eed0507 100644
---
a/maven-caching-its/src/test/java/org/apache/maven/caching/junit/IntegrationTestExtension.java
+++
b/maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/IntegrationTestExtension.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.junit;
+package org.apache.maven.caching.its.junit;
import java.io.IOException;
import java.lang.reflect.Method;
@@ -31,7 +31,6 @@ import java.util.stream.Stream;
import org.apache.maven.caching.CacheUtils;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
-import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.Extension;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -62,12 +61,12 @@ public class IntegrationTestExtension implements
BeforeAllCallback, TestTemplate
public boolean supportsTestTemplate( ExtensionContext context )
{
return context.getTestMethod()
- .filter( m -> m.isAnnotationPresent(
org.apache.maven.caching.junit.Test.class ) )
+ .filter( m -> m.isAnnotationPresent( Test.class ) )
.isPresent();
}
@Override
- public java.util.stream.Stream<TestTemplateInvocationContext>
provideTestTemplateInvocationContexts(
+ public Stream<TestTemplateInvocationContext>
provideTestTemplateInvocationContexts(
ExtensionContext extensionContext )
{
Method m = extensionContext.getRequiredTestMethod();
diff --git
a/maven-caching-its/src/test/java/org/apache/maven/caching/junit/Test.java
b/maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/Test.java
similarity index 96%
rename from
maven-caching-its/src/test/java/org/apache/maven/caching/junit/Test.java
rename to
maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/Test.java
index a7a270d..4423545 100644
--- a/maven-caching-its/src/test/java/org/apache/maven/caching/junit/Test.java
+++
b/maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.junit;
+package org.apache.maven.caching.its.junit;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git
a/maven-caching-its/src/test/projects/core-extension/.mvn/maven-cache-config.xml
b/maven-caching-extension/src/test/projects/build-extension/.mvn/maven-cache-config.xml
similarity index 100%
rename from
maven-caching-its/src/test/projects/core-extension/.mvn/maven-cache-config.xml
rename to
maven-caching-extension/src/test/projects/build-extension/.mvn/maven-cache-config.xml
diff --git a/maven-caching-its/src/test/projects/build-extension/pom.xml
b/maven-caching-extension/src/test/projects/build-extension/pom.xml
similarity index 100%
rename from maven-caching-its/src/test/projects/build-extension/pom.xml
rename to maven-caching-extension/src/test/projects/build-extension/pom.xml
diff --git
a/maven-caching-its/src/test/projects/core-extension/src/main/java/org/apache/maven/caching/Test.java
b/maven-caching-extension/src/test/projects/build-extension/src/main/java/org/apache/maven/caching/Test.java
similarity index 100%
rename from
maven-caching-its/src/test/projects/core-extension/src/main/java/org/apache/maven/caching/Test.java
rename to
maven-caching-extension/src/test/projects/build-extension/src/main/java/org/apache/maven/caching/Test.java
diff --git
a/maven-caching-its/src/test/projects/core-extension/.mvn/extensions.xml
b/maven-caching-extension/src/test/projects/core-extension/.mvn/extensions.xml
similarity index 100%
rename from
maven-caching-its/src/test/projects/core-extension/.mvn/extensions.xml
rename to
maven-caching-extension/src/test/projects/core-extension/.mvn/extensions.xml
diff --git
a/maven-caching-its/src/test/projects/build-extension/.mvn/maven-cache-config.xml
b/maven-caching-extension/src/test/projects/core-extension/.mvn/maven-cache-config.xml
similarity index 100%
rename from
maven-caching-its/src/test/projects/build-extension/.mvn/maven-cache-config.xml
rename to
maven-caching-extension/src/test/projects/core-extension/.mvn/maven-cache-config.xml
diff --git a/maven-caching-its/src/test/projects/core-extension/pom.xml
b/maven-caching-extension/src/test/projects/core-extension/pom.xml
similarity index 100%
rename from maven-caching-its/src/test/projects/core-extension/pom.xml
rename to maven-caching-extension/src/test/projects/core-extension/pom.xml
diff --git
a/maven-caching-its/src/test/projects/build-extension/src/main/java/org/apache/maven/caching/Test.java
b/maven-caching-extension/src/test/projects/core-extension/src/main/java/org/apache/maven/caching/Test.java
similarity index 100%
rename from
maven-caching-its/src/test/projects/build-extension/src/main/java/org/apache/maven/caching/Test.java
rename to
maven-caching-extension/src/test/projects/core-extension/src/main/java/org/apache/maven/caching/Test.java
diff --git a/maven-caching-its/pom.xml b/maven-caching-its/pom.xml
deleted file mode 100644
index a302e23..0000000
--- a/maven-caching-its/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.caching</groupId>
- <artifactId>maven-caching</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>maven-caching-its</artifactId>
-
- <name>Maven Caching Integration Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.caching</groupId>
- <artifactId>maven-caching-extension</artifactId>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-verifier</artifactId>
- <version>1.7.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <project.version>${project.version}</project.version>
-
<maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
- </systemPropertyVariables>
- <rerunFailingTestsCount>2</rerunFailingTestsCount>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/pom.xml b/pom.xml
index 324a55e..0eb3450 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,6 @@ under the License.
<modules>
<module>maven-caching-extension</module>
- <module>maven-caching-its</module>
</modules>
<dependencyManagement>
