You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/07/28 09:24:08 UTC

[maven-javadoc-plugin] 01/02: Fix for MJAVADOC-616

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MJAVADOC-616
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit 12eaec436f6f8310fdd9dcd8e9d56945c450d163
Author: Doychin Bondzhev <do...@dsoft-bg.com>
AuthorDate: Fri Jul 19 10:25:24 2019 +0300

    Fix for MJAVADOC-616
    
    Signed-off-by: Doychin Bondzhev <do...@dsoft-bg.com>
---
 .../java/org/apache/maven/plugins/javadoc/JavadocReportTest.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index 765ff16..9c7e23f 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -69,8 +69,11 @@ import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
 public class JavadocReportTest
     extends AbstractMojoTestCase
 {
+
     private static final char LINE_SEPARATOR = ' ';
 
+    public static final String OPTIONS_UMLAUT_ENCODING_Ö_Ä_Ü_ß = "Options Umlaut Encoding ö ä ü ß";
+
     /** flag to copy repo only one time */
     private static boolean TEST_REPO_CREATED = false;
 
@@ -567,6 +570,7 @@ public class JavadocReportTest
 
         // check for a part of the window title
         String content;
+        String expected = OPTIONS_UMLAUT_ENCODING_Ö_Ä_Ü_ß;
         if ( JavaVersion.JAVA_VERSION.isAtLeast( "9" ) )
         {
             content = readFile( optionsFile, StandardCharsets.UTF_8 );
@@ -574,8 +578,10 @@ public class JavadocReportTest
         else
         {
             content = readFile( optionsFile, Charset.defaultCharset() );
+            expected = new String(expected.getBytes(Charset.defaultCharset()));
         }
-        assertTrue( content.contains( "Options Umlaut Encoding ö ä ü ß" ) );
+
+        assertTrue( content.contains(expected) );
 
         File apidocs = new File( getBasedir(), "target/test/unit/optionsumlautencoding-test/target/site/apidocs" );