This is an automated email from the ASF dual-hosted git repository. apkhmv 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 708068db65 IGNITE-20986 Extract REST, SSL, Compute integration tests to corresponding modules (#2902) 708068db65 is described below commit 708068db65411af1fbd6caf15275a5c9a5afe9be Author: Mikhail <pochat...@users.noreply.github.com> AuthorDate: Thu Nov 30 01:24:48 2023 +0300 IGNITE-20986 Extract REST, SSL, Compute integration tests to corresponding modules (#2902) --- modules/compute/build.gradle | 11 +++++++++++ .../ignite/internal/compute/ItComputeBaseTest.java | 0 .../internal/compute/ItComputeTestBaseEmbedded.java | 0 .../ignite/internal/compute/ItComputeTestStandalone.java | 0 .../ignite/internal/compute/ItLogicalTopologyTest.java | 0 .../resources/units/ignite-it-jobs-1.0-SNAPSHOT.jar | Bin .../resources/units/ignite-jobs-1.0-SNAPSHOT-src.zip | Bin .../resources/units/ignite-ut-job1-1.0-SNAPSHOT.jar | Bin .../resources/units/ignite-ut-job2-1.0-SNAPSHOT.jar | Bin modules/rest/build.gradle | 6 ++++++ .../ignite/internal/rest/AbstractRestTestBase.java | 0 .../internal/rest/ItInitializedClusterRestTest.java | 1 + .../internal/rest/ItNotInitializedClusterRestTest.java | 0 .../ignite/internal/rest}/ItRestAddressReportTest.java | 5 ++--- .../org/apache/ignite/internal/rest/ItRestPortsTest.java | 0 .../java/org/apache/ignite/internal/rest/RestNode.java | 0 .../org/apache/ignite/internal/rest/RestNodeBuilder.java | 0 .../rest/authentication/ItAuthenticationTest.java | 0 .../apache/ignite/internal/rest/ssl/ItRestSslTest.java | 0 .../resources/ignite-config-rest-port-not-default.json | 0 .../rest/src/integrationTest/resources/ssl/client.pfx | Bin 0 -> 2717 bytes .../rest/src/integrationTest/resources/ssl/keystore.p12 | Bin 0 -> 4533 bytes .../rest/src/integrationTest/resources/ssl/server.jks | Bin 0 -> 2392 bytes modules/rest/src/integrationTest/resources/ssl/trust.jks | Bin 0 -> 1199 bytes .../src/integrationTest/resources/ssl/truststore.jks | Bin 0 -> 1738 bytes modules/runner/build.gradle | 5 ----- modules/security/build.gradle | 8 ++++++++ .../java/org/apache/ignite/internal/ssl/ItSslTest.java | 0 .../src/integrationTest/resources/ssl/client.pfx | Bin 0 -> 2717 bytes .../src/integrationTest/resources/ssl/keystore.p12 | Bin 0 -> 4533 bytes .../src/integrationTest/resources/ssl/server.jks | Bin 0 -> 2392 bytes .../security/src/integrationTest/resources/ssl/trust.jks | Bin 0 -> 1199 bytes .../src/integrationTest/resources/ssl/truststore.jks | Bin 0 -> 1738 bytes 33 files changed, 28 insertions(+), 8 deletions(-) diff --git a/modules/compute/build.gradle b/modules/compute/build.gradle index 746c9957ed..3d0057ca1b 100644 --- a/modules/compute/build.gradle +++ b/modules/compute/build.gradle @@ -18,6 +18,7 @@ apply from: "$rootDir/buildscripts/java-core.gradle" apply from: "$rootDir/buildscripts/publishing.gradle" apply from: "$rootDir/buildscripts/java-junit5.gradle" +apply from: "$rootDir/buildscripts/java-integration-test.gradle" dependencies { implementation project(':ignite-api') @@ -40,6 +41,16 @@ dependencies { testImplementation libs.hamcrest.core testImplementation libs.mockito.core testImplementation libs.mockito.junit + + integrationTestImplementation libs.jetbrains.annotations + integrationTestImplementation libs.awaitility + integrationTestImplementation libs.hamcrest.core + integrationTestImplementation project(':ignite-api') + integrationTestImplementation project(':ignite-code-deployment') + integrationTestImplementation project(':ignite-network') + integrationTestImplementation project(':ignite-cluster-management') + integrationTestImplementation testFixtures(project(':ignite-core')) + integrationTestImplementation testFixtures(project(':ignite-runner')) } description = 'ignite-compute' diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeBaseTest.java b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeBaseTest.java similarity index 100% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeBaseTest.java rename to modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeBaseTest.java diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestBaseEmbedded.java b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestBaseEmbedded.java similarity index 100% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestBaseEmbedded.java rename to modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestBaseEmbedded.java diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestStandalone.java b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestStandalone.java similarity index 100% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestStandalone.java rename to modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItComputeTestStandalone.java diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItLogicalTopologyTest.java b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItLogicalTopologyTest.java similarity index 100% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItLogicalTopologyTest.java rename to modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItLogicalTopologyTest.java diff --git a/modules/runner/src/integrationTest/resources/units/ignite-it-jobs-1.0-SNAPSHOT.jar b/modules/compute/src/integrationTest/resources/units/ignite-it-jobs-1.0-SNAPSHOT.jar similarity index 100% rename from modules/runner/src/integrationTest/resources/units/ignite-it-jobs-1.0-SNAPSHOT.jar rename to modules/compute/src/integrationTest/resources/units/ignite-it-jobs-1.0-SNAPSHOT.jar diff --git a/modules/runner/src/integrationTest/resources/units/ignite-jobs-1.0-SNAPSHOT-src.zip b/modules/compute/src/integrationTest/resources/units/ignite-jobs-1.0-SNAPSHOT-src.zip similarity index 100% rename from modules/runner/src/integrationTest/resources/units/ignite-jobs-1.0-SNAPSHOT-src.zip rename to modules/compute/src/integrationTest/resources/units/ignite-jobs-1.0-SNAPSHOT-src.zip diff --git a/modules/runner/src/integrationTest/resources/units/ignite-ut-job1-1.0-SNAPSHOT.jar b/modules/compute/src/integrationTest/resources/units/ignite-ut-job1-1.0-SNAPSHOT.jar similarity index 100% rename from modules/runner/src/integrationTest/resources/units/ignite-ut-job1-1.0-SNAPSHOT.jar rename to modules/compute/src/integrationTest/resources/units/ignite-ut-job1-1.0-SNAPSHOT.jar diff --git a/modules/runner/src/integrationTest/resources/units/ignite-ut-job2-1.0-SNAPSHOT.jar b/modules/compute/src/integrationTest/resources/units/ignite-ut-job2-1.0-SNAPSHOT.jar similarity index 100% rename from modules/runner/src/integrationTest/resources/units/ignite-ut-job2-1.0-SNAPSHOT.jar rename to modules/compute/src/integrationTest/resources/units/ignite-ut-job2-1.0-SNAPSHOT.jar diff --git a/modules/rest/build.gradle b/modules/rest/build.gradle index d3001959ac..4810db7969 100644 --- a/modules/rest/build.gradle +++ b/modules/rest/build.gradle @@ -74,6 +74,7 @@ dependencies { integrationTestImplementation project(':ignite-code-deployment') integrationTestImplementation project(':ignite-runner') integrationTestImplementation testFixtures(project(':ignite-core')) + integrationTestImplementation testFixtures(project(':ignite-runner')) integrationTestImplementation testFixtures(project(':ignite-cluster-management')) integrationTestImplementation testFixtures(project(':ignite-configuration')) integrationTestImplementation testFixtures(project(":ignite-api")) @@ -84,4 +85,9 @@ dependencies { integrationTestImplementation libs.micronaut.http.server.netty integrationTestImplementation libs.typesafe.config integrationTestImplementation libs.swaggerv3.annotations + integrationTestImplementation(libs.jsonpath.assert) { + //IDEA test runner don't apply Gradle dependency resolve strategy, this is just not implemented + //So, exclude asm-core transitive dependency to protect of jar-hell. + exclude group: 'org.ow2.asm', module: 'asm' + } } diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/AbstractRestTestBase.java b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/AbstractRestTestBase.java similarity index 100% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/AbstractRestTestBase.java rename to modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/AbstractRestTestBase.java diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java similarity index 99% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java rename to modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java index 469d9f7e17..d04eafa616 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java +++ b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java @@ -46,6 +46,7 @@ public class ItInitializedClusterRestTest extends AbstractRestTestBase { "(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<maintenance>\\d+)((?<snapshot>-SNAPSHOT)|-(?<alpha>alpha\\d+)|--(?<beta>beta\\d+))?"; @BeforeEach + @Override void setUp(TestInfo testInfo) throws IOException, InterruptedException { super.setUp(testInfo); diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ItNotInitializedClusterRestTest.java b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItNotInitializedClusterRestTest.java similarity index 100% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ItNotInitializedClusterRestTest.java rename to modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItNotInitializedClusterRestTest.java diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/component/ItRestAddressReportTest.java b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItRestAddressReportTest.java similarity index 94% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/component/ItRestAddressReportTest.java rename to modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItRestAddressReportTest.java index 7c5db19216..0012b40018 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/component/ItRestAddressReportTest.java +++ b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItRestAddressReportTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.component; +package org.apache.ignite.internal.rest; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; import static org.hamcrest.MatcherAssert.assertThat; @@ -34,7 +34,6 @@ import org.apache.ignite.IgnitionManager; import org.apache.ignite.InitParameters; import org.apache.ignite.internal.IgniteIntegrationTest; import org.apache.ignite.internal.app.IgniteRunner; -import org.apache.ignite.internal.runner.app.IgniteRunnerTest; import org.apache.ignite.internal.testframework.TestIgnitionManager; import org.apache.ignite.internal.testframework.WorkDirectory; import org.apache.ignite.internal.testframework.WorkDirectoryExtension; @@ -56,7 +55,7 @@ public class ItRestAddressReportTest extends IgniteIntegrationTest { @DisplayName("Should report rest port to the file after RestComponent started") void restPortReportedToFile() throws Exception { // Given configuration with rest port configured rest.port=10333 - Path configPath = Path.of(IgniteRunnerTest.class.getResource("/ignite-config-rest-port-not-default.json").toURI()); + Path configPath = Path.of(ItRestAddressReportTest.class.getResource("/ignite-config-rest-port-not-default.json").toURI()); // When start node CompletableFuture<Ignite> ign = IgniteRunner.start( diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ItRestPortsTest.java b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItRestPortsTest.java similarity index 100% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ItRestPortsTest.java rename to modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ItRestPortsTest.java diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/RestNode.java b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/RestNode.java similarity index 100% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/RestNode.java rename to modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/RestNode.java diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/RestNodeBuilder.java b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/RestNodeBuilder.java similarity index 100% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/RestNodeBuilder.java rename to modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/RestNodeBuilder.java diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/authentication/ItAuthenticationTest.java b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/authentication/ItAuthenticationTest.java similarity index 100% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/authentication/ItAuthenticationTest.java rename to modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/authentication/ItAuthenticationTest.java diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ssl/ItRestSslTest.java b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ssl/ItRestSslTest.java similarity index 100% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ssl/ItRestSslTest.java rename to modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/ssl/ItRestSslTest.java diff --git a/modules/runner/src/integrationTest/resources/ignite-config-rest-port-not-default.json b/modules/rest/src/integrationTest/resources/ignite-config-rest-port-not-default.json similarity index 100% rename from modules/runner/src/integrationTest/resources/ignite-config-rest-port-not-default.json rename to modules/rest/src/integrationTest/resources/ignite-config-rest-port-not-default.json diff --git a/modules/rest/src/integrationTest/resources/ssl/client.pfx b/modules/rest/src/integrationTest/resources/ssl/client.pfx new file mode 100644 index 0000000000..29efdce5a4 Binary files /dev/null and b/modules/rest/src/integrationTest/resources/ssl/client.pfx differ diff --git a/modules/rest/src/integrationTest/resources/ssl/keystore.p12 b/modules/rest/src/integrationTest/resources/ssl/keystore.p12 new file mode 100644 index 0000000000..d929618bd6 Binary files /dev/null and b/modules/rest/src/integrationTest/resources/ssl/keystore.p12 differ diff --git a/modules/rest/src/integrationTest/resources/ssl/server.jks b/modules/rest/src/integrationTest/resources/ssl/server.jks new file mode 100644 index 0000000000..7007256253 Binary files /dev/null and b/modules/rest/src/integrationTest/resources/ssl/server.jks differ diff --git a/modules/rest/src/integrationTest/resources/ssl/trust.jks b/modules/rest/src/integrationTest/resources/ssl/trust.jks new file mode 100644 index 0000000000..e363af2eb8 Binary files /dev/null and b/modules/rest/src/integrationTest/resources/ssl/trust.jks differ diff --git a/modules/rest/src/integrationTest/resources/ssl/truststore.jks b/modules/rest/src/integrationTest/resources/ssl/truststore.jks new file mode 100644 index 0000000000..45052de67f Binary files /dev/null and b/modules/rest/src/integrationTest/resources/ssl/truststore.jks differ diff --git a/modules/runner/build.gradle b/modules/runner/build.gradle index 0f51765238..e6759af308 100644 --- a/modules/runner/build.gradle +++ b/modules/runner/build.gradle @@ -170,11 +170,6 @@ dependencies { integrationTestImplementation libs.disruptor integrationTestImplementation libs.jackson.databind integrationTestImplementation libs.jmh.core - integrationTestImplementation(libs.jsonpath.assert) { - //IDEA test runner don't apply Gradle dependency resolve strategy, this is just not implemented - //So, exclude asm-core transitive dependency to protect of jar-hell. - exclude group: 'org.ow2.asm', module: 'asm' - } integrationTestImplementation libs.typesafe.config integrationTestImplementation libs.netty.common integrationTestImplementation libs.netty.handler diff --git a/modules/security/build.gradle b/modules/security/build.gradle index 634c258117..49bb8d9139 100644 --- a/modules/security/build.gradle +++ b/modules/security/build.gradle @@ -18,6 +18,7 @@ apply from: "$rootDir/buildscripts/java-core.gradle" apply from: "$rootDir/buildscripts/publishing.gradle" apply from: "$rootDir/buildscripts/java-junit5.gradle" +apply from: "$rootDir/buildscripts/java-integration-test.gradle" description = 'ignite-security' @@ -40,4 +41,11 @@ dependencies { testImplementation libs.mockito.junit testImplementation libs.hamcrest.core testImplementation libs.hamcrest.optional + + integrationTestImplementation libs.jetbrains.annotations + integrationTestImplementation project(':ignite-api') + integrationTestImplementation project(':ignite-client') + integrationTestImplementation testFixtures(project(':ignite-jdbc')) + integrationTestImplementation testFixtures(project(':ignite-core')) + integrationTestImplementation testFixtures(project(':ignite-runner')) } diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java b/modules/security/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java similarity index 100% rename from modules/runner/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java rename to modules/security/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java diff --git a/modules/security/src/integrationTest/resources/ssl/client.pfx b/modules/security/src/integrationTest/resources/ssl/client.pfx new file mode 100644 index 0000000000..29efdce5a4 Binary files /dev/null and b/modules/security/src/integrationTest/resources/ssl/client.pfx differ diff --git a/modules/security/src/integrationTest/resources/ssl/keystore.p12 b/modules/security/src/integrationTest/resources/ssl/keystore.p12 new file mode 100644 index 0000000000..d929618bd6 Binary files /dev/null and b/modules/security/src/integrationTest/resources/ssl/keystore.p12 differ diff --git a/modules/security/src/integrationTest/resources/ssl/server.jks b/modules/security/src/integrationTest/resources/ssl/server.jks new file mode 100644 index 0000000000..7007256253 Binary files /dev/null and b/modules/security/src/integrationTest/resources/ssl/server.jks differ diff --git a/modules/security/src/integrationTest/resources/ssl/trust.jks b/modules/security/src/integrationTest/resources/ssl/trust.jks new file mode 100644 index 0000000000..e363af2eb8 Binary files /dev/null and b/modules/security/src/integrationTest/resources/ssl/trust.jks differ diff --git a/modules/security/src/integrationTest/resources/ssl/truststore.jks b/modules/security/src/integrationTest/resources/ssl/truststore.jks new file mode 100644 index 0000000000..45052de67f Binary files /dev/null and b/modules/security/src/integrationTest/resources/ssl/truststore.jks differ