Skip to content

Commit 4043958

Browse files
Fix tests failing on Jenkins
1 parent 811acb2 commit 4043958

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

core/src/main/java/com/datastax/oss/driver/api/core/Version.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public class Version implements Comparable<Version>, Serializable {
5454
@NonNull public static final Version V4_0_0 = Objects.requireNonNull(parse("4.0.0"));
5555
@NonNull public static final Version V4_1_0 = Objects.requireNonNull(parse("4.1.0"));
5656
@NonNull public static final Version V5_0_0 = Objects.requireNonNull(parse("5.0.0"));
57+
@NonNull public static final Version V6_0_0 = Objects.requireNonNull(parse("6.0.0"));
5758
@NonNull public static final Version V6_7_0 = Objects.requireNonNull(parse("6.7.0"));
5859
@NonNull public static final Version V6_8_0 = Objects.requireNonNull(parse("6.8.0"));
5960

integration-tests/src/test/java/com/datastax/oss/driver/core/compression/DirectCompressionIT.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ public static void setup() {
7474
@Test
7575
public void should_execute_queries_with_snappy_compression() throws Exception {
7676
Assume.assumeTrue(
77-
"Snappy is not supported in OSS C* 4.0+ with protocol v5",
78-
CCM_RULE.getDseVersion().isPresent()
79-
|| CCM_RULE.getCassandraVersion().nextStable().compareTo(Version.V4_0_0) < 0);
77+
"Snappy is not supported in OSS C* 4.0+ with protocol v5 and DSE before 6.0",
78+
(!CCM_RULE.getDseVersion().isPresent()
79+
&& CCM_RULE.getCassandraVersion().nextStable().compareTo(Version.V4_0_0) < 0)
80+
|| CCM_RULE.getDseVersion().get().nextStable().compareTo(Version.V6_0_0) >= 0);
8081
createAndCheckCluster("snappy");
8182
}
8283

integration-tests/src/test/java/com/datastax/oss/driver/core/compression/HeapCompressionIT.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,10 @@ public static void setup() {
7878
@Test
7979
public void should_execute_queries_with_snappy_compression() throws Exception {
8080
Assume.assumeTrue(
81-
"Snappy is not supported in OSS C* 4.0+ with protocol v5",
82-
CCM_RULE.getDseVersion().isPresent()
83-
|| CCM_RULE.getCassandraVersion().nextStable().compareTo(Version.V4_0_0) < 0);
81+
"Snappy is not supported in OSS C* 4.0+ with protocol v5 and DSE before 6.0",
82+
(!CCM_RULE.getDseVersion().isPresent()
83+
&& CCM_RULE.getCassandraVersion().nextStable().compareTo(Version.V4_0_0) < 0)
84+
|| CCM_RULE.getDseVersion().get().nextStable().compareTo(Version.V6_0_0) >= 0);
8485
createAndCheckCluster("snappy");
8586
}
8687

integration-tests/src/test/java/com/datastax/oss/driver/core/connection/NettyResourceLeakDetectionIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ public void should_not_leak_compressed_lz4() {
128128

129129
@BackendRequirement(
130130
type = BackendType.DSE,
131-
description = "Snappy is not supported in OSS C* 4.0+ with protocol v5")
131+
minInclusive = "6.0.0",
132+
description = "Snappy is not supported in DSE before 6.0 with protocol v3")
132133
@BackendRequirement(
133134
type = BackendType.CASSANDRA,
134135
maxExclusive = "4.0.0",

integration-tests/src/test/java/com/datastax/oss/driver/mapper/DeleteIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
// Do not run LWT tests in parallel because they may interfere. Tests operate on the same row.
5757
@BackendRequirement(
5858
type = BackendType.CASSANDRA,
59-
minInclusive = "3.0",
60-
description = ">= in WHERE clause not supported in legacy versions")
59+
minInclusive = "3.4",
60+
description = ">= in WHERE clause, and SASI indexes are not supported in legacy versions")
6161
public class DeleteIT extends InventoryITBase {
6262

6363
private static CustomCcmRule CCM_RULE =

0 commit comments

Comments
 (0)