From 71c6851bb7eb22eb931714ab622f42ad91800b13 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 15 Jan 2020 14:57:35 +0100 Subject: [PATCH] DATACASS-656 - Guard tests for unsupported Cassandra versions. --- .../generator/AlterTableCqlGeneratorIntegrationTests.java | 5 +++-- .../generator/AlterUserTypeCqlGeneratorIntegrationTests.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java index 45281c500..8ff53e68f 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java @@ -45,6 +45,7 @@ import com.datastax.oss.driver.api.core.type.DataTypes; public class AlterTableCqlGeneratorIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest { static final Version CASSANDRA_3_10 = Version.parse("3.10"); + static final Version CASSANDRA_3_0_10 = Version.parse("3.0.10"); Version cassandraVersion; @@ -60,7 +61,7 @@ public class AlterTableCqlGeneratorIntegrationTests extends AbstractKeyspaceCrea @Test // DATACASS-192, DATACASS-429 public void alterTableAlterColumnType() { - assumeTrue(cassandraVersion.isLessThan(CASSANDRA_3_10)); + assumeTrue(cassandraVersion.isLessThan(CASSANDRA_3_10) && cassandraVersion.isLessThan(CASSANDRA_3_0_10)); session.execute( "CREATE TABLE addamsFamily (name varchar PRIMARY KEY, gender varchar,\n" + " lastknownlocation bigint);"); @@ -78,7 +79,7 @@ public class AlterTableCqlGeneratorIntegrationTests extends AbstractKeyspaceCrea @Test // DATACASS-192, DATACASS-429 public void alterTableAlterListColumnType() { - assumeTrue(cassandraVersion.isLessThan(CASSANDRA_3_10)); + assumeTrue(cassandraVersion.isLessThan(CASSANDRA_3_10) && cassandraVersion.isLessThan(CASSANDRA_3_0_10)); session.execute( "CREATE TABLE addamsFamily (name varchar PRIMARY KEY, gender varchar,\n" + " lastknownlocation list);"); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorIntegrationTests.java index 8a1a2c3b2..9b96c80f2 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorIntegrationTests.java @@ -37,6 +37,7 @@ import com.datastax.oss.driver.api.core.type.DataTypes; public class AlterUserTypeCqlGeneratorIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest { static final Version CASSANDRA_3_10 = Version.parse("3.10"); + static final Version CASSANDRA_3_0_10 = Version.parse("3.0.10"); Version cassandraVersion; @@ -61,7 +62,7 @@ public class AlterUserTypeCqlGeneratorIntegrationTests extends AbstractKeyspaceC @Test // DATACASS-172, DATACASS-429 public void alterTypeShouldAlterField() { - assumeTrue(cassandraVersion.isLessThan(CASSANDRA_3_10)); + assumeTrue(cassandraVersion.isLessThan(CASSANDRA_3_10) && cassandraVersion.isLessThan(CASSANDRA_3_0_10)); AlterUserTypeSpecification spec = AlterUserTypeSpecification.alterType("address")// .alter("zip", DataTypes.TEXT);