joerg/datastructures
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

add LF after last written column, not before new column

Browse source
This commit is contained in:
Jörg Prante 2022-06-22 17:01:18 +02:00
parent 7a4716dd7b
commit e1e9a35cd7
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
datastructures-csv/src/main/java/org/xbib/datastructures/csv/Generator.java
View file

@ -59,19 +59,18 @@ public class Generator implements Constants, Closeable, Flushable {
} }
public synchronized void write(String value) throws IOException { public synchronized void write(String value) throws IOException {
if (col >= keys.size()) { if (col > 0) {
writer.write(LF); writer.write(separator);
row++;
col = 0;
} else {
if (col > 0) {
writer.write(separator);
}
} }
if (value != null) { if (value != null) {
writer.write(escape(value)); writer.write(escape(value));
} }
col++; col++;
if (col >= keys.size()) {
writer.write(LF);
row++;
col = 0;
}
} }
public int getColumn() { public int getColumn() {

8
datastructures-csv/src/test/java/org/xbib/datastructures/csv/test/GeneratorTest.java
View file

@ -18,7 +18,7 @@ public class GeneratorTest {
gen.write("val" + i); gen.write("val" + i);
} }
gen.close(); gen.close();
assertEquals("val0\nval1", writer.toString()); assertEquals("val0\nval1\n", writer.toString());
} }
@Test @Test
@ -31,7 +31,7 @@ public class GeneratorTest {
gen.write("val" + i); gen.write("val" + i);
} }
gen.close(); gen.close();
assertEquals("val0,val0\nval1,val1", writer.toString()); assertEquals("val0,val0\nval1,val1\n", writer.toString());
} }
@Test @Test
@ -45,7 +45,7 @@ public class GeneratorTest {
gen.write("hey look a line seperator \n"); gen.write("hey look a line seperator \n");
} }
gen.close(); gen.close();
assertEquals("val0,\"\"\"Hello, World\"\"\",\"hey look a line seperator \n\"", writer.toString()); assertEquals("val0,\"\"\"Hello, World\"\"\",\"hey look a line seperator \n\"\n", writer.toString());
} }
@Test @Test
@ -59,7 +59,7 @@ public class GeneratorTest {
gen.write("hey look a line seperator \n"); gen.write("hey look a line seperator \n");
} }
gen.close(); gen.close();
assertEquals("\"val0\";\"\"\"Hello, World\"\"\";\"hey look a line seperator \n\"", writer.toString()); assertEquals("\"val0\";\"\"\"Hello, World\"\"\";\"hey look a line seperator \n\"\n", writer.toString());
} }
} }