Commit 31f0c837 authored by Phillip Webb's avatar Phillip Webb

Fix broken Cassandra sample tests

See gh-2064
parent 2aeb88a2
/*
* 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;
}
}
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
package sample.data.cassandra; package sample.data.cassandra;
import org.cassandraunit.spring.CassandraDataSet; import org.cassandraunit.spring.CassandraDataSet;
import org.cassandraunit.spring.CassandraUnitTestExecutionListener;
import org.cassandraunit.spring.EmbeddedCassandra; import org.cassandraunit.spring.EmbeddedCassandra;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.IntegrationTestPropertiesListener;
import org.springframework.boot.test.OutputCapture; import org.springframework.boot.test.OutputCapture;
import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.TestExecutionListeners;
...@@ -35,9 +35,11 @@ import static org.junit.Assert.assertTrue; ...@@ -35,9 +35,11 @@ import static org.junit.Assert.assertTrue;
* Tests for {@link SampleCassandraApplication}. * Tests for {@link SampleCassandraApplication}.
*/ */
@RunWith(SpringJUnit4ClassRunner.class) @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) @SpringApplicationConfiguration(SampleCassandraApplication.class)
@IntegrationTest @IntegrationTest("spring.data.cassandra.port=9142")
@CassandraDataSet(keyspace = "mykeyspace", value = "setup.cql") @CassandraDataSet(keyspace = "mykeyspace", value = "setup.cql")
@EmbeddedCassandra @EmbeddedCassandra
public class SampleCassandraApplicationTests { public class SampleCassandraApplicationTests {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment