diff --git a/spring-boot-samples/spring-boot-sample-data-cassandra/src/test/java/sample/data/cassandra/OrderedCassandraTestExecutionListener.java b/spring-boot-samples/spring-boot-sample-data-cassandra/src/test/java/sample/data/cassandra/OrderedCassandraTestExecutionListener.java new file mode 100644 index 00000000000..c402fb02bf1 --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-data-cassandra/src/test/java/sample/data/cassandra/OrderedCassandraTestExecutionListener.java @@ -0,0 +1,30 @@ +/* + * Copyright 2012-2015 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package sample.data.cassandra; + +import org.cassandraunit.spring.CassandraUnitDependencyInjectionTestExecutionListener; +import org.springframework.core.Ordered; + +public class OrderedCassandraTestExecutionListener extends + CassandraUnitDependencyInjectionTestExecutionListener { + + @Override + public int getOrder() { + return Ordered.HIGHEST_PRECEDENCE; + } + +} diff --git a/spring-boot-samples/spring-boot-sample-data-cassandra/src/test/java/sample/data/cassandra/SampleCassandraApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-cassandra/src/test/java/sample/data/cassandra/SampleCassandraApplicationTests.java index fe55131dd0d..f80a8ff5281 100644 --- a/spring-boot-samples/spring-boot-sample-data-cassandra/src/test/java/sample/data/cassandra/SampleCassandraApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-cassandra/src/test/java/sample/data/cassandra/SampleCassandraApplicationTests.java @@ -17,12 +17,12 @@ package sample.data.cassandra; import org.cassandraunit.spring.CassandraDataSet; -import org.cassandraunit.spring.CassandraUnitTestExecutionListener; import org.cassandraunit.spring.EmbeddedCassandra; import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.IntegrationTest; +import org.springframework.boot.test.IntegrationTestPropertiesListener; import org.springframework.boot.test.OutputCapture; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -35,9 +35,11 @@ import static org.junit.Assert.assertTrue; * Tests for {@link SampleCassandraApplication}. */ @RunWith(SpringJUnit4ClassRunner.class) -@TestExecutionListeners(mergeMode = MergeMode.MERGE_WITH_DEFAULTS, listeners = CassandraUnitTestExecutionListener.class) +@TestExecutionListeners(mergeMode = MergeMode.MERGE_WITH_DEFAULTS, listeners = { + IntegrationTestPropertiesListener.class, + OrderedCassandraTestExecutionListener.class }) @SpringApplicationConfiguration(SampleCassandraApplication.class) -@IntegrationTest +@IntegrationTest("spring.data.cassandra.port=9142") @CassandraDataSet(keyspace = "mykeyspace", value = "setup.cql") @EmbeddedCassandra public class SampleCassandraApplicationTests {