Andy Wilkinson
ccd19ce2c3
Merge branch '1.3.x'
2016-05-24 17:25:15 +01:00
Andy Wilkinson
275651e89a
Skips Cassandra and Elasticsearch tests on Windows
...
Neither Cassandra nor Elasticsearch starts reliably on Windows. This
commit adds a custom class rule to the associated sample application
tests to skip them on Windows. A class rule is used rather than a
Unit assumption as we want to avoid starting Elasticsearch (done by
the application context) and Cassandra (done by a test execution
listener) and an assumption would be too late.
2016-05-24 17:22:48 +01:00
Huang YunKun
6a2ff3f02a
Upgrade elasticsearch to 2.2.0
...
Closes gh-5443
2016-04-05 12:38:04 +02:00
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
2016-03-23 22:17:50 -07:00
Andy Wilkinson
44ddfcc7fa
Upgrade copyright headers of all files changed in 2016
2016-02-25 12:09:42 +00:00
Phillip Webb
1cc1fc6431
Use AssertJ in spring-boot-samples
...
See gh-5083
2016-02-06 15:51:26 -08:00
Phillip Webb
a79131f8d2
Organize imports with new settings
...
See gh-4234
2015-10-19 12:55:44 -07:00
Phillip Webb
968b68c322
Polish
2015-06-02 11:17:16 -07:00
Andy Wilkinson
dabbb02dfe
Prevents tests that use Elasticsearch from polluting the filesystem
...
By default, Elasticsearch writes it data to ./data. This led to data
being left on the filesystem after a mvn clean which could cause
failures when moving between branches that use different versions of
Elasticsearch.
This commit updates the tests for the Elasticsearch sample and
the Elasticsearch auto-configuration classes to write the
Elasticsearch data and logs into the target directory.
2015-04-21 14:53:43 +01:00
Phillip Webb
fa88c481a5
Remote trailing whitespace
2014-07-02 15:17:14 -07:00
Phillip Webb
9632abf825
Formatting and cleanup
2014-06-26 09:41:15 -07:00
Artur Konczak
99940337a9
Add support for Elasticsearch
...
Add auto-configuration and starters for Elasticsearch.
Fixes gh-408
2014-06-01 12:54:42 +01:00
