From 34f2d95669c3b48144a325ec43b8f3e9a103745d Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Tue, 26 Jul 2016 09:46:13 +0200 Subject: [PATCH] DATAREDIS-540 - Assert compatibility with Spring 5. Fix testsetup and add Spring-5 build profile to travis.yml. --- .travis.yml | 1 + .../cache/RedisCacheManagerTransactionalUnitTests.java | 6 ++---- .../TransactionalRedisCacheManagerWithCommitUnitTests.java | 6 ++---- ...TransactionalRedisCacheManagerWithRollbackUnitTests.java | 6 ++---- .../redis/connection/AbstractTransactionalTestBase.java | 6 ++---- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index f207b6657..f20c24ce8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ env: - PROFILE=spring42 - PROFILE=spring42-next - PROFILE=spring43-next + - PROFILE=spring5-next cache: directories: - $HOME/.m2 diff --git a/src/test/java/org/springframework/data/redis/cache/RedisCacheManagerTransactionalUnitTests.java b/src/test/java/org/springframework/data/redis/cache/RedisCacheManagerTransactionalUnitTests.java index 4a88b1196..aa7a9a621 100644 --- a/src/test/java/org/springframework/data/redis/cache/RedisCacheManagerTransactionalUnitTests.java +++ b/src/test/java/org/springframework/data/redis/cache/RedisCacheManagerTransactionalUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 the original author or authors. + * Copyright 2015-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,6 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.test.util.RelaxedJUnit4ClassRunner; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.transaction.TransactionConfiguration; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.Transactional; @@ -49,8 +48,7 @@ import org.springframework.transaction.annotation.Transactional; */ @RunWith(RelaxedJUnit4ClassRunner.class) @ContextConfiguration -@Transactional -@TransactionConfiguration(transactionManager = "transactionManager") +@Transactional(transactionManager = "transactionManager") public class RedisCacheManagerTransactionalUnitTests { @Autowired protected CacheManager cacheManager; diff --git a/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithCommitUnitTests.java b/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithCommitUnitTests.java index 69e2a5eee..8e515e9a2 100644 --- a/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithCommitUnitTests.java +++ b/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithCommitUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,6 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.transaction.AfterTransaction; -import org.springframework.test.context.transaction.TransactionConfiguration; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.Transactional; @@ -53,8 +52,7 @@ import org.springframework.transaction.annotation.Transactional; */ @RunWith(RelaxedJUnit4ClassRunner.class) @ContextConfiguration -@Transactional -@TransactionConfiguration(transactionManager = "transactionManager") +@Transactional(transactionManager = "transactionManager") public class TransactionalRedisCacheManagerWithCommitUnitTests { @SuppressWarnings("rawtypes")// diff --git a/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithRollbackUnitTests.java b/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithRollbackUnitTests.java index cf6a404a2..1615a5b5d 100644 --- a/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithRollbackUnitTests.java +++ b/src/test/java/org/springframework/data/redis/cache/TransactionalRedisCacheManagerWithRollbackUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,6 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.transaction.AfterTransaction; -import org.springframework.test.context.transaction.TransactionConfiguration; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.Transactional; @@ -49,8 +48,7 @@ import org.springframework.transaction.annotation.Transactional; */ @RunWith(RelaxedJUnit4ClassRunner.class) @ContextConfiguration -@Transactional -@TransactionConfiguration(transactionManager = "transactionManager") +@Transactional(transactionManager = "transactionManager") public class TransactionalRedisCacheManagerWithRollbackUnitTests { @SuppressWarnings("rawtypes")// diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractTransactionalTestBase.java b/src/test/java/org/springframework/data/redis/connection/AbstractTransactionalTestBase.java index 036eee9ae..385c244e5 100644 --- a/src/test/java/org/springframework/data/redis/connection/AbstractTransactionalTestBase.java +++ b/src/test/java/org/springframework/data/redis/connection/AbstractTransactionalTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,13 +36,11 @@ import org.springframework.data.redis.test.util.RelaxedJUnit4ClassRunner; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.transaction.AfterTransaction; -import org.springframework.test.context.transaction.TransactionConfiguration; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.Transactional; @RunWith(RelaxedJUnit4ClassRunner.class) -@Transactional -@TransactionConfiguration(transactionManager = "transactionManager") +@Transactional(transactionManager = "transactionManager") public abstract class AbstractTransactionalTestBase { @Configuration