From b023e8dad6ebb16fe7400d6663245fb5f0e7da4f Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Fri, 25 May 2007 08:15:27 +0000
Subject: [PATCH] Make a better Unit test of DefaultReaderParser

SVN: 208
---
 .../parser/DefaultReaderParserTest.java       | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/parser/DefaultReaderParserTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/parser/DefaultReaderParserTest.java
index e8f5a94f486..ec837e8e841 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/parser/DefaultReaderParserTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/parser/DefaultReaderParserTest.java
@@ -16,36 +16,38 @@
 
 package ch.systemsx.cisd.common.parser;
 
+import static org.testng.AssertJUnit.assertEquals;
+
+import java.io.IOException;
+import java.io.Reader;
 import java.io.StringReader;
 import java.util.List;
 
-import static org.testng.AssertJUnit.*;
-import org.testng.annotations.BeforeSuite;
+import org.apache.commons.io.IOUtils;
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.common.logging.LogInitializer;
-
 /**
- * Test cases for corresponding  {@link DefaultReaderParser} class. 
- *
+ * Test cases for corresponding {@link DefaultReaderParser} class.
+ * 
  * @author Christian Ribeaud
  */
 public final class DefaultReaderParserTest
 {
-    private final String text = "1.line:\t1\t2\t3\n2.line\t4\t5\t6\n3.line\t7\t8\t9";
-    
-    @BeforeSuite
-    public final void init()
-    {
-        LogInitializer.init();
-    }
-    
+    private final String text =
+            "\n# This is a comment\n" + "firstName\tlastName\taddress\tcity\n"
+                    + "Christian\tRibeaud\tKapfrain 2/2\tEfringen-Kirchen\n"
+                    + "Marcel\tOdiet\tRue des Pervenches 46\t2800 DelŽmont\n";
+
     @Test
-    public final void testParseWithoutFactory()
+    public final void testParseWithoutFactory() throws IOException
     {
         IReaderParser<String[]> parser = new DefaultReaderParser<String[]>();
         parser.setObjectFactory(IParserObjectFactory.DO_NOTHING_OBJECT_FACTORY);
-        List<String[]> result = parser.parse(new StringReader(text));
-        assertEquals(result.get(0)[0], "1.line:");
+        Reader reader = new StringReader(text);
+        List<String[]> result = parser.parse(reader);
+        assertEquals(result.get(0)[0], "firstName");
+        assertEquals(result.get(1)[1], "Ribeaud");
+        assertEquals(result.get(2)[2], "Rue des Pervenches 46");
+        IOUtils.closeQuietly(reader);
     }
 }
\ No newline at end of file
-- 
GitLab