sebb 2004/02/12 01:30:10
Modified: src/functions/org/apache/jmeter/functions
FileRowColContainer.java PackageTest.java
Log:
Treat a blank line as EOF when reading the CSV file
Revision Changes Path
1.3 +6 -3
jakarta-jmeter/src/functions/org/apache/jmeter/functions/FileRowColContainer.java
Index: FileRowColContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/FileRowColContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileRowColContainer.java 10 Feb 2004 00:35:12 -0000 1.2
+++ FileRowColContainer.java 12 Feb 2004 09:30:10 -0000 1.3
@@ -90,7 +90,10 @@
FileReader fis = new FileReader(fileName);
myBread = new BufferedReader(fis);
String line = myBread.readLine();
- while (line != null)
+ /* N.B. Stop reading the file if we get a blank line:
+ * This allows for trailing comments in the file
+ */
+ while (line != null && line.length() > 0)
{
fileData.add(splitLine(line,delimiter));
line = myBread.readLine();
1.8 +28 -2
jakarta-jmeter/src/functions/org/apache/jmeter/functions/PackageTest.java
Index: PackageTest.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/PackageTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PackageTest.java 10 Feb 2004 00:35:12 -0000 1.7
+++ PackageTest.java 12 Feb 2004 09:30:10 -0000 1.8
@@ -79,6 +79,7 @@
suite.addTest(new PackageTest("CSVRun"));
suite.addTest(new PackageTest("CSValias"));
+ suite.addTest(new PackageTest("CSVBlankLine"));
//Reset files
suite.addTest(new PackageTest("CSVSetup"));
@@ -306,5 +307,30 @@
log.info("Expecting cannot open file");
s = cr4.execute(null,null);
assertEquals("",s);
+ }
+
+ // Check blank lines are treated as EOF
+ public void CSVBlankLine() throws Exception
+ {
+ CSVRead csv1 = setParams("testfiles/testblank.csv","1");
+ CSVRead csv2 = setParams("testfiles/testblank.csv","next");
+
+ String s;
+
+ for (int i = 1; i<=2; i++)
+ {
+ s= csv1.execute(null,null);
+ assertEquals("b1",s);
+
+ s= csv2.execute(null,null);
+ assertEquals("",s);
+
+ s= csv1.execute(null,null);
+ assertEquals("b2",s);
+
+ s= csv2.execute(null,null);
+ assertEquals("",s);
+ }
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
