You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ib...@apache.org on 2021/02/05 09:44:00 UTC
[ignite-3] branch main updated: IGNITE-14123 Separate integration
tests from unit tests (#46)
This is an automated email from the ASF dual-hosted git repository.
ibessonov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new ba5471a IGNITE-14123 Separate integration tests from unit tests (#46)
ba5471a is described below
commit ba5471a8e9bff7e70266162ca0a0d0ebab21f56b
Author: Semyon Danilov <sa...@yandex.ru>
AuthorDate: Fri Feb 5 12:43:50 2021 +0300
IGNITE-14123 Separate integration tests from unit tests (#46)
---
.../processor/internal/AbstractProcessorTest.java | 0
.../processor/internal/ConfigSet.java | 0
.../processor/internal/HasFieldMatcher.java | 0
.../processor/internal/HasMethodMatcher.java | 0
.../processor/internal/ITProcessorTest.java} | 4 +-
.../processor/internal/ParsedClass.java | 0
.../configuration/processor/internal/Types.java | 0
.../internal/TestConfigurationSchema.java | 0
parent/pom.xml | 86 +++++++++++++++++++++-
9 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/AbstractProcessorTest.java b/modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/AbstractProcessorTest.java
similarity index 100%
rename from modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/AbstractProcessorTest.java
rename to modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/AbstractProcessorTest.java
diff --git a/modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/ConfigSet.java b/modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/ConfigSet.java
similarity index 100%
rename from modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/ConfigSet.java
rename to modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/ConfigSet.java
diff --git a/modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/HasFieldMatcher.java b/modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/HasFieldMatcher.java
similarity index 100%
rename from modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/HasFieldMatcher.java
rename to modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/HasFieldMatcher.java
diff --git a/modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/HasMethodMatcher.java b/modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/HasMethodMatcher.java
similarity index 100%
rename from modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/HasMethodMatcher.java
rename to modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/HasMethodMatcher.java
diff --git a/modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/ProcessorTest.java b/modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/ITProcessorTest.java
similarity index 98%
rename from modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/ProcessorTest.java
rename to modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/ITProcessorTest.java
index f227e7a..5dfa487 100644
--- a/modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/ProcessorTest.java
+++ b/modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/ITProcessorTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test for basic code generation scenarios.
*/
-public class ProcessorTest extends AbstractProcessorTest {
+public class ITProcessorTest extends AbstractProcessorTest {
/**
* The simplest test for code generation.
*/
@@ -80,7 +80,7 @@ public class ProcessorTest extends AbstractProcessorTest {
);
String initTypeName = Types.typeName(packageName, "InitTest");
-
+
MatcherAssert.assertThat(
classSet.getInitClass(),
hasMethods(
diff --git a/modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/ParsedClass.java b/modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/ParsedClass.java
similarity index 100%
rename from modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/ParsedClass.java
rename to modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/ParsedClass.java
diff --git a/modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/Types.java b/modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/Types.java
similarity index 100%
rename from modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/Types.java
rename to modules/configuration-annotation-processor/src/integrationTest/java/org/apache/ignite/configuration/processor/internal/Types.java
diff --git a/modules/configuration-annotation-processor/src/test/resources/org/apache/ignite/configuration/processor/internal/TestConfigurationSchema.java b/modules/configuration-annotation-processor/src/integrationTest/resources/org/apache/ignite/configuration/processor/internal/TestConfigurationSchema.java
similarity index 100%
rename from modules/configuration-annotation-processor/src/test/resources/org/apache/ignite/configuration/processor/internal/TestConfigurationSchema.java
rename to modules/configuration-annotation-processor/src/integrationTest/resources/org/apache/ignite/configuration/processor/internal/TestConfigurationSchema.java
diff --git a/parent/pom.xml b/parent/pom.xml
index 4eb9707..be18342 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -78,12 +78,14 @@
<launch.mave.plugin.version>1.7.25</launch.mave.plugin.version>
<maven.antrun.plugin.version>3.0.0</maven.antrun.plugin.version>
<maven.assembly.plugin.version>3.2.0</maven.assembly.plugin.version>
+ <maven.build-helper.plugin.version>3.1.0</maven.build-helper.plugin.version>
<maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
+ <maven.failsafe.plugin.version>3.0.0-M5</maven.failsafe.plugin.version>
<maven.pmd.plugin.version>3.14.0</maven.pmd.plugin.version>
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
- <maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version>
+ <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
</properties>
<distributionManagement>
@@ -251,11 +253,17 @@
<version>${maven.compiler.plugin.version}</version>
</plugin>
- <!--plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin.version}</version>
- </plugin-->
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${maven.build-helper.plugin.version}</version>
+ </plugin>
<!--plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -273,6 +281,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven.failsafe.plugin.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly.plugin.version}</version>
</plugin>
@@ -326,6 +340,72 @@
</rulesets>
</configuration>
</plugin>
+
+ <!--
+ Plugin that adds integration test sources and resources from integrationTest directory.
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/integrationTest/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-test-resource</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>add-test-resource</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>src/integrationTest/resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!--
+ Plugin for unit testing.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/IT*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <!--
+ Plugin for integration testing.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>