X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=basic%2Fruntime%2Forg.argeo.basic.nodeps%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Futil%2FCsvParserTestCase.java;h=1e032357a2d6376e004fe04eef5596f810559d7c;hb=28fc0b142f61ed80aa28d31e830f4821a0939d80;hp=f29b9edea64072adcb9fa849002d0d7f44c12585;hpb=c722db7ce68dc32e5db557661858808be3a25a0b;p=lgpl%2Fargeo-commons.git

diff --git a/basic/runtime/org.argeo.basic.nodeps/src/test/java/org/argeo/util/CsvParserTestCase.java b/basic/runtime/org.argeo.basic.nodeps/src/test/java/org/argeo/util/CsvParserTestCase.java
index f29b9edea..1e032357a 100644
--- a/basic/runtime/org.argeo.basic.nodeps/src/test/java/org/argeo/util/CsvParserTestCase.java
+++ b/basic/runtime/org.argeo.basic.nodeps/src/test/java/org/argeo/util/CsvParserTestCase.java
@@ -1,33 +1,34 @@
 package org.argeo.util;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 
 import junit.framework.TestCase;
 
 public class CsvParserTestCase extends TestCase {
 	public void testParse() throws Exception {
+		String toParse = "Header1,\"Header\n2\",Header3,\"Header4\"\n"
+				+ "Col1,\"Col\n2\",Col3,\"\"\"Col4\"\"\"\n"
+				+ "Col1,\"Col\n2\",Col3,\"\"\"Col4\"\"\"\n"
+				+ "Col1,\"Col\n2\",Col3,\"\"\"Col4\"\"\"\n";
 
-		final Map<Integer, Map<String, String>> lines = new HashMap<Integer, Map<String, String>>();
-		InputStream in = getClass().getResourceAsStream(
-				"/org/argeo/util/ReferenceFile.csv");
-		CsvParserWithLinesAsMap parser = new CsvParserWithLinesAsMap() {
-			protected void processLine(Integer lineNumber,
-					Map<String, String> line) {
-				lines.put(lineNumber, line);
+		InputStream in = new ByteArrayInputStream(toParse.getBytes());
+
+		CsvParser csvParser = new CsvParser() {
+			protected void processLine(Integer lineNumber, List<String> header,
+					List<String> tokens) {
+				assertEquals(header.size(), tokens.size());
+				assertEquals(4, tokens.size());
+				assertEquals("Col1", tokens.get(0));
+				assertEquals("Col\n2", tokens.get(1));
+				assertEquals("Col3", tokens.get(2));
+				assertEquals("\"Col4\"", tokens.get(3));
 			}
 		};
 
-		parser.parse(in);
+		csvParser.parse(in);
 		in.close();
-
-		for (Integer i : lines.keySet()) {
-			Map<String, String> curLine = lines.get(i);
-			System.out.println("i : " + i.toString() + " - EBITAG :"
-					+ curLine.get("EBI Tag"));
-		}
-		assertEquals(11, lines.size());
-
 	}
+
 }