Andy Wilkinson
66830ea1e5
Try to make SampleCassandraApplicationTests' port config more robust
9 years ago
Phillip Webb
b398b3319c
Rename @SpringApplicationTest -> @SpringBootTest
...
Rename @SpringApplicationTest to SpringBootTest and
@SpringApplicationContextLoader to @SpringBootContextLoader.
Fixes gh-5562
9 years ago
Andy Wilkinson
33f0ea3480
Rework SpringApplicationTest to support web modes
...
Rework the new testing support so that @SpringApplicationTest can be
used for standard integration tests, web integration tests with a
mock Servlet environment and web integration tests with an embedded
servlet container. This means that it a replacement for 1.3's
@IntegrationTest and @WebIntegrationTest and allows all
SpringApplication testing to be configured using a common annotation.
The old @IntegrationTest and @WebIntegrationTest along with their
supporting classes have been reinstated to their previous form (while
remaining deprecated). This should ensure that they continue to work
in 1.4 exactly as they did in 1.3 giving users a smooth path to
@SpringApplicationTest.
See gh-5477
9 years ago
Phillip Webb
0829a1bde8
Drop superfluous annotations
...
Update internal tests to drop annotations that can now
be inferred.
Fixes gh-5470
9 years ago
Phillip Webb
c28f552883
Migrate SpringJUnit4ClassRunner to SpringRunner
...
Replace all existing SpringJUnit4ClassRunner references with the new
SpringRunner alias.
Fixes gh-5292
9 years ago
Phillip Webb
2f815a907a
Migrate existing tests from deprecated package
...
Update the existing tests to use the relocated `spring-boot-test`
classes. Restructuring was achieved using the following command:
find . -type f -name '*.java' -exec sed -i '' \
-e s/org.springframework.boot.test.ConfigFileApplicationContextInitializer/\
org.springframework.boot.test.context.ConfigFileApplicationContextInitializer/g \
-e s/org.springframework.boot.test.EnvironmentTestUtils/\
org.springframework.boot.test.util.EnvironmentTestUtils/g \
-e s/org.springframework.boot.test.IntegrationTest/\
org.springframework.boot.test.context.IntegrationTest/g \
-e s/org.springframework.boot.test.IntegrationTestPropertiesListener/\
org.springframework.boot.test.context.IntegrationTestPropertiesListener/g \
-e s/org.springframework.boot.test.OutputCapture/\
org.springframework.boot.test.rule.OutputCapture/g \
-e s/org.springframework.boot.test.SpringApplicationConfiguration/\
org.springframework.boot.test.context.SpringApplicationConfiguration/g \
-e s/org.springframework.boot.test.SpringApplicationContextLoader/\
org.springframework.boot.test.context.SpringApplicationContextLoader/g \
-e s/org.springframework.boot.test.SpringBootMockServletContext/\
org.springframework.boot.test.mock.web.SpringBootMockServletContext/g \
-e s/org.springframework.boot.test.TestRestTemplate/\
org.springframework.boot.test.web.client.TestRestTemplate/g \
-e s/org.springframework.boot.test.WebIntegrationTest/\
org.springframework.boot.test.context.web.WebIntegrationTest/g {} \;
See gh-5293
9 years ago
Andy Wilkinson
44ddfcc7fa
Upgrade copyright headers of all files changed in 2016
9 years ago
Andy Wilkinson
d66bc7b1ee
Merge branch '1.3.x'
9 years ago
Andy Wilkinson
d3074a086c
Increase timeout for startup of embedded Cassandra
...
The integration tests for the Spring Data Cassandra sample application
fail intermittently, apparently due to Cassandra failing to start
within the default timeout period of 10000ms.
In attempt to get the tests to pass reliably, this commit increases
the timeout to 60000ms (1 minute).
9 years ago
Phillip Webb
1cc1fc6431
Use AssertJ in spring-boot-samples
...
See gh-5083
9 years ago
Phillip Webb
634bb770b2
Organize imports with new settings
...
See gh-4234
9 years ago
Phillip Webb
c9fb9916b8
Reformat code using Eclipse Mars
9 years ago
Phillip Webb
31f0c837fd
Fix broken Cassandra sample tests
...
See gh-2064
9 years ago
Julien Dubois
c401330901
Add Cassandra support
...
Add auto-configuration support and health checks for Cassandra and
Spring Data Cassandra.
Fixes gh-2064
Closes gh-2214
9 years ago