From ece5475988a3e9f283082c125c9edefdaa95cff9 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 3 Jan 2017 15:42:10 +0100 Subject: [PATCH] DATACASS-380 - Polishing. Guard tests against incompatible Cassandra versions. --- .../derived/QueryDerivationIntegrationTests.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/derived/QueryDerivationIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/derived/QueryDerivationIntegrationTests.java index f9da57fc5..c9ae260c8 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/derived/QueryDerivationIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/querymethods/derived/QueryDerivationIntegrationTests.java @@ -80,6 +80,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC private Person walter; private Person skyler; private Person flynn; + private Version cassandraVersion; @Before public void before() { @@ -95,6 +96,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC walter = personRepository.save(person); skyler = personRepository.save(new Person("Skyler", "White")); flynn = personRepository.save(new Person("Flynn (Walter Jr.)", "White")); + cassandraVersion = CassandraVersion.get(session); } /** @@ -203,6 +205,8 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC @Test public void executesCollectionQueryWithDtoDynamicallyProjected() throws Exception { + assumeTrue(cassandraVersion.isGreaterThanOrEqualTo(Version.parse("3.4"))); + template.getCqlOperations().execute( "CREATE CUSTOM INDEX IF NOT EXISTS fn_starts_with ON person (nickname) USING 'org.apache.cassandra.index.sasi.SASIIndex';"); @@ -224,8 +228,6 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC @Test public void shouldFindByNumberOfChildren() throws Exception { - assumeTrue(Version.parse(SpringVersion.getVersion()).isGreaterThanOrEqualTo(Version.parse("4.3"))); - template.getCqlOperations() .execute("CREATE INDEX IF NOT EXISTS person_number_of_children ON person (numberofchildren);"); @@ -277,7 +279,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC @Test public void shouldUseStartsWithQuery() throws InterruptedException { - assumeTrue(CassandraVersion.get(session).isGreaterThanOrEqualTo(Version.parse("3.4"))); + assumeTrue(cassandraVersion.isGreaterThanOrEqualTo(Version.parse("3.4"))); template.getCqlOperations().execute( "CREATE CUSTOM INDEX IF NOT EXISTS fn_starts_with ON person (nickname) USING 'org.apache.cassandra.index.sasi.SASIIndex';"); @@ -297,7 +299,7 @@ public class QueryDerivationIntegrationTests extends AbstractSpringDataEmbeddedC @Test public void shouldUseContainsQuery() throws InterruptedException { - assumeTrue(CassandraVersion.get(session).isGreaterThanOrEqualTo(Version.parse("3.4"))); + assumeTrue(cassandraVersion.isGreaterThanOrEqualTo(Version.parse("3.4"))); template.getCqlOperations().execute( "CREATE CUSTOM INDEX IF NOT EXISTS fn_contains ON person (nickname) USING 'org.apache.cassandra.index.sasi.SASIIndex'\n"