Merge branch '2.1.x'

This commit is contained in:
Madhura Bhave
2019-04-02 15:58:59 -07:00
36 changed files with 92 additions and 65 deletions

View File

@@ -38,8 +38,8 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link SampleCassandraApplication}.
*/
@TestExecutionListeners(mergeMode = MergeMode.MERGE_WITH_DEFAULTS, listeners = {
OrderedCassandraTestExecutionListener.class })
@TestExecutionListeners(mergeMode = MergeMode.MERGE_WITH_DEFAULTS,
listeners = { OrderedCassandraTestExecutionListener.class })
@RunWith(SpringRunner.class)
@SpringBootTest
@CassandraDataSet(keyspace = "mykeyspace", value = "setup.cql")