Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACASS-326 - Assert compatibility with Spring 5.

Browse Source 
Enable spring5-next profile build. Adopt tests to use the correct version comparison.
This commit is contained in:
Mark Paluch
2016-08-21 09:59:28 +02:00
parent c407aad8cf
commit 25686fd2e2
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -9,6 +9,7 @@ env:
- PROFILE=spring42-next
- PROFILE=spring43
- PROFILE=spring43-next
- PROFILE=spring5-next
- PROFILE=external-cassandra CASSANDRA_VERSION=2.2.6
- PROFILE=external-cassandra CASSANDRA_VERSION=3.0.7
- PROFILE=external-cassandra CASSANDRA_VERSION=3.2

9
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/MappingCassandraConverterUnitTests.java
View File

@@ -68,6 +68,7 @@ import org.springframework.data.cassandra.mapping.PrimaryKey;
import org.springframework.data.cassandra.mapping.PrimaryKeyClass;
import org.springframework.data.cassandra.mapping.PrimaryKeyColumn;
import org.springframework.data.cassandra.mapping.Table;
import org.springframework.data.util.Version;
import org.springframework.test.util.ReflectionTestUtils;
import com.datastax.driver.core.ColumnDefinitions;
@@ -95,6 +96,8 @@ import com.datastax.driver.core.querybuilder.Update.Assignments;
@RunWith(MockitoJUnitRunner.class)
public class MappingCassandraConverterUnitTests {
private static final Version VERSION_4_3 = Version.parse("4.3");
@Rule
public final ExpectedException expectedException = ExpectedException.none();
@@ -139,7 +142,7 @@ public class MappingCassandraConverterUnitTests {
@Test
public void insertEnumDoesNotMapToOrdinalBeforeSpring43() {
assumeThat(SpringVersion.getVersion(), not(startsWith("4.3")));
assumeTrue(Version.parse(SpringVersion.getVersion()).isLessThan(VERSION_4_3));
expectedException.expect(ConverterNotFoundException.class);
expectedException.expectMessage(allOf(containsString("No converter found"), containsString("java.lang.Integer")));
@@ -156,9 +159,9 @@ public class MappingCassandraConverterUnitTests {
* @see DATACASS-255
*/
@Test
public void insertEnumMapsToOrdinalWithSpring43() {
public void insertEnumMapsToOrdinalWithSpring43AndHiger() {
assumeThat(SpringVersion.getVersion(), startsWith("4.3"));
assumeTrue(Version.parse(SpringVersion.getVersion()).isGreaterThanOrEqualTo(VERSION_4_3));
UnsupportedEnumToOrdinalMapping unsupportedEnumToOrdinalMapping = new UnsupportedEnumToOrdinalMapping();
unsupportedEnumToOrdinalMapping.setAsOrdinal(Condition.USED);