You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/07/01 16:08:19 UTC
[maven-integration-testing] branch master updated: MacOS - url
encode differences - needs more investigation
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 2d2a72f MacOS - url encode differences - needs more investigation
2d2a72f is described below
commit 2d2a72f6d022ee4d47269f34b98e1e4afd9e476e
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Jul 1 18:06:09 2020 +0200
MacOS - url encode differences - needs more investigation
---
.../apache/maven/it/MavenITmng6386BaseUriPropertyTest.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java
index db3c999..fb56487 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java
@@ -86,8 +86,17 @@ public class MavenITmng6386BaseUriPropertyTest
assertEquals( testDir.toPath().toUri().toASCIIString(), pomProperty );
// check that baseUri begins with file:///
assertTrue( pomProperty.startsWith( "file:///" ) );
- assertTrue( "Check that baseUri '" + pomProperty + "' ends with 'это по-русский/'",
- pomProperty.endsWith( "%D1%8D%D1%82%D0%BE%20%D0%BF%D0%BE-%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9/" ) );
+ // todo - check why we have different encoding on MacOS of й - %D0%B8%CC%86 vs %D0%B9
+ String msg = "Check that baseUri '" + pomProperty + "' ends with 'это по-русский/'";
+
+ if ( Os.isFamily( Os.FAMILY_MAC ))
+ {
+ assertTrue( msg, pomProperty.endsWith( "%D1%8D%D1%82%D0%BE%20%D0%BF%D0%BE-%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B8%CC%86/" ) );
+ }
+ else
+ {
+ assertTrue( msg, pomProperty.endsWith( "%D1%8D%D1%82%D0%BE%20%D0%BF%D0%BE-%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9/" ) );
+ }
}
else
{