sebb 2005/08/18 14:08:08
Modified: test/src/org/apache/jmeter/save Tag: rel-2-1
TestSaveService.java
Log:
Allow for comparing DOS JMX with Unix format output
Revision Changes Path
No revision
No revision
1.5.2.1 +12 -2
jakarta-jmeter/test/src/org/apache/jmeter/save/TestSaveService.java
Index: TestSaveService.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/test/src/org/apache/jmeter/save/TestSaveService.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- TestSaveService.java 12 Jul 2005 20:51:06 -0000 1.5
+++ TestSaveService.java 18 Aug 2005 21:08:08 -0000 1.5.2.1
@@ -67,11 +67,21 @@
// fail, because the order of the properties within each
// test element may change. Comparing the lengths
should be
// enough to detect most problem cases...
- if (len != out.size()) {
+ int outsz=out.size();
+ // Allow for input in CRLF and output in LF only
+ int lines=0;
+ byte ba[]=out.toByteArray();
+ for(int j=0;j<ba.length;j++) {
+ if (ba[j] == '\n'){
+ lines++;
+ }
+ }
+ if (len != outsz && len != outsz+lines) {
failed = true;
System.out.println();
System.out.println("Loading file testfiles/" +
FILES[i] + " and "
- + "saving it back changes its
size from " + len + " to " + out.size() + ".");
+ + "saving it back changes its
size from " + len + " to " + outsz + ".");
+ System.out.println("Diff "+(len-outsz)+" lines "+lines);
if (saveOut) {
String outfile = "testfiles/" +
FILES[i] + ".out";
System.out.println("Write " + outfile);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
