You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2012/09/13 23:32:01 UTC
svn commit: r1384551 -
/jmeter/trunk/test/src/org/apache/jmeter/save/TestCSVSaveService.java
Author: sebb
Date: Thu Sep 13 21:32:00 2012
New Revision: 1384551
URL: http://svn.apache.org/viewvc?rev=1384551&view=rev
Log:
Add some more tests
Modified:
jmeter/trunk/test/src/org/apache/jmeter/save/TestCSVSaveService.java
Modified: jmeter/trunk/test/src/org/apache/jmeter/save/TestCSVSaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/save/TestCSVSaveService.java?rev=1384551&r1=1384550&r2=1384551&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/save/TestCSVSaveService.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/save/TestCSVSaveService.java Thu Sep 13 21:32:00 2012
@@ -94,13 +94,15 @@ public class TestCSVSaveService extends
}
public void testSplitMultiLine() throws Exception {
- String line="a,,\"c\nd\",e\n,,f,g,";
+ String line="a,,\"c\nd\",e\n,,f,g,\n\n";
String[] out;
BufferedReader br = new BufferedReader(new StringReader(line));
out = CSVSaveService.csvReadFile(br, ',');
checkStrings(new String[]{"a","","c\nd","e"}, out);
out = CSVSaveService.csvReadFile(br, ',');
checkStrings(new String[]{"","","f","g",""}, out);
+ out = CSVSaveService.csvReadFile(br, ',');
+ checkStrings(new String[]{""}, out); // Blank line
assertEquals("Expected to be at EOF",-1,br.read());
// Empty strings at EOF
out = CSVSaveService.csvReadFile(br, ',');
@@ -108,4 +110,32 @@ public class TestCSVSaveService extends
out = CSVSaveService.csvReadFile(br, ',');
checkStrings(new String[]{}, out);
}
+
+ public void testBlankLine() throws Exception {
+ BufferedReader br = new BufferedReader(new StringReader("\n"));
+ String[] out = CSVSaveService.csvReadFile(br, ',');
+ checkStrings(new String[]{""}, out);
+ assertEquals("Expected to be at EOF",-1,br.read());
+ }
+
+ public void testBlankLineQuoted() throws Exception {
+ BufferedReader br = new BufferedReader(new StringReader("\"\"\n"));
+ String[] out = CSVSaveService.csvReadFile(br, ',');
+ checkStrings(new String[]{""}, out);
+ assertEquals("Expected to be at EOF",-1,br.read());
+ }
+
+ public void testEmptyFile() throws Exception {
+ BufferedReader br = new BufferedReader(new StringReader(""));
+ String[] out = CSVSaveService.csvReadFile(br, ',');
+ checkStrings(new String[]{}, out);
+ assertEquals("Expected to be at EOF",-1,br.read());
+ }
+
+ public void testShortFile() throws Exception {
+ BufferedReader br = new BufferedReader(new StringReader("a"));
+ String[] out = CSVSaveService.csvReadFile(br, ',');
+ checkStrings(new String[]{"a"}, out);
+ assertEquals("Expected to be at EOF",-1,br.read());
+ }
}