Fix tests failing on Jenkins

lukasz-antoniak · lukasz-antoniak · commit 5c46d76dcdea · 2024-07-02T09:52:35.000+02:00
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
@@ -75,9 +75,10 @@ public static void setup() {
   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.getCassandraVersion().nextStable().compareTo(Version.V4_0_0) < 0)
-            || CCM_RULE.getDseVersion().get().nextStable().compareTo(Version.V6_0_0) >= 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));
     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
@@ -79,9 +79,10 @@ public static void setup() {
   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.getCassandraVersion().nextStable().compareTo(Version.V4_0_0) < 0)
-            || CCM_RULE.getDseVersion().get().nextStable().compareTo(Version.V6_0_0) >= 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));
     createAndCheckCluster("snappy");
   }
 
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/connection/NettyResourceLeakDetectionIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/connection/NettyResourceLeakDetectionIT.java
@@ -128,8 +128,7 @@ public void should_not_leak_compressed_lz4() {
 
   @BackendRequirement(
       type = BackendType.DSE,
-      minInclusive = "6.0.0",
-      description = "Snappy is not supported in DSE before 6.0 with protocol v3")
+      description = "Snappy is not supported in OSS C* 4.0+ with protocol v5")
   @BackendRequirement(
       type = BackendType.CASSANDRA,
       maxExclusive = "4.0.0",
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)) {
+    for (String query : createStatements(CCM_RULE, false)) {
       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
@@ -56,12 +56,11 @@
 // Do not run LWT tests in parallel because they may interfere. Tests operate on the same row.
 @BackendRequirement(
     type = BackendType.CASSANDRA,
-    minInclusive = "3.4",
-    description = ">= in WHERE clause, and SASI indexes are not supported in legacy versions")
+    minInclusive = "3.0",
+    description = ">= in WHERE clause not supported in legacy versions")
 public class DeleteIT extends InventoryITBase {
 
-  private static CustomCcmRule CCM_RULE =
-      CustomCcmRule.builder().withCassandraConfiguration("enable_sasi_indexes", "true").build();
+  private static CustomCcmRule CCM_RULE = CustomCcmRule.builder().build();
 
   private static final SessionRule<CqlSession> SESSION_RULE = SessionRule.builder(CCM_RULE).build();
 
@@ -76,7 +75,7 @@ public class DeleteIT extends InventoryITBase {
   public static void setup() {
     CqlSession session = SESSION_RULE.session();
 
-    for (String query : createStatements(CCM_RULE)) {
+    for (String query : createStatements(CCM_RULE, false)) {
       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)) {
+    for (String query : createStatements(ccmRule, false)) {
       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)) {
+    for (String query : createStatements(CCM_RULE, false)) {
       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)) {
+    for (String query : createStatements(CCM_RULE, false)) {
       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)) {
+          for (String query : createStatements(CCM_RULE, false)) {
             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)) {
+    for (String query : createStatements(CCM_RULE, false)) {
       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)) {
+    for (String query : createStatements(ccmRule, false)) {
       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,7 +58,7 @@ 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) {
+  protected static List<String> createStatements(BaseCcmRule ccmRule, boolean requiresSasiIndex) {
     ImmutableList.Builder<String> builder =
         ImmutableList.<String>builder()
             .add(
@@ -71,7 +71,7 @@ protected static List<String> createStatements(BaseCcmRule ccmRule) {
                 "CREATE TABLE product_sale(id uuid, day text, ts uuid, customer_id int, price "
                     + "double, count int, PRIMARY KEY ((id, day), customer_id, ts))");
 
-    if (supportsSASI(ccmRule) && !isSasiBroken(ccmRule)) {
+    if (requiresSasiIndex && supportsSASI(ccmRule) && !isSasiBroken(ccmRule)) {
       builder.add(
           "CREATE CUSTOM INDEX product_description ON product(description) "
               + "USING 'org.apache.cassandra.index.sasi.SASIIndex' "
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)) {
+    for (String query : createStatements(ccm, false)) {
       session.execute(
           SimpleStatement.builder(query).setExecutionProfile(sessionRule.slowProfile()).build());
     }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectCustomWhereClauseIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectCustomWhereClauseIT.java
@@ -75,7 +75,7 @@ public static void setup() {
 
     SchemaChangeSynchronizer.withLock(
         () -> {
-          for (String query : createStatements(CCM_RULE)) {
+          for (String query : createStatements(CCM_RULE, true)) {
             session.execute(
                 SimpleStatement.builder(query)
                     .setExecutionProfile(SESSION_RULE.slowProfile())
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)) {
+    for (String query : createStatements(CCM_RULE, false)) {
       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)) {
+          for (String query : createStatements(ccmRule, false)) {
             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)) {
+    for (String query : createStatements(CCM_RULE, false)) {
       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)) {
+    for (String query : createStatements(CCM_RULE, false)) {
       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)) {
+          for (String query : createStatements(CCM_RULE, false)) {
             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)) {
+    for (String query : createStatements(ccmRule, false)) {
       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)) {`
	`67`	`+ for (String query : createStatements(CCM_RULE, false)) {`
`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 @@ 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)) {`
	`73`	`+ for (String query : createStatements(ccmRule, false)) {`
`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)) {`
	`67`	`+ for (String query : createStatements(CCM_RULE, false)) {`
`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)) {`
	`73`	`+ for (String query : createStatements(CCM_RULE, false)) {`
`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)) {`
	`69`	`+ for (String query : createStatements(CCM_RULE, false)) {`
`70`	`70`	`session.execute(`
`71`	`71`	`SimpleStatement.builder(query).setExecutionProfile(SESSION_RULE.slowProfile()).build());`
`72`	`72`	`}`