From f20a11073e69650b2a9ab6883bb1fa45f1e25730 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 5 Jun 2018 09:57:29 +0200 Subject: [PATCH] DATACASS-563 - Run time column type tests conditionally. Run time column type tests only on Cassandra 3.10 and higher as earlier Cassandra versions do not support integer for updating/setting time columns. --- .../CassandraTypeMappingIntegrationTests.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/CassandraTypeMappingIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/CassandraTypeMappingIntegrationTests.java index 21db0bb6e..0a97c6907 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/CassandraTypeMappingIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/CassandraTypeMappingIntegrationTests.java @@ -535,9 +535,11 @@ public class CassandraTypeMappingIntegrationTests extends AbstractKeyspaceCreati assertThat(loaded.getLocalDateTime()).isEqualTo(entity.getLocalDateTime()); } - @Test // DATACASS-296 + @Test // DATACASS-296, DATACASS-563 public void shouldReadAndWriteLocalTime() { + assumeTrue(cassandraVersion.isGreaterThanOrEqualTo(VERSION_3_10)); + AllPossibleTypes entity = new AllPossibleTypes("1"); entity.setLocalTime(java.time.LocalTime.of(1, 2, 3)); @@ -549,9 +551,11 @@ public class CassandraTypeMappingIntegrationTests extends AbstractKeyspaceCreati assertThat(loaded.getLocalTime()).isEqualTo(entity.getLocalTime()); } - @Test // DATACASS-296 + @Test // DATACASS-296, DATACASS-563 public void shouldReadAndWriteJodaLocalTime() { + assumeTrue(cassandraVersion.isGreaterThanOrEqualTo(VERSION_3_10)); + AllPossibleTypes entity = new AllPossibleTypes("1"); entity.setJodaLocalTime(org.joda.time.LocalTime.fromMillisOfDay(50000)); @@ -647,9 +651,11 @@ public class CassandraTypeMappingIntegrationTests extends AbstractKeyspaceCreati assertThat(loaded.getBpLocalDateTime()).isEqualTo(entity.getBpLocalDateTime()); } - @Test // DATACASS-296 + @Test // DATACASS-296, DATACASS-563 public void shouldReadAndWriteBpLocalTime() { + assumeTrue(cassandraVersion.isGreaterThanOrEqualTo(VERSION_3_10)); + AllPossibleTypes entity = new AllPossibleTypes("1"); entity.setBpLocalTime(org.threeten.bp.LocalTime.of(1, 2, 3));