Fix tests failing on Jenkins

lukasz-antoniak · lukasz-antoniak · commit c2372bb61652 · 2024-07-04T09:44:12.000+02:00
diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/Version.java b/core/src/main/java/com/datastax/oss/driver/api/core/Version.java
@@ -54,7 +54,6 @@ public class Version implements Comparable<Version>, Serializable {
   @NonNull public static final Version V4_0_0 = Objects.requireNonNull(parse("4.0.0"));
   @NonNull public static final Version V4_1_0 = Objects.requireNonNull(parse("4.1.0"));
   @NonNull public static final Version V5_0_0 = Objects.requireNonNull(parse("5.0.0"));
-  @NonNull public static final Version V6_0_0 = Objects.requireNonNull(parse("6.0.0"));
   @NonNull public static final Version V6_7_0 = Objects.requireNonNull(parse("6.7.0"));
   @NonNull public static final Version V6_8_0 = Objects.requireNonNull(parse("6.8.0"));
 
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/compression/DirectCompressionIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/compression/DirectCompressionIT.java
@@ -74,11 +74,9 @@ public static void setup() {
   @Test
   public void should_execute_queries_with_snappy_compression() throws Exception {
     Assume.assumeTrue(
-        "Snappy is not supported in OSS C* 4.0+ with protocol v5 and DSE before 6.0",
-        (CCM_RULE.getDseVersion().isPresent()
-                && CCM_RULE.getDseVersion().get().nextStable().compareTo(Version.V6_0_0) >= 0)
-            || (!CCM_RULE.getDseVersion().isPresent()
-                && CCM_RULE.getCassandraVersion().nextStable().compareTo(Version.V4_0_0) < 0));
+        "Snappy is not supported in OSS C* 4.0+ with protocol v5",
+        CCM_RULE.getDseVersion().isPresent()
+            || CCM_RULE.getCassandraVersion().nextStable().compareTo(Version.V4_0_0) < 0);
     createAndCheckCluster("snappy");
   }
 
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/compression/HeapCompressionIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/compression/HeapCompressionIT.java
@@ -78,11 +78,9 @@ public static void setup() {
   @Test
   public void should_execute_queries_with_snappy_compression() throws Exception {
     Assume.assumeTrue(
-        "Snappy is not supported in OSS C* 4.0+ with protocol v5 and DSE before 6.0",
-        (CCM_RULE.getDseVersion().isPresent()
-                && CCM_RULE.getDseVersion().get().nextStable().compareTo(Version.V6_0_0) >= 0)
-            || (!CCM_RULE.getDseVersion().isPresent()
-                && CCM_RULE.getCassandraVersion().nextStable().compareTo(Version.V4_0_0) < 0));
+        "Snappy is not supported in OSS C* 4.0+ with protocol v5",
+        CCM_RULE.getDseVersion().isPresent()
+            || CCM_RULE.getCassandraVersion().nextStable().compareTo(Version.V4_0_0) < 0);
     createAndCheckCluster("snappy");
   }
 
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/CustomResultTypeIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/CustomResultTypeIT.java
@@ -64,7 +64,7 @@ public class CustomResultTypeIT extends InventoryITBase {
   public static void setup() {
     CqlSession session = SESSION_RULE.session();
 
-    for (String query : createStatements(CCM_RULE, false)) {
+    for (String query : createStatements(CCM_RULE)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());
     }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/DeleteIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/DeleteIT.java
@@ -75,7 +75,7 @@ public class DeleteIT extends InventoryITBase {
   public static void setup() {
     CqlSession session = SESSION_RULE.session();
 
-    for (String query : createStatements(CCM_RULE, false)) {
+    for (String query : createStatements(CCM_RULE)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());
     }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/DeleteReactiveIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/DeleteReactiveIT.java
@@ -70,7 +70,7 @@ private static CustomCcmRule.Builder configureCcm(CustomCcmRule.Builder builder)
   public static void setup() {
     CqlSession session = sessionRule.session();
 
-    for (String query : createStatements(ccmRule, false)) {
+    for (String query : createStatements(ccmRule)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(sessionRule.slowProfile()).build());
     }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/FluentEntityIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/FluentEntityIT.java
@@ -64,7 +64,7 @@ public class FluentEntityIT extends InventoryITBase {
   public static void setup() {
     CqlSession session = SESSION_RULE.session();
 
-    for (String query : createStatements(CCM_RULE, false)) {
+    for (String query : createStatements(CCM_RULE)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());
     }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/GetEntityIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/GetEntityIT.java
@@ -70,7 +70,7 @@ public class GetEntityIT extends InventoryITBase {
   public static void setup() {
     CqlSession session = SESSION_RULE.session();
 
-    for (String query : createStatements(CCM_RULE, false)) {
+    for (String query : createStatements(CCM_RULE)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());
     }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/ImmutableEntityIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/ImmutableEntityIT.java
@@ -73,7 +73,7 @@ public static void setup() {
 
     SchemaChangeSynchronizer.withLock(
         () -> {
-          for (String query : createStatements(CCM_RULE, false)) {
+          for (String query : createStatements(CCM_RULE)) {
             session.execute(
                 SimpleStatement.builder(query)
                     .setExecutionProfile(SESSION_RULE.slowProfile())
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/InsertIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/InsertIT.java
@@ -66,7 +66,7 @@ public class InsertIT extends InventoryITBase {
   public static void setup() {
     CqlSession session = SESSION_RULE.session();
 
-    for (String query : createStatements(CCM_RULE, false)) {
+    for (String query : createStatements(CCM_RULE)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());
     }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/InsertReactiveIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/InsertReactiveIT.java
@@ -61,7 +61,7 @@ public class InsertReactiveIT extends InventoryITBase {
   public static void setup() {
     CqlSession session = sessionRule.session();
 
-    for (String query : createStatements(ccmRule, false)) {
+    for (String query : createStatements(ccmRule)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(sessionRule.slowProfile()).build());
     }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/InventoryITBase.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/InventoryITBase.java
@@ -58,6 +58,10 @@ public abstract class InventoryITBase {
   protected static ProductSale MP3_DOWNLOAD_SALE_1 =
       new ProductSale(MP3_DOWNLOAD.getId(), DATE_3, 7, Uuids.startOf(915192000), 0.99, 12);
 
+  protected static List<String> createStatements(BaseCcmRule ccmRule) {
+    return createStatements(ccmRule, false);
+  }
+
   protected static List<String> createStatements(BaseCcmRule ccmRule, boolean requiresSasiIndex) {
     ImmutableList.Builder<String> builder =
         ImmutableList.<String>builder()
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SchemaValidationIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SchemaValidationIT.java
@@ -102,7 +102,7 @@ public static void setup() {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(sessionRule.slowProfile()).build());
     }
-    for (String query : createStatements(ccm, false)) {
+    for (String query : createStatements(ccm)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(sessionRule.slowProfile()).build());
     }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectIT.java
@@ -64,7 +64,7 @@ public class SelectIT extends InventoryITBase {
   public static void setup() {
     CqlSession session = SESSION_RULE.session();
 
-    for (String query : createStatements(CCM_RULE, false)) {
+    for (String query : createStatements(CCM_RULE)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());
     }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectReactiveIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectReactiveIT.java
@@ -64,7 +64,7 @@ public static void setup() {
 
     SchemaChangeSynchronizer.withLock(
         () -> {
-          for (String query : createStatements(ccmRule, false)) {
+          for (String query : createStatements(ccmRule)) {
             session.execute(
                 SimpleStatement.builder(query)
                     .setExecutionProfile(sessionRule.slowProfile())
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SetEntityIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SetEntityIT.java
@@ -61,7 +61,7 @@ public class SetEntityIT extends InventoryITBase {
   public static void setup() {
     CqlSession session = SESSION_RULE.session();
 
-    for (String query : createStatements(CCM_RULE, false)) {
+    for (String query : createStatements(CCM_RULE)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());
     }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/UpdateCustomIfClauseIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/UpdateCustomIfClauseIT.java
@@ -67,7 +67,7 @@ public class UpdateCustomIfClauseIT extends InventoryITBase {
   public static void setup() {
     CqlSession session = SESSION_RULE.session();
 
-    for (String query : createStatements(CCM_RULE, false)) {
+    for (String query : createStatements(CCM_RULE)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());
     }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/UpdateIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/UpdateIT.java
@@ -68,7 +68,7 @@ public static void setup() {
     CqlSession session = SESSION_RULE.session();
     SchemaChangeSynchronizer.withLock(
         () -> {
-          for (String query : createStatements(CCM_RULE, false)) {
+          for (String query : createStatements(CCM_RULE)) {
             session.execute(
                 SimpleStatement.builder(query)
                     .setExecutionProfile(SESSION_RULE.slowProfile())
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/UpdateReactiveIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/UpdateReactiveIT.java
@@ -68,7 +68,7 @@ public class UpdateReactiveIT extends InventoryITBase {
   public static void setup() {
     CqlSession session = sessionRule.session();
 
-    for (String query : createStatements(ccmRule, false)) {
+    for (String query : createStatements(ccmRule)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(sessionRule.slowProfile()).build());
     }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public class CustomResultTypeIT extends InventoryITBase {`
`64`	`64`	`public static void setup() {`
`65`	`65`	`CqlSession session = SESSION_RULE.session();`
`66`	`66`
`67`		`- for (String query : createStatements(CCM_RULE, false)) {`
	`67`	`+ for (String query : createStatements(CCM_RULE)) {`
`68`	`68`	`session.execute(`
`69`	`69`	`SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public class DeleteIT extends InventoryITBase {`
`75`	`75`	`public static void setup() {`
`76`	`76`	`CqlSession session = SESSION_RULE.session();`
`77`	`77`
`78`		`- for (String query : createStatements(CCM_RULE, false)) {`
	`78`	`+ for (String query : createStatements(CCM_RULE)) {`
`79`	`79`	`session.execute(`
`80`	`80`	`SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ private static CustomCcmRule.Builder configureCcm(CustomCcmRule.Builder builder)`
`70`	`70`	`public static void setup() {`
`71`	`71`	`CqlSession session = sessionRule.session();`
`72`	`72`
`73`		`- for (String query : createStatements(ccmRule, false)) {`
	`73`	`+ for (String query : createStatements(ccmRule)) {`
`74`	`74`	`session.execute(`
`75`	`75`	`SimpleStatement.builder(query).setExecutionProfile(sessionRule.slowProfile()).build());`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public class FluentEntityIT extends InventoryITBase {`
`64`	`64`	`public static void setup() {`
`65`	`65`	`CqlSession session = SESSION_RULE.session();`
`66`	`66`
`67`		`- for (String query : createStatements(CCM_RULE, false)) {`
	`67`	`+ for (String query : createStatements(CCM_RULE)) {`
`68`	`68`	`session.execute(`
`69`	`69`	`SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public class GetEntityIT extends InventoryITBase {`
`70`	`70`	`public static void setup() {`
`71`	`71`	`CqlSession session = SESSION_RULE.session();`
`72`	`72`
`73`		`- for (String query : createStatements(CCM_RULE, false)) {`
	`73`	`+ for (String query : createStatements(CCM_RULE)) {`
`74`	`74`	`session.execute(`
`75`	`75`	`SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public class InsertIT extends InventoryITBase {`
`66`	`66`	`public static void setup() {`
`67`	`67`	`CqlSession session = SESSION_RULE.session();`
`68`	`68`
`69`		`- for (String query : createStatements(CCM_RULE, false)) {`
	`69`	`+ for (String query : createStatements(CCM_RULE)) {`
`70`	`70`	`session.execute(`
`71`	`71`	`SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());`
`72`	`72`	`}`