You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by vs...@apache.org on 2008/10/28 12:44:37 UTC
svn commit: r708535 -
/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
Author: vsiveton
Date: Tue Oct 28 04:44:37 2008
New Revision: 708535
URL: http://svn.apache.org/viewvc?rev=708535&view=rev
Log:
o using ReaderFactory
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java?rev=708535&r1=708534&r2=708535&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java Tue Oct 28 04:44:37 2008
@@ -19,7 +19,11 @@
* under the License.
*/
+import java.io.IOException;
+import java.io.Reader;
+
import junit.framework.TestCase;
+
import org.apache.maven.doxia.site.decoration.Banner;
import org.apache.maven.doxia.site.decoration.Body;
import org.apache.maven.doxia.site.decoration.DecorationModel;
@@ -27,11 +31,9 @@
import org.apache.maven.doxia.site.decoration.Logo;
import org.apache.maven.doxia.site.decoration.Menu;
import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
+import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
/**
* Test the inheritance assembler.
*
@@ -509,6 +511,7 @@
private DecorationModel readModel( String name )
throws IOException, XmlPullParserException
{
- return new DecorationXpp3Reader().read( new InputStreamReader( getClass().getResourceAsStream( "/" + name ) ) );
+ Reader reader = ReaderFactory.newReader( getClass().getResourceAsStream( "/" + name ), "UTF-8" );
+ return new DecorationXpp3Reader().read( reader );
}
}