NIFI-9770 Renamed a few tests to make them into integration tests since they require Docker.

MikeThomsen · MikeThomsen · commit d48999ecd3bd · 2025-06-11T16:13:06.000-04:00
diff --git a/nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/AbstractTestCassandraCQLExecutionService.java b/nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/AbstractTestCassandraCQLExecutionService.java
@@ -277,7 +277,7 @@ private static String getKeyEncoded(final Key key) {
     }
 
     private static Path writeCertificateEncoded(final String certificateEncoded) throws IOException {
-        final Path certificateFile = Files.createTempFile(TestCassandraCQLExecutionServiceV3.class.getSimpleName(), ".crt");
+        final Path certificateFile = Files.createTempFile(AbstractTestCassandraCQLExecutionService.class.getSimpleName(), ".crt");
         Files.write(certificateFile, certificateEncoded.getBytes(StandardCharsets.UTF_8));
         certificateFile.toFile().deleteOnExit();
         return certificateFile;
diff --git a/nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/CassandraCQLExecutionServiceV3IT.java b/nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/CassandraCQLExecutionServiceV3IT.java
@@ -20,7 +20,7 @@
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 @Testcontainers
-public class TestCassandraCQLExecutionServiceV3 extends AbstractTestCassandraCQLExecutionService {
+public class CassandraCQLExecutionServiceV3IT extends AbstractTestCassandraCQLExecutionService {
     public static final String CASSANDRA_IMAGE = "cassandra:3.11";
 
     @BeforeAll
diff --git a/nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/CassandraCQLExecutionServiceV4IT.java b/nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/CassandraCQLExecutionServiceV4IT.java
@@ -20,7 +20,7 @@
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 @Testcontainers
-public class TestCassandraCQLExecutionServiceV4 extends AbstractTestCassandraCQLExecutionService {
+public class CassandraCQLExecutionServiceV4IT extends AbstractTestCassandraCQLExecutionService {
     public static String CASSANDRA_IMAGE = "cassandra:4.1";
 
     @BeforeAll
diff --git a/nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/CassandraCQLExecutionServiceV5IT.java b/nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/CassandraCQLExecutionServiceV5IT.java
@@ -21,7 +21,7 @@
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 @Testcontainers
-public class TestCassandraCQLExecutionServiceV5 extends AbstractTestCassandraCQLExecutionService {
+public class CassandraCQLExecutionServiceV5IT extends AbstractTestCassandraCQLExecutionService {
     public static final String CASSANDRA_IMAGE = "cassandra:5.0";
 
     @BeforeAll
diff --git a/nifi-extension-bundles/nifi-cql-bundle/nifi-scylladb-session-provider-service/src/test/java/org/apache/nifi/service/ScyllaDBCQLExecutionServiceIT.java b/nifi-extension-bundles/nifi-cql-bundle/nifi-scylladb-session-provider-service/src/test/java/org/apache/nifi/service/ScyllaDBCQLExecutionServiceIT.java
@@ -65,7 +65,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 @Testcontainers
-public class TestScyllaDBCQLExecutionservice {
+public class ScyllaDBCQLExecutionServiceIT {
     public static final String CASSANDRA_IMAGE = "scylladb/scylla:6.2";
 
     public static final String adminPassword = UUID.randomUUID().toString();
@@ -326,7 +326,7 @@ private static String getKeyEncoded(final Key key) {
     }
 
     private static Path writeCertificateEncoded(final String certificateEncoded, String extension) throws IOException {
-        final Path certificateFile = Files.createTempFile(TestScyllaDBCQLExecutionservice.class.getSimpleName(), extension);
+        final Path certificateFile = Files.createTempFile(ScyllaDBCQLExecutionServiceIT.class.getSimpleName(), extension);
         Files.write(certificateFile, certificateEncoded.getBytes(StandardCharsets.UTF_8));
         certificateFile.toFile().deleteOnExit();
         return certificateFile;

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ private static String getKeyEncoded(final Key key) {`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`private static Path writeCertificateEncoded(final String certificateEncoded) throws IOException {`
`280`		`- final Path certificateFile = Files.createTempFile(TestCassandraCQLExecutionServiceV3.class.getSimpleName(), ".crt");`
	`280`	`+ final Path certificateFile = Files.createTempFile(AbstractTestCassandraCQLExecutionService.class.getSimpleName(), ".crt");`
`281`	`281`	`Files.write(certificateFile, certificateEncoded.getBytes(StandardCharsets.UTF_8));`
`282`	`282`	`certificateFile.toFile().deleteOnExit();`
`283`	`283`	`return certificateFile;`