build: Move integration tests into separate test suite.

build.gradle.kts

@@ -38,6 +38,50 @@ java {
     withJavadocJar()
 }
 
+// Configure multiple test sources
+testing {
+    suites {
+        // Just for self reference, technically this is already configured by default.
+        val test by getting(JvmTestSuite::class) {
+            useJUnitJupiter() // already the default.
+            testType.set(TestSuiteType.UNIT_TEST) // already the default.
+        }
+
+        // testIntegration test sources
+        val testIntegration by registering(JvmTestSuite::class) {
+            val self = this
+            testType.set(TestSuiteType.INTEGRATION_TEST)
+
+            // We need to manually add the "main" sources to the classpath.
+            sourceSets {
+                named(self.name) {
+                    compileClasspath += sourceSets.main.get().output + sourceSets.test.get().output
+                    runtimeClasspath += sourceSets.main.get().output + sourceSets.test.get().output
+                }
+            }
+
+            // Inherit implementation, runtime and test dependencies (adds them to the compile classpath)
+            configurations.named("${self.name}Implementation") {
+                extendsFrom(configurations.testImplementation.get())
+                extendsFrom(configurations.runtimeOnly.get())
+                extendsFrom(configurations.implementation.get())
+            }
+
+            // Make sure the integration test is executed as part of the "check" task.
+            tasks.named<Task>("check") {
+                dependsOn(named<JvmTestSuite>(self.name))
+            }
+
+            tasks.named<Task>(self.name) {
+                mustRunAfter(test)
+            }
+
+        }
+    }
+
+
+}
+
 dependencies {
     api(platform("software.amazon.awssdk:bom:2.16.28")) {
         // Change the `AWS_VERSION` in ./docs/mkocs.yaml file.
@@ -142,6 +186,10 @@ tasks {
         }
     }
 
+    named<Task>("check") {
+        dependsOn(named<Task>("testIntegration"))
+    }
+
     named<Task>("jacocoTestReport") {
         group = "jacoco"
         dependsOn(named("test")) // tests are required to run before generating the report
@@ -164,32 +212,10 @@ tasks {
         group = "sonar"
     }
 
-    named<Test>("test") {
-        description = "Run unit tests"
-        outputs.upToDateWhen { false }
-        useJUnitPlatform {
-            filter {
-                excludeTestsMatching("*IT")
-            }
-        }
-    }
-
     withType<Test> {
         defaultCharacterEncoding = "UTF-8"
     }
 
-    create<Test>("it-s3") {
-        group = "verification"
-        description = "Run integration tests using S3"
-        useJUnitPlatform {
-            filter {
-                includeTestsMatching("*IT")
-                includeTags("it-s3")
-            }
-        }
-        mustRunAfter(named("test"))
-    }
-
     // TODO: There are some problems with using minio that overcomplicate the setup.
     //       For the time being we'll be disabling it until we figure out the best path forward.
 //    create<Test>("it-minio") {
@@ -203,10 +229,6 @@ tasks {
 //        }
 //    }
 
-    named<Task>("check") {
-        dependsOn(named("it-s3"))
-    }
-
     withType<Sign> {
         onlyIf {
             (project.hasProperty("withSignature") && project.findProperty("withSignature") == "true") ||

src/test/java/org/carlspring/cloud/storage/s3fs/S3ClientIT.java → src/testIntegration/java/org/carlspring/cloud/storage/s3fs/S3ClientIT.java

@@ -40,7 +40,7 @@ class S3ClientIT extends BaseIntegrationTest
     public void setup()
     {
         // s3client
-        final Map<String, Object> credentials = getRealEnv();
+        final Map<String, Object> credentials = EnvironmentBuilder.getRealEnv();
 
         final AwsCredentials credentialsS3 = AwsBasicCredentials.create(credentials.get(ACCESS_KEY).toString(),
                                                                         credentials.get(SECRET_KEY).toString());