This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch WAGON-602 in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
commit ad99fee3da30ca02c9bb4fe94f9d5d8e37cbef64 Author: Michael Osipov <[email protected]> AuthorDate: Tue Nov 24 21:11:01 2020 +0100 Strealine and add tests --- .../maven/wagon/shared/http/EncodingUtilTest.java | 29 ++++++++-------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/EncodingUtilTest.java b/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/EncodingUtilTest.java index 0b73317..d325295 100644 --- a/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/EncodingUtilTest.java +++ b/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/EncodingUtilTest.java @@ -28,26 +28,9 @@ public class EncodingUtilTest extends TestCase { public void testEncodeURLWithTrailingSlash() { - String baseUrl = "https://host:1234/test";; - String path = "demo.zip/"; - String expectedUrl = String.format( "%s/%s", baseUrl, path ); + String encodedURL = EncodingUtil.encodeURLToString( "https://host:1234/test";, "demo/" ); - String encodedURL = EncodingUtil.encodeURLToString( baseUrl, path ); - - assertEquals( expectedUrl, encodedURL ); - } - - public void testEncodeUrlApisConsistent() - { - String baseUrl = "https://host:1234/test";; - String path = "demo.zip/"; - String fullUrl = String.format( "%s/%s", baseUrl, path ); - - String encodedFullURLToString = EncodingUtil.encodeURLToString( fullUrl ); - String encodedURLToString = EncodingUtil.encodeURLToString( baseUrl, path ); - - assertEquals( encodedFullURLToString, fullUrl ); - assertEquals( encodedFullURLToString, encodedURLToString ); + assertEquals( "https://host:1234/test/demo/";, encodedURL ); } public void testEncodeURLWithSpaces() @@ -138,4 +121,12 @@ public class EncodingUtilTest assertEquals( "file://host:1", encodedURL ); } + + public void testEncodeURLWithNonLatin() + throws URISyntaxException, MalformedURLException + { + String encodedURL = EncodingUtil.encodeURLToString( "file://host:1", "пипец/" ); + + assertEquals( "file://host:1/%D0%BF%D0%B8%D0%BF%D0%B5%D1%86/", encodedURL ); + } }
