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

Avoid http URL String (making checkstyleNohttp happy)

Browse Source 
See gh-33561
This commit is contained in:
Juergen Hoeller
2024-09-25 13:53:34 +02:00
parent daa109e2ec
commit 49da92b6a3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
View File

@@ -380,8 +380,8 @@ class ResourceTests {
@Test @Test
void unusualRelativeResourcesAreEqual() throws Exception { void unusualRelativeResourcesAreEqual() throws Exception {
Resource resource = new UrlResource("file:dir/"); Resource resource = new UrlResource("file:dir/");
Resource relative = resource.createRelative("http://spring.io"); Resource relative = resource.createRelative("https://spring.io");
assertThat(relative).isEqualTo(new UrlResource("file:dir/http://spring.io")); assertThat(relative).isEqualTo(new UrlResource("file:dir/https://spring.io"));
} }
@Test @Test
@@ -422,14 +422,14 @@ class ResourceTests {
@Test @Test
void useUserInfoToSetBasicAuth() throws Exception { void useUserInfoToSetBasicAuth() throws Exception {
startServer(); startServer();
UrlResource resource = new UrlResource("http://alice:secret@localhost:" UrlResource resource = new UrlResource(
+ this.server.getPort() + "/resource"); "http://alice:secret@localhost:" + this.server.getPort() + "/resource");
assertThat(resource.getInputStream()).hasContent("Spring"); assertThat(resource.getInputStream()).hasContent("Spring");
RecordedRequest request = this.server.takeRequest(); RecordedRequest request = this.server.takeRequest();
String authorization = request.getHeader("Authorization"); String authorization = request.getHeader("Authorization");
assertThat(authorization).isNotNull().startsWith("Basic "); assertThat(authorization).isNotNull().startsWith("Basic ");
assertThat(new String(Base64.getDecoder().decode( assertThat(new String(Base64.getDecoder().decode(authorization.substring(6)),
authorization.substring(6)), StandardCharsets.ISO_8859_1)).isEqualTo("alice:secret"); StandardCharsets.ISO_8859_1)).isEqualTo("alice:secret");
} }
@AfterEach @AfterEach