X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=basic%2Fruntime%2Forg.argeo.basic.nodeps%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Futil%2FCsvParserParseFileTest.java;fp=basic%2Fruntime%2Forg.argeo.basic.nodeps%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Futil%2FCsvParserParseFileTest.java;h=811758a1375d7465b9618af9ddf03647c0cf250b;hb=c92dcc7dcc2150099e701480502fdcf217fa7724;hp=4a134a5781a77d2e2e53c83d20bee1349887e3b4;hpb=c722db7ce68dc32e5db557661858808be3a25a0b;p=lgpl%2Fargeo-commons.git

diff --git a/basic/runtime/org.argeo.basic.nodeps/src/test/java/org/argeo/util/CsvParserParseFileTest.java b/basic/runtime/org.argeo.basic.nodeps/src/test/java/org/argeo/util/CsvParserParseFileTest.java
index 4a134a578..811758a13 100644
--- a/basic/runtime/org.argeo.basic.nodeps/src/test/java/org/argeo/util/CsvParserParseFileTest.java
+++ b/basic/runtime/org.argeo.basic.nodeps/src/test/java/org/argeo/util/CsvParserParseFileTest.java
@@ -1,33 +1,33 @@
 package org.argeo.util;
 
-import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 import junit.framework.TestCase;
 
 public class CsvParserParseFileTest extends TestCase {
 	public void testParse() throws Exception {
-		String toParse = "Header1,\"Header2\",Header3,\"Header4\"\n"
-				+ "Col1,\"Col\n2\",Col3,\"\"\"Col4\"\"\"\n"
-				+ "Col1,\"Col\n2\",Col3,\"\"\"Col4\"\"\"\n"
-				+ "Col1,\"Col\n2\",Col3,\"\"\"Col4\"\"\"\n";
 
-		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));
+		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);
 			}
 		};
 
-		csvParser.parse(in);
+		parser.parse(in);
 		in.close();
+
+		for (Integer i : lines.keySet()) {
+			Map<String, String> curLine = lines.get(i);
+			System.out.println("i : " + i.toString() + " - ID :"
+					+ curLine.get("ID"));
+		}
+		assertEquals(5, lines.size());
 	}
+
 }