You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/04/26 16:57:17 UTC

svn commit: r532767 - in /maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src: main/java/org/apache/maven/archiva/xml/ test/java/org/apache/maven/archiva/xml/

Author: joakime
Date: Thu Apr 26 07:57:16 2007
New Revision: 532767

URL: http://svn.apache.org/viewvc?view=rev&rev=532767
Log:
Fixes for tests under windows.

Modified:
    maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java
    maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/LatinEntitiesTest.java
    maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java

Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java?view=diff&rev=532767&r1=532766&r2=532767
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java Thu Apr 26 07:57:16 2007
@@ -102,7 +102,7 @@
         try
         {
             InputStream in = url.openStream();
-            InputStreamReader inReader = new InputStreamReader( in );
+            InputStreamReader inReader = new InputStreamReader( in, "UTF-8" );
             LatinEntityResolutionReader latinReader = new LatinEntityResolutionReader( inReader );
             this.document = reader.read( latinReader );
         }

Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/LatinEntitiesTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/LatinEntitiesTest.java?view=diff&rev=532767&r1=532766&r2=532767
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/LatinEntitiesTest.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/LatinEntitiesTest.java Thu Apr 26 07:57:16 2007
@@ -33,9 +33,9 @@
     public void testResolveEntity()
     {
         // Good Entities.
-        assertEquals( "©", LatinEntities.resolveEntity( "©" ) );
-        assertEquals( "∞", LatinEntities.resolveEntity( "∞" ) );
-        assertEquals( "ø", LatinEntities.resolveEntity( "ø" ) );
+        assertEquals( "\u00a9", LatinEntities.resolveEntity( "©" ) );
+        assertEquals( "\u221e", LatinEntities.resolveEntity( "∞" ) );
+        assertEquals( "\u00f8", LatinEntities.resolveEntity( "ø" ) );
 
         // Bad Entities.
         assertEquals( "", LatinEntities.resolveEntity( "" ) );

Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java?view=diff&rev=532767&r1=532766&r2=532767
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java Thu Apr 26 07:57:16 2007
@@ -35,6 +35,11 @@
 public class XMLReaderTest
     extends AbstractArchivaXmlTestCase
 {
+    private static final String OSLASH = "\u00f8";
+    private static final String TRYGVIS = "Trygve Laugst" + OSLASH + "l";
+    private static final String INFIN = "\u221e";
+    private static final String INFINITE_ARCHIVA = "The " + INFIN + " Archiva";
+    
     private void assertElementTexts( List elementList, String[] expectedTexts )
     {
         assertEquals( "Element List Size", expectedTexts.length, elementList.size() );
@@ -70,7 +75,7 @@
         XMLReader reader = new XMLReader( "basic", xmlFile );
 
         List names = reader.getElementList( "//basic/names/name" );
-        assertElementTexts( names, new String[] { "Trygve Laugstøl", "The ∞ Archiva" } );
+        assertElementTexts( names, new String[] { TRYGVIS, INFINITE_ARCHIVA } );
     }
 
     public void testNoPrologUtf8Read()
@@ -80,7 +85,7 @@
         XMLReader reader = new XMLReader( "basic", xmlFile );
 
         List names = reader.getElementList( "//basic/names/name" );
-        assertElementTexts( names, new String[] { "Trygve Laugstøl", "The ∞ Archiva" } );
+        assertElementTexts( names, new String[] { TRYGVIS, INFINITE_ARCHIVA } );
     }
 
     public void testPrologUtf8Read()
@@ -90,7 +95,7 @@
         XMLReader reader = new XMLReader( "basic", xmlFile );
 
         List names = reader.getElementList( "//basic/names/name" );
-        assertElementTexts( names, new String[] { "Trygve Laugstøl", "The ∞ Archiva" } );
+        assertElementTexts( names, new String[] { TRYGVIS, INFINITE_ARCHIVA } );
     }
 
 }