Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
33,524 Commits 23 Branches 0 Tags
1a30c660f32a7fb5abddc8bbabfd285cdd6f8a77
Commit Graph

260 Commits

Author SHA1 Message Date
Madhura Bhave
0611eb49c8 Merge branch '2.1.x' 2019-03-18 18:03:32 -07:00
Madhura Bhave
7ea8770524 Polish "Fix request factory used with withBasicAuth" 
Fixes gh-15982
 2019-03-18 18:00:17 -07:00
Dmytro Nosan
756bd890eb Fix request factory used with TestRestTemplate withBasicAuth 
This commit updates the behavior of withBasicAuth on TestRestTemplate
by trying to use the same request factory type as the underlying restTemplate.
If creation of a new instance of the configured request factory class fails,
it falls back to the `ClientHttpRequestFactorySupplier`.

See gh-15982
 2019-03-18 18:00:08 -07:00
Madhura Bhave
1893eeef4f Merge branch '2.1.x' 2019-03-15 17:27:10 -07:00
Dmytro Nosan
2f3e5d65be Test server port shouldn't affect management port when random 
Closes gh-16108
 2019-03-15 17:21:29 -07:00
Madhura Bhave
2cdc93cf19 Make TestRestTemplate withBasicAuth fault tolerant 
It's part of TestRestTemplate's contract that it's fault tolerant. This
commit aligns the behavior of `withBasicAuth` with that expectation.

Closes gh-15780
 2019-03-13 11:49:42 -07:00
Andy Wilkinson
68bfb020aa Reduce need for bean method proxying and disable where not needed 
Closes gh-9068
 2019-03-12 13:18:42 +00:00
Andy Wilkinson
aa2008bc5a Merge branch '2.1.x' 2019-03-11 16:40:19 +00:00
Andy Wilkinson
8c3cec8f13 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:14:19 +00:00
Andy Wilkinson
361437f4e2 Merge branch '1.5.x' into 2.0.x 2019-03-11 15:53:34 +00:00
Andy Wilkinson
f2e3e274a8 Merge branch '2.1.x' 2019-02-21 08:19:43 +00:00
Andy Wilkinson
53326695ea Polish 2019-02-21 08:13:54 +00:00
Stephane Nicoll
4992b7fb29 Polish "Migrate Kotlin tests to Mockk" 
Closes gh-15993
 2019-02-19 13:36:06 +01:00
Sebastien Deleuze
cca79b8d4d Migrate Kotlin tests to Mockk 
See gh-15993
 2019-02-19 13:35:43 +01:00
Stephane Nicoll
7413584b00 Polish "Support expressing application args in @SpringBootTest" 
Closes gh-14823
 2019-02-13 15:07:11 +01:00
Justin Griffin
422e6b7d41 Support expressing application args in @SpringBootTest 
Add `args` property to the `@SpringBootTest` annotation so tests
can easily supply application arguments to pass to their app under test.

See gh-14823
 2019-02-13 14:38:26 +01:00
Andy Wilkinson
c04eba7ebc Polish "Add TestNG support in TestTypeExcludeFilter" 
See gh-7630
 2019-02-12 15:28:19 +00:00
Eddú Meléndez
b005008cac Add TestNG support in TestTypeExcludeFilter 
See gh-7630
 2019-02-12 15:27:51 +00:00
Andy Wilkinson
89bf486d0c Merge branch '2.1.x' 2019-02-05 11:39:37 +00:00
Andy Wilkinson
1f67707509 Fix cast in TestRestTemplateContextCustomizer 
Closes gh-15843
 2019-02-05 11:39:25 +00:00
Andy Wilkinson
45cc649c7d Merge branch '2.1.x' 2019-02-04 12:36:33 +00:00
Andy Wilkinson
82bc87560c Use AssertJ’s exception assertions rather than fail 
Closes gh-15761
 2019-02-04 11:48:26 +00:00
Stephane Nicoll
33f2bd4d61 Merge branch '2.1.x' 2019-01-14 08:13:37 -05:00
Stephane Nicoll
485bdc9901 Polish "Remove redundant interface modifiers" 
Closes gh-15694
 2019-01-14 08:13:08 -05:00
igor-suhorukov
2d873c78fe Remove redundant interface modifiers 
See gh-15694
 2019-01-14 08:12:41 -05:00
Andy Wilkinson
064f6478df Move back to JUnit 4 until SUREFIRE-1614 has been resolved 
See gh-14736
See gh-14737
See gh-14738
 2018-12-12 16:49:30 +00:00
Stephane Nicoll
dfd477aa74 Merge branch '2.1.x' 2018-12-11 08:53:37 +01:00
Stephane Nicoll
38e4d330b0 Merge branch '2.0.x' into 2.1.x 2018-12-11 08:52:58 +01:00
dreis2211
0f92b139f3 Remove Mockito 1 leftover 
Closes gh-15422
 2018-12-11 08:52:15 +01:00
Madhura Bhave
e367b54928 Merge branch '2.1.x' 2018-12-07 11:57:19 -08:00
Madhura Bhave
31a5e85ab6 Perform placeholder resolution in test env post processor 
Fixes gh-15354
 2018-12-07 11:45:04 -08:00
Stephane Nicoll
d5f90ffcfb Polish "Replace this lambda with a method reference" 
Closes gh-15401
 2018-12-07 11:10:10 +01:00
igor-suhorukov
5c1813aef8 Replace this lambda with a method reference 
See gh-15401
 2018-12-07 11:01:42 +01:00
Madhura Bhave
59d2b0a3fb Upgrade tests to Junit5 
See gh-14737
 2018-12-05 17:49:09 -08:00
Madhura Bhave
12e1d9a6a4 Add Junit5 OutputCapture Extension 
See gh-14738
 2018-12-05 17:48:27 -08:00
Phillip Webb
683484e4a8 Fix primary beans with ApplicationContextAssert 
Update `ApplicationContextAssert.getBean` so that multiple beans are
supported as long as one of them is primary. This aligns better with
the way that the standard `ApplicationContext.getBean` method works.

Closes gh-14874
 2018-10-24 21:34:17 -07:00
dreis2211
8b14754cda Remove usages of BasicAuthorizationInterceptor 
See gh-14830
 2018-10-16 10:21:32 +02:00
Stephane Nicoll
1a0d53dec0 Replace ReflectionTestUtils usage by hasFieldOrPropertyWithValue 
Closes gh-14696
 2018-10-15 08:25:10 +02:00
Stephane Nicoll
baf83aec0d Polish "Allow ClassPathResources to be filtered by FilteredClassLoader" 
Closes gh-14774
 2018-10-12 15:37:25 +02:00
Roy Jacobs
d3ca1a7b0e Allow ClassPathResources to be filtered by FilteredClassLoader 
See gh-14774
 2018-10-12 15:15:16 +02:00
Andy Wilkinson
da7daece08 Tolerate Integer values for port properties 
Closes gh-14682
 2018-10-04 10:53:02 +01:00
Andy Wilkinson
b473f2996d Polish 2018-10-04 10:39:07 +01:00
Phillip Webb
d76bba5e6f Migrate from ExpectedException rule to AssertJ 
Replace ExpectedException JUnit rules with AssertJ exception
assertions.

Closes gh-14336
 2018-10-02 10:55:28 -07:00
Johnny Lim
521f746151 Polish 
Closes gh-14517
 2018-09-20 09:51:10 +02:00
Madhura Bhave
d5a197fe66 Support random actuator port in SpringBootTest 
This commit changes @SpringBootTest(randomPort = true) to
generate a random port for the actuator endpoints if the
management server runs on a different port from the main
server.

Closes gh-4424
 2018-09-14 15:42:08 -07:00
Phillip Webb
04710373bf Add @Author attribution 
See gh-11077
 2018-09-06 13:42:29 -07:00
Andreas Neiser
a5b3a2646b Test @MockBean/@SpyBean with @Primary 
Add additional tests to ensure that `@MockBean` and `@SpyBean`
work consistently when combined with `@Primary`.

See gh-11077
 2018-09-06 13:31:33 -07:00
Phillip Webb
4d86ac4713 Polish copyright date on changed files 2018-07-29 09:30:26 +01:00
Phillip Webb
a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +01:00
Phillip Webb
63b609827e Fix checkstyle method order issues 
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:53 +01:00