You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2012/09/08 10:31:31 UTC
svn commit: r1382248 - in /jmeter/trunk:
src/core/org/apache/jmeter/save/SaveService.java
test/src/org/apache/jmeter/save/TestSaveService.java
Author: pmouawad
Date: Sat Sep 8 08:31:31 2012
New Revision: 1382248
URL: http://svn.apache.org/viewvc?rev=1382248&view=rev
Log:
Bug 53841 - CSVSaveService reads file using JVM default file encoding instead of using the one configured in saveservice.properties
Fix test failure and clarify failure message
Bugzilla Id: 53841
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1382248&r1=1382247&r2=1382248&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Sat Sep 8 08:31:31 2012
@@ -175,7 +175,7 @@ public class SaveService {
// Internal information only
private static String fileVersion = ""; // read from saveservice.properties file// $NON-NLS-1$
- private static final String FILEVERSION = "1374385"; // Expected value $NON-NLS-1$
+ private static final String FILEVERSION = "1382180"; // Expected value $NON-NLS-1$
private static String fileEncoding = ""; // read from properties file// $NON-NLS-1$
static {
Modified: jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java?rev=1382248&r1=1382247&r2=1382248&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java Sat Sep 8 08:31:31 2012
@@ -71,8 +71,8 @@ public class TestSaveService extends JMe
super(name);
}
public void testPropfile() throws Exception {
- assertTrue("Property Version mismatch", SaveService.checkPropertyVersion());
- assertTrue("Property File Version mismatch", SaveService.checkFileVersion());
+ assertTrue("Property Version mismatch, ensure you update SaveService#PROPVERSION field with _version property value from saveservice.properties", SaveService.checkPropertyVersion());
+ assertTrue("Property File Version mismatch, ensure you update SaveService#FILEVERSION field with revision id of saveservice.properties", SaveService.checkFileVersion());
}
public void testVersions() throws Exception {