Author: joakime
Date: Thu Apr 26 08:07:56 2007
New Revision: 532772
URL: http://svn.apache.org/viewvc?view=rev&rev=532772
Log:
Making unit tests more resilient on windows.
Removed:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/examples/no-prolog-with-entities.xml-resolved
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/AbstractArchivaXmlTestCase.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/LatinEntityResolutionReaderTest.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLWriterTest.java
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/AbstractArchivaXmlTestCase.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/AbstractArchivaXmlTestCase.java?view=diff&rev=532772&r1=532771&r2=532772
==============================================================================
---
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/AbstractArchivaXmlTestCase.java
(original)
+++
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/AbstractArchivaXmlTestCase.java
Thu Apr 26 08:07:56 2007
@@ -32,7 +32,11 @@
public abstract class AbstractArchivaXmlTestCase
extends TestCase
{
-
+ protected static final String OSLASH = "\u00f8";
+ protected static final String TRYGVIS = "Trygve Laugst" + OSLASH + "l";
+ protected static final String INFIN = "\u221e";
+ protected static final String INFINITE_ARCHIVA = "The " + INFIN + "
Archiva";
+
protected File getExampleXml( String filename )
{
File examplesDir = new File( "src/test/examples" );
@@ -47,5 +51,4 @@
}
return exampleFile;
}
-
}
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/LatinEntityResolutionReaderTest.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/LatinEntityResolutionReaderTest.java?view=diff&rev=532772&r1=532771&r2=532772
==============================================================================
---
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/LatinEntityResolutionReaderTest.java
(original)
+++
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/LatinEntityResolutionReaderTest.java
Thu Apr 26 08:07:56 2007
@@ -115,30 +115,85 @@
}
}
+ private void assertProperRead( StringBuffer expected, String sourcePath,
int bufSize )
+ {
+ try
+ {
+ File inputFile = getExampleXml( sourcePath );
+
+ FileReader fileReader = new FileReader( inputFile );
+ LatinEntityResolutionReader testReader = new
LatinEntityResolutionReader( fileReader );
+
+ String actualOutput = toStringFromReader( testReader, bufSize );
+
+ assertEquals( "Proper Read: ", expected.toString(), actualOutput );
+ }
+ catch ( IOException e )
+ {
+ fail( "IOException: " + e.getMessage() );
+ }
+ }
+
public void testReaderNormalBufsize()
throws IOException
{
- assertProperRead( "no-prolog-with-entities.xml",
"no-prolog-with-entities.xml-resolved", 4096 );
+ StringBuffer expected = new StringBuffer();
+
+ expected.append( "<basic>\n" );
+ expected.append( " <names>\n" );
+ expected.append( " <name>" ).append( TRYGVIS ).append( "</name>\n"
);
+ expected.append( " <name>" ).append( INFINITE_ARCHIVA ).append(
"</name>\n" );
+ expected.append( " </names>\n" );
+ expected.append( "</basic>" );
+
+ assertProperRead( expected, "no-prolog-with-entities.xml", 4096 );
}
public void testReaderSmallBufsize()
throws IOException
{
- assertProperRead( "no-prolog-with-entities.xml",
"no-prolog-with-entities.xml-resolved", 1024 );
+ StringBuffer expected = new StringBuffer();
+
+ expected.append( "<basic>\n" );
+ expected.append( " <names>\n" );
+ expected.append( " <name>" ).append( TRYGVIS ).append( "</name>\n"
);
+ expected.append( " <name>" ).append( INFINITE_ARCHIVA ).append(
"</name>\n" );
+ expected.append( " </names>\n" );
+ expected.append( "</basic>" );
+
+ assertProperRead( expected, "no-prolog-with-entities.xml", 1024 );
}
public void testReaderRediculouslyTinyBufsize()
throws IOException
{
- assertProperRead( "no-prolog-with-entities.xml",
"no-prolog-with-entities.xml-resolved", 32 );
+ StringBuffer expected = new StringBuffer();
+
+ expected.append( "<basic>\n" );
+ expected.append( " <names>\n" );
+ expected.append( " <name>" ).append( TRYGVIS ).append( "</name>\n"
);
+ expected.append( " <name>" ).append( INFINITE_ARCHIVA ).append(
"</name>\n" );
+ expected.append( " </names>\n" );
+ expected.append( "</basic>" );
+
+ assertProperRead( expected, "no-prolog-with-entities.xml", 32 );
}
public void testReaderHugeBufsize()
throws IOException
{
- assertProperRead( "no-prolog-with-entities.xml",
"no-prolog-with-entities.xml-resolved", 409600 );
+ StringBuffer expected = new StringBuffer();
+
+ expected.append( "<basic>\n" );
+ expected.append( " <names>\n" );
+ expected.append( " <name>" ).append( TRYGVIS ).append( "</name>\n"
);
+ expected.append( " <name>" ).append( INFINITE_ARCHIVA ).append(
"</name>\n" );
+ expected.append( " </names>\n" );
+ expected.append( "</basic>" );
+
+ assertProperRead( expected, "no-prolog-with-entities.xml", 409600 );
}
-
+
public void testNoLatinEntitiesHugeLine()
{
assertProperRead( "commons-codec-1.2.pom", "commons-codec-1.2.pom",
4096 );
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=532772&r1=532771&r2=532772
==============================================================================
---
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 08:07:56 2007
@@ -35,11 +35,6 @@
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() );
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLWriterTest.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/XMLWriterTest.java?view=diff&rev=532772&r1=532771&r2=532772
==============================================================================
---
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLWriterTest.java
(original)
+++
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLWriterTest.java
Thu Apr 26 08:07:56 2007
@@ -44,8 +44,8 @@
Document doc = DocumentHelper.createDocument( basic );
Element names = basic.addElement( "names" );
- names.addElement( "name" ).setText( "Trygve Laugst\u00f8l" );
- names.addElement( "name" ).setText( "The \u221e Archiva" );
+ names.addElement( "name" ).setText( TRYGVIS );
+ names.addElement( "name" ).setText( INFINITE_ARCHIVA );
StringWriter actual = new StringWriter();
XMLWriter.write( doc, actual );
