Browse Source

Try to make SampleCassandraApplicationTests' port config more robust

pull/5627/merge
Andy Wilkinson 10 years ago
parent
commit
66830ea1e5
  1. 8
      spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml
  2. 2
      spring-boot-samples/spring-boot-sample-data-cassandra/src/test/java/sample/data/cassandra/SampleCassandraApplicationTests.java

8
spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml

@ -53,7 +53,8 @@ @@ -53,7 +53,8 @@
<phase>process-resources</phase>
<configuration>
<portNames>
<portName>cassandra.port</portName>
<portName>cassandra.port.native-transport</portName>
<portName>cassandra.port.storage</portName>
</portNames>
</configuration>
</execution>
@ -64,8 +65,9 @@ @@ -64,8 +65,9 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<spring.data.cassandra.port>${cassandra.port}</spring.data.cassandra.port>
<cassandra.native_transport_port>${cassandra.port}</cassandra.native_transport_port>
<spring.data.cassandra.port>${cassandra.port.native-transport}</spring.data.cassandra.port>
<cassandra.native_transport_port>${cassandra.port.native-transport}</cassandra.native_transport_port>
<cassandra.storage_port>${cassandra.port.storage}</cassandra.storage_port>
</systemPropertyVariables>
</configuration>
</plugin>

2
spring-boot-samples/spring-boot-sample-data-cassandra/src/test/java/sample/data/cassandra/SampleCassandraApplicationTests.java

@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class)
@TestExecutionListeners(mergeMode = MergeMode.MERGE_WITH_DEFAULTS, listeners = {
OrderedCassandraTestExecutionListener.class })
@SpringBootTest("spring.data.cassandra.port=9142")
@SpringBootTest
@CassandraDataSet(keyspace = "mykeyspace", value = "setup.cql")
@EmbeddedCassandra(timeout = 60000)
public class SampleCassandraApplicationTests {

Loading…
Cancel
Save