Commit Graph

248 Commits (2326284e291c5bfc4111330f42dc55b886493f40)

Author SHA1 Message Date
Spring Buildmaster b04710d744 Next development version 6 years ago
Spring Buildmaster 9bb64a3493 Next Development Version 6 years ago
Spring Buildmaster 4d24feb443 Next development version 6 years ago
Spring Buildmaster 46df506b0a Next development version 6 years ago
Phillip Webb a9e8116a99 Only check for Mockito once
Update `MockReset` so that checking for Mockito only happens once.

Closes gh-14260
6 years ago
Phillip Webb 9543fcf44d Upgrade to spring-javaformat 0.0.6 6 years ago
Spring Buildmaster 73bf744cb0 Next Development Version 6 years ago
Spring Buildmaster 36b8639853 Next Development Version 7 years ago
Spring Buildmaster 010b4fccbd Next development version 7 years ago
Phillip Webb 99dad81e9a Update copyright header year for changed files 7 years ago
Phillip Webb 0a0247975c Formatting 7 years ago
Phillip Webb 4e96587dc8 Polish modifier declaration ordering
Follow that Java language specification.
7 years ago
Phillip Webb 3ee777e142 Polish ternary expressions
Consistently format ternary expressions and always favor `!=` as the
the check.
7 years ago
Andy Wilkinson 06cf698387 Polish 7 years ago
Spring Buildmaster c10aad165f Next Development Version 7 years ago
Spring Buildmaster ade4760842 Next Development Version 7 years ago
Phillip Webb a8f366a554 Fix copyright header for edited files 7 years ago
Phillip Webb 798522d890 Format with Eclipse Oxygen SR2 7 years ago
Andy Wilkinson debe15b284 Polish 7 years ago
Andy Wilkinson aac88502c8 Reinject mocks when context is dirtied before each method
Closes gh-11903
7 years ago
Spring Buildmaster 6414b42335 Next Development Version 7 years ago
Phillip Webb 8e783cdae9 Polish 7 years ago
Johnny Lim 97a51ddcaa Use the platform-specific line separator
See gh-11674
7 years ago
Phillip Webb 2c429ba77d Restore static final formatting
Restore static final constants to upper case formatting.

See gh-10457
7 years ago
Phillip Webb 6a55623910 Polish 7 years ago
Spring Buildmaster df2ae7aa19 Next Development Version 7 years ago
Spring Buildmaster c0f9f64776 Next Development Version 7 years ago
Johnny Lim bfa291f671 Polish 7 years ago
Andy Wilkinson 663cae1255 Note behaviour of @MockBean and @SpyBean with non-bean dependencies
Closes gh-10381
7 years ago
Spring Buildmaster 30eb937a83 Next Development Version 7 years ago
Andy Wilkinson 7a4c18eaba Polish "Deprecate JsonContent.assertThat()"
Closes gh-9678
7 years ago
Priyanshi fa57491030 Deprecate JsonContent.assertThat()
See gh-9678
7 years ago
Spring Buildmaster 17a5bb0be4 Next development version 7 years ago
Spring Buildmaster 41c5c0e7c9 Next development version 7 years ago
Andy Wilkinson ece66e1d4a Polish javadoc in JsonContentAssert
See gh-9675
7 years ago
Andy Wilkinson f6727e786a Polish "Fix JsonContentAssert type safety warnings"
- Format code
- Update an existing test to use the contains method that would
  previously have triggered a type safety warning

Closes gh-9675
7 years ago
Mihhail Lapushkin ae91c8460f Fix JsonContentAssert type safety warnings
Previously, JsonContentAssert returns AbstractMapAssert from
extractingJsonPathMapValue. This could lead to type safety warnings
when calling one of the assert's methods with a generic varargs
parameter such as
contains(Entry<? extends Object, ? extends Object>...).

This commit replaces the use of both AbstractMapAssert and
AbstractListAssert with MapAssert and ListAssert respectively. These
classes use final methods and @SafeVargs args to prevent the
above-described problem from occurring.

See gh-9675
7 years ago
Spring Buildmaster 05d4d0281c Next Development Version 8 years ago
Andy Wilkinson 84721666c5 Stop DuplicateJsonObjectContextCustomizer breaking context caching
See gh-9248
8 years ago
Andy Wilkinson 21a5ab7875 Log a warning during tests when multiple JSONOjects on the class path
Closes gh-9248
8 years ago
Stephane Nicoll b5709fd618 Polish
See gh-9330
8 years ago
Stephane Nicoll a22b3d9515 Merge branch '1.4.x' into 1.5.x 8 years ago
Stevo Slavić 6e1d99aa10 Fix typo in javadoc
Closes gh-9212
8 years ago
Phillip Webb 931ce15d7f Update copyright header dates 8 years ago
Spring Buildmaster 9768b0a8c2 Next Development Version 8 years ago
Spring Buildmaster d719d2cbbc Next Development Version 8 years ago
Phillip Webb 5abc050a96 Support detection and with test initializers
Relax `SpringBootTestContextBootstrapper` rules so that a test can
specify an `ApplicationContextInitializer` and still have
`@SpringBootConfiguration` detected.

Prior to this commit detection would not occur because it's possible
that an initializer _could_ register configuration. This scenario is
actually quite unlikely to occur, certainly less likely than wanting to
use an initializer in combination with auto-detection.

Fixes gh-8483
8 years ago
Phillip Webb 393c17b68b Support @SpringBootTest with @ContextHierarchy
Update SpringBootTestContextBootstrapper to detect `@ContextHierarchy`
annotations so that only the last child creates a
`WebApplicationContext`.

Prior to this commit a context hierarchy would start two embedded web
servers which is inconsistent with the `SpringApplicationBuilder`
behavior.

Fixes gh-8311
8 years ago
Phillip Webb 8eb79b3c0f Polish 8 years ago
Phillip Webb f46d799f31 Polish 8 years ago