Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to AssertJ 3.13.1

Browse Source 
See gh-17690
This commit is contained in:
dreis2211
2019-07-29 16:12:14 +02:00
committed by Stephane Nicoll
parent b6754f6f20
commit 8d2f2b75bd
9 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java
View File

@@ -50,7 +50,7 @@ class MockServerRestTemplateCustomizerTests {
MockServerRestTemplateCustomizer customizer = new MockServerRestTemplateCustomizer();
customizer.customize(new RestTemplate());
assertThat(customizer.getServer()).extracting("expectationManager")
.hasAtLeastOneElementOfType(SimpleRequestExpectationManager.class);
.isInstanceOf(SimpleRequestExpectationManager.class);
}
@Test
@@ -65,7 +65,7 @@ class MockServerRestTemplateCustomizerTests {
UnorderedRequestExpectationManager.class);
customizer.customize(new RestTemplate());
assertThat(customizer.getServer()).extracting("expectationManager")
.hasAtLeastOneElementOfType(UnorderedRequestExpectationManager.class);
.isInstanceOf(UnorderedRequestExpectationManager.class);
}
@Test
@@ -74,7 +74,7 @@ class MockServerRestTemplateCustomizerTests {
UnorderedRequestExpectationManager.class);
customizer.customize(new RestTemplateBuilder().rootUri("https://example.com").build());
assertThat(customizer.getServer()).extracting("expectationManager")
.hasAtLeastOneElementOfType(RootUriRequestExpectationManager.class);
.isInstanceOf(RootUriRequestExpectationManager.class);
}
@Test
@@ -82,7 +82,7 @@ class MockServerRestTemplateCustomizerTests {
this.customizer.setDetectRootUri(false);
this.customizer.customize(new RestTemplateBuilder().rootUri("https://example.com").build());
assertThat(this.customizer.getServer()).extracting("expectationManager")
.hasAtLeastOneElementOfType(SimpleRequestExpectationManager.class);
.isInstanceOf(SimpleRequestExpectationManager.class);
}
@@ -153,8 +153,8 @@ class MockServerRestTemplateCustomizerTests {
this.customizer.customize(template2);
RequestExpectationManager manager1 = this.customizer.getExpectationManagers().get(template1);
RequestExpectationManager manager2 = this.customizer.getExpectationManagers().get(template2);
assertThat(this.customizer.getServer(template1)).extracting("expectationManager").containsOnly(manager1);
assertThat(this.customizer.getServer(template2)).extracting("expectationManager").containsOnly(manager2);
assertThat(this.customizer.getServer(template1)).extracting("expectationManager").isEqualTo(manager1);
assertThat(this.customizer.getServer(template2)).extracting("expectationManager").isEqualTo(manager2);
}
}

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java
View File

@@ -142,7 +142,7 @@ class RootUriRequestExpectationManagerTests {
RequestExpectationManager actual = RootUriRequestExpectationManager.forRestTemplate(restTemplate,
this.delegate);
assertThat(actual).isInstanceOf(RootUriRequestExpectationManager.class);
assertThat(actual).extracting("rootUri").containsExactly(this.uri);
assertThat(actual).extracting("rootUri").isEqualTo(this.uri);
}
@Test