You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/04/02 18:29:02 UTC
svn commit: r390848 - in /jakarta/jmeter/branches/rel-2-1:
src/core/org/apache/jmeter/reporters/ src/core/org/apache/jmeter/save/
test/src/org/apache/jmeter/save/
Author: sebb
Date: Sun Apr 2 09:29:00 2006
New Revision: 390848
URL: http://svn.apache.org/viewcvs?rev=390848&view=rev
Log:
Replace direct access to static final strings with accessors to prevent problems with stale versions if dependent classes are not recompiled
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/save/TestSaveService.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=390848&r1=390847&r2=390848&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java Sun Apr 2 09:29:00 2006
@@ -70,7 +70,7 @@
private static final String TESTRESULTS_START = "<testResults>"; // $NON-NLS-1$
private static final String TESTRESULTS_START_V1_1 = "<testResults version=\"" // $NON-NLS-1$
- + SaveService.version + "\">"; // $NON-NLS-1$
+ + SaveService.getVERSION() + "\">"; // $NON-NLS-1$
private static final String TESTRESULTS_END = "</testResults>"; // $NON-NLS-1$
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java?rev=390848&r1=390847&r2=390848&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java Sun Apr 2 09:29:00 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -104,15 +104,15 @@
// Version information for test plan header
// This is written to JMX files by ScriptWrapperConverter
// Also to JTL files by ResultCollector
- public static final String version = "1.2"; // $NON-NLS-1$
+ private static final String VERSION = "1.2"; // $NON-NLS-1$
// This is written to JMX files by ScriptWrapperConverter
- static String propertiesVersion = "";// read from properties file; written to JMX files
- static final String PROPVERSION = "1.8";// Expected $NON-NLS-1$
+ private static String propertiesVersion = "";// read from properties file; written to JMX files
+ private static final String PROPVERSION = "1.8";// Expected version $NON-NLS-1$
// Internal information only
- static String fileVersion = ""; // read from properties file// $NON-NLS-1$
- static final String FILEVERSION = "390699";// Expected $NON-NLS-1$
+ private static String fileVersion = ""; // read from properties file// $NON-NLS-1$
+ private static final String FILEVERSION = "390699";// Expected value $NON-NLS-1$
static {
log.info("Testplan (JMX) version: "+TESTPLAN_FORMAT+". Testlog (JTL) version: "+TESTLOG_FORMAT);
@@ -241,7 +241,7 @@
writer.write('\n');
}
- static boolean versionsOK = true;
+ private static boolean versionsOK = true;
// Extract version digits from String of the form #Revision: n.mm #
// (where # is actually $ above)
@@ -271,7 +271,16 @@
}
}
- static void checkVersions() {
+ // Routines for TestSaveService
+ static boolean checkPropertyVersion(){
+ return SaveService.PROPVERSION.equals(SaveService.propertiesVersion);
+ }
+
+ static boolean checkFileVersion(){
+ return SaveService.FILEVERSION.equals(SaveService.fileVersion);
+ }
+
+ static boolean checkVersions() {
versionsOK = true;
checkVersion(BooleanPropertyConverter.class, "332820"); // $NON-NLS-1$
checkVersion(HashTreeConverter.class, "332820"); // $NON-NLS-1$
@@ -303,6 +312,7 @@
if (versionsOK) {
log.info("All converter versions present and correct");
}
+ return versionsOK;
}
public static TestResultWrapper loadTestResults(InputStream reader) throws Exception {
@@ -365,5 +375,13 @@
+ "\n" + ce.get("message")
+ "\nPerhaps a missing jar? See log file.";
return msg;
+ }
+
+ public static String getPropertiesVersion() {
+ return propertiesVersion;
+ }
+
+ public static String getVERSION() {
+ return VERSION;
}
}
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java?rev=390848&r1=390847&r2=390848&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java Sun Apr 2 09:29:00 2006
@@ -68,10 +68,10 @@
*/
public void marshal(Object arg0, HierarchicalStreamWriter writer, MarshallingContext context) {
ScriptWrapper wrap = (ScriptWrapper) arg0;
- ConversionHelp.setOutVersion(SaveService.version);// Ensure output
- // follows version
- writer.addAttribute(ATT_VERSION, SaveService.version);
- writer.addAttribute(ATT_PROPERTIES, SaveService.propertiesVersion);
+ String version = SaveService.getVERSION();
+ ConversionHelp.setOutVersion(version);// Ensure output follows version
+ writer.addAttribute(ATT_VERSION, version);
+ writer.addAttribute(ATT_PROPERTIES, SaveService.getPropertiesVersion());
writer.startNode(classMapper.serializedClass(wrap.testPlan.getClass()));
context.convertAnother(wrap.testPlan);
writer.endNode();
Modified: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/save/TestSaveService.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/save/TestSaveService.java?rev=390848&r1=390847&r2=390848&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/save/TestSaveService.java (original)
+++ jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/save/TestSaveService.java Sun Apr 2 09:29:00 2006
@@ -45,13 +45,12 @@
super(name);
}
public void testPropfile() throws Exception {
- assertEquals("Property Version mismatch", SaveService.PROPVERSION, SaveService.propertiesVersion);
- assertEquals("Property File Version mismatch", SaveService.FILEVERSION, SaveService.fileVersion);
+ assertTrue("Property Version mismatch", SaveService.checkPropertyVersion());
+ assertTrue("Property File Version mismatch", SaveService.checkFileVersion());
}
public void testVersions() throws Exception {
- SaveService.checkVersions();
- assertTrue("Unexpected version found", SaveService.versionsOK);
+ assertTrue("Unexpected version found", SaveService.checkVersions());
}
public void testLoadAndSave() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org