From d44a1c38887f2582079047258c348928fa17bfd9 Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Fri, 14 Mar 2008 18:34:21 +0000
Subject: [PATCH] o Fixed usage of FileReader to get correct/reliable character
 decoding

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@637204 13f79535-47bb-0310-9956-ffa450edef68
---
 .../plugin/generator/PluginDescriptorGeneratorTest.java      | 4 ++--
 .../apache/maven/tools/plugin/javadoc/JavadocReportTest.java | 5 +++--
 .../tools/plugin/javadoc/stubs/DefaultMavenProjectStub.java  | 5 +++--
 .../test/resources/unit/javadoc/javadoc-plugin-config.xml    | 3 +++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
index 9492fde..aae1a6e 100644
--- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
+++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
@@ -24,10 +24,10 @@ import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
 import org.codehaus.plexus.component.repository.ComponentDependency;
+import org.codehaus.plexus.util.ReaderFactory;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringReader;
@@ -81,7 +81,7 @@ public class PluginDescriptorGeneratorTest
         StringWriter sWriter = new StringWriter();
         PrintWriter pWriter = new PrintWriter( sWriter );
 
-        BufferedReader reader = new BufferedReader( new FileReader( pluginDescriptorFile ) );
+        BufferedReader reader = new BufferedReader( ReaderFactory.newXmlReader( pluginDescriptorFile ) );
 
         String line = null;
         while ( ( line = reader.readLine() ) != null )
diff --git a/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java b/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java
index 86cb02a..cd376c2 100644
--- a/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java
+++ b/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java
@@ -21,8 +21,9 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.Collections;
 
 import org.apache.maven.artifact.Artifact;
@@ -85,7 +86,7 @@ public class JavadocReportTest
         throws IOException
     {
         String str = "", strTmp = "";
-        BufferedReader in = new BufferedReader( new FileReader( file ) );
+        BufferedReader in = new BufferedReader( new InputStreamReader( new FileInputStream( file ), "ISO-8859-1" ) );
 
         while ( ( strTmp = in.readLine() ) != null )
         {
diff --git a/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/stubs/DefaultMavenProjectStub.java b/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/stubs/DefaultMavenProjectStub.java
index 141b072..ac73b38 100644
--- a/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/stubs/DefaultMavenProjectStub.java
+++ b/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/stubs/DefaultMavenProjectStub.java
@@ -20,7 +20,6 @@ package org.apache.maven.tools.plugin.javadoc.stubs;
  */
 
 import java.io.File;
-import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -37,6 +36,7 @@ import org.apache.maven.model.Model;
 import org.apache.maven.model.Resource;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.codehaus.plexus.util.ReaderFactory;
 
 /**
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
@@ -54,7 +54,8 @@ public class DefaultMavenProjectStub
 
         try
         {
-            model = pomReader.read( new FileReader( new File( getBasedir(), "javadoc-plugin-config.xml" ) ) );
+            File pomFile = new File( getBasedir(), "javadoc-plugin-config.xml" );
+            model = pomReader.read( ReaderFactory.newXmlReader( pomFile ) );
             setModel( model );
         }
         catch ( Exception e )
diff --git a/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml b/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
index f612420..d3cd9d6 100644
--- a/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
+++ b/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
@@ -56,6 +56,9 @@ under the License.
 
           <debug>true</debug>
           <show>private</show>
+          <encoding>ISO-8859-1</encoding>
+          <docencoding>ISO-8859-1</docencoding>
+          <charset>ISO-8859-1</charset>
 
           <taglets>
             <taglet>