Re-enable code analysis

Author: Aaron Congo

.github/workflows/main.yml

@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   build-driver:
-    name: 'Run standard integration tests'
+    name: 'Run non-container integration tests'
     runs-on: ubuntu-latest
     steps:
       - name: 'Clone repository'
@@ -29,7 +29,7 @@ jobs:
           java-version: 8
 
       - name: 'Run all checks'
-        run: ./gradlew test-integration-basic
+        run: ./gradlew check
 
       - name: 'Generate code coverage report'
         run: ./gradlew jacocoTestReport

driver-proxy/build.gradle.kts

@@ -46,6 +46,11 @@ tasks.check {
     dependsOn("jacocoTestCoverageVerification")
 }
 
+tasks.test {
+    filter.excludeTestsMatching("integration.host.*")
+    filter.excludeTestsMatching("integration.container.*")
+}
+
 checkstyle {
     // Checkstyle versions 7.x, 8.x, and 9.x are supported by JRE version 8 and above.
     toolVersion = "9.3"
@@ -135,13 +140,6 @@ tasks.getByName<Test>("test") {
     systemProperty("java.util.logging.config.file", "${project.buildDir}/resources/test/logging-test.properties")
 }
 
-// Run basic integration tests
-tasks.register<Test>("test-integration-basic") {
-    group = "verification"
-    filter.excludeTestsMatching("integration.host.*")
-    filter.excludeTestsMatching("integration.container.*")
-}
-
 // Run Aurora Postgres integrations tests in container
 tasks.register<Test>("test-integration-aurora-postgres") {
     group = "verification"

driver-proxy/src/test/java/integration/container/aurora/postgres/AuroraPostgresBaseTest.java

@@ -10,6 +10,10 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import eu.rekawek.toxiproxy.Proxy;
+import eu.rekawek.toxiproxy.ToxiproxyClient;
+import integration.util.AuroraTestUtility;
+import integration.util.ContainerHelper;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -32,10 +36,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.postgresql.PGProperty;
-import eu.rekawek.toxiproxy.Proxy;
-import eu.rekawek.toxiproxy.ToxiproxyClient;
-import integration.util.AuroraTestUtility;
-import integration.util.ContainerHelper;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.services.rds.RdsClient;
 import software.amazon.awssdk.services.rds.model.DBCluster;

driver-proxy/src/test/java/integration/container/standard/postgres/StandardPostgresBaseTest.java

@@ -6,6 +6,9 @@
 
 package integration.container.standard.postgres;
 
+import eu.rekawek.toxiproxy.Proxy;
+import eu.rekawek.toxiproxy.ToxiproxyClient;
+import integration.util.ContainerHelper;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -16,9 +19,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.postgresql.PGProperty;
-import eu.rekawek.toxiproxy.Proxy;
-import eu.rekawek.toxiproxy.ToxiproxyClient;
-import integration.util.ContainerHelper;
 
 public class StandardPostgresBaseTest {
   protected static final String DB_CONN_STR_PREFIX = "aws-proxy-jdbc:postgresql://";

driver-proxy/src/test/java/integration/host/AuroraPostgresContainerTest.java

@@ -6,6 +6,8 @@
 
 package integration.host;
 
+import integration.util.AuroraTestUtility;
+import integration.util.ContainerHelper;
 import java.io.IOException;
 import java.net.UnknownHostException;
 import java.sql.SQLException;
@@ -18,8 +20,6 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.ToxiproxyContainer;
-import integration.util.AuroraTestUtility;
-import integration.util.ContainerHelper;
 import software.aws.rds.jdbc.proxydriver.util.StringUtils;
 
 /**

driver-proxy/src/test/java/integration/host/StandardPostgresContainerTest.java

@@ -7,6 +7,7 @@
 package integration.host;
 
 import com.mysql.cj.util.StringUtils;
+import integration.util.ContainerHelper;
 import java.io.IOException;
 import java.sql.SQLException;
 import org.junit.jupiter.api.AfterAll;
@@ -16,7 +17,6 @@
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.containers.ToxiproxyContainer;
-import integration.util.ContainerHelper;
 
 public class StandardPostgresContainerTest {
 

driver-proxy/src/test/java/integration/util/ContainerHelper.java

@@ -12,6 +12,8 @@
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.DockerException;
+import eu.rekawek.toxiproxy.Proxy;
+import eu.rekawek.toxiproxy.model.ToxicDirection;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -41,8 +43,6 @@
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 import org.testcontainers.utility.TestEnvironment;
-import eu.rekawek.toxiproxy.Proxy;
-import eu.rekawek.toxiproxy.model.ToxicDirection;
 
 public class ContainerHelper {
   private static final String TEST_CONTAINER_IMAGE_NAME = "openjdk:8-jdk-alpine";