Author: sebb
Date: Thu Oct 20 15:48:12 2005
New Revision: 327020
URL: http://svn.apache.org/viewcvs?rev=327020&view=rev
Log:
Fix versions to work better with SVN and JTL files
Modified:
jakarta/jmeter/branches/rel-2-1/bin/saveservice.properties
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java
Modified: jakarta/jmeter/branches/rel-2-1/bin/saveservice.properties
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/bin/saveservice.properties?rev=327020&r1=327019&r2=327020&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/bin/saveservice.properties (original)
+++ jakarta/jmeter/branches/rel-2-1/bin/saveservice.properties Thu Oct 20
15:48:12 2005
@@ -11,8 +11,11 @@
# Please keep the entries in alphabetical order within the sections
# to reduce the likelihood of duplicates
#
-# version number of this file (automatically generated by CVS)
-_version=$Revision$
+# version number of this file (automatically generated by SVN)
+_file_version=$Revision$
+#
+# Conversion version (for JTL output files)
+_version=1.7
#
#---------------------------------------------------------
#
@@ -105,3 +108,6 @@
_org.apache.jmeter.save.converters.TestElementPropertyConverter=collection
_org.apache.jmeter.save.converters.TestResultWrapperConverter=collection
_org.apache.jmeter.save.ScriptWrapperConverter=mapping
+#
+# Remember to update the _version entry
+#
\ No newline at end of file
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=327020&r1=327019&r2=327020&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
Thu Oct 20 15:48:12 2005
@@ -65,8 +65,11 @@
public static final String version = "1.1";
static String propertiesVersion = "";// read from properties file
+ private static final String PROPVERSION = "1.7";
- private static final String PROPVERSION = "325411";
+ // Internal information only
+ private static String fileVersion = ""; // read from properties file
+ private static final String FILEVERSION = "325411";
// Helper method to simplify alias creation from properties
private static void makeAlias(String alias, String clazz) {
@@ -96,9 +99,12 @@
} else {
// process special keys
if (key.equalsIgnoreCase("_version")) {
- val = extractVersion(val);
log.info("Using SaveService
properties file " + val);
propertiesVersion = val;
+ } else if (key.equalsIgnoreCase("_file_version")) {
+ val = extractVersion(val);
+ log.info("Using SaveService properties file " +
val);
+ fileVersion = val;
} else {
key = key.substring(1);
try {
@@ -238,8 +244,11 @@
checkVersion(ScriptWrapperConverter.class, "325542");
checkVersion(TestResultWrapperConverter.class, "325542");
if (!PROPVERSION.equalsIgnoreCase(propertiesVersion)) {
- log.warn("Property file - expected " + PROPVERSION + ",
found " + propertiesVersion);
+ log.warn("Bad _version - expected " + PROPVERSION + ",
found " + propertiesVersion + ".");
}
+ if (!FILEVERSION.equalsIgnoreCase(fileVersion)) {
+ log.warn("Bad _file_version - expected " + FILEVERSION + ", found
" + fileVersion +".");
+ }
if (versionsOK) {
log.info("All converter versions present and correct");
}
@@ -288,11 +297,15 @@
super(name);
}
+ public void testPropfile() throws Exception {
+ assertEquals("Property Version mismatch", PROPVERSION,
propertiesVersion);
+ assertEquals("Property File Version mismatch", FILEVERSION,
fileVersion);
+ }
+
public void testVersions() throws Exception {
initProps();
checkVersions();
assertTrue("Unexpected version found", versionsOK);
- assertEquals("Property Version mismatch", PROPVERSION,
propertiesVersion);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
