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

Merge branch '3.2.x'

Browse Source 
Closes gh-40616
This commit is contained in:
Phillip Webb
2024-05-02 15:53:38 -07:00
parent e8df704ebb d0ce4daec1
commit 208efae975
4 changed files with 131 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/nio/file/NestedPathTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -162,7 +162,18 @@ class NestedPathTests {
@Test
void toUriReturnsUri() throws Exception {
assertThat(this.path.toUri()).isEqualTo(new URI("nested:" + this.jarPath.toUri().getPath() + "/!nested.jar"));
assertThat(this.path.toUri())
.isEqualTo(new URI("nested:" + this.jarPath.toUri().getRawPath() + "/!nested.jar"));
}
@Test
void toUriWhenHasSpecialCharsReturnsEncodedUri() throws Exception {
this.jarPath = new File(this.temp, "te st.jar").toPath();
this.provider = new NestedFileSystemProvider();
this.fileSystem = new NestedFileSystem(this.provider, this.jarPath);
this.path = new NestedPath(this.fileSystem, "ne sted.jar");
assertThat(this.path.toUri())
.isEqualTo(new URI("nested:" + this.jarPath.toUri().getRawPath() + "/!ne%20sted.jar"));
}
@Test

37
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/nio/file/UriPathEncoderTests.java Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.loader.nio.file;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link UriPathEncoder}.
*
* @author Phillip Webb
*/
class UriPathEncoderTests {
@Test
void encodePath() {
assertThat(UriPathEncoder.encode("/foo/bar")).isEqualTo("/foo/bar");
assertThat(UriPathEncoder.encode("/foo bar")).isEqualTo("/foo%20bar");
assertThat(UriPathEncoder.encode("/Z\u00fcrich")).isEqualTo("/Z%C3%BCrich");
}
}