sebb 2004/06/22 14:49:00
Modified: src/core/org/apache/jmeter/save SaveService.java
Log:
Start the JUnit tests
Revision Changes Path
1.43 +30 -4 jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java
Index: SaveService.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- SaveService.java 22 Jun 2004 00:04:28 -0000 1.42
+++ SaveService.java 22 Jun 2004 21:48:59 -0000 1.43
@@ -26,6 +26,7 @@
import java.util.Map;
import java.util.Properties;
+import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.save.converters.BooleanPropertyConverter;
import org.apache.jmeter.save.converters.HashTreeConverter;
import org.apache.jmeter.save.converters.IntegerPropertyConverter;
@@ -62,6 +63,7 @@
// Version information for test plan header
static String version="1.0";
static String propertiesVersion="";//read from properties file
+ private static final String PROPVERSION="$Revision$";
// Helper method to simplify alias creation from properties
private static void makeAlias(String alias,String clazz)
@@ -73,10 +75,9 @@
}
}
- static
+ private static void initProps()
{
-
- // Load the alias properties
+ // Load the alias properties
Properties nameMap = new Properties();
try
{
@@ -112,8 +113,11 @@
{
log.error("Bad saveservice properties file",e);
}
-
+ }
+ static
+ {
+ initProps();
saver.alias("stringProp",StringProperty.class);
saver.alias("intProp",IntegerProperty.class);
saver.alias("longProp",LongProperty.class);
@@ -173,6 +177,10 @@
checkVersion(TestElementConverter.class,"1.2");
checkVersion(TestElementPropertyConverter.class,"1.2");
checkVersion(ScriptWrapperConverter.class,"1.2");
+ if (!PROPVERSION.equalsIgnoreCase(propertiesVersion))
+ {
+ log.warn("Property file - expected "+PROPVERSION+", found
"+propertiesVersion);
+ }
if (versionsOK)
{
log.info("All converter versions present and correct");
@@ -199,5 +207,23 @@
reader.reset();
return OldSaveService.loadSubTree(reader);
}
+ }
+ public static class Test extends JMeterTestCase
+ {
+ public Test() {
+ super();
+ }
+
+ public Test(String name) {
+ super(name);
+ }
+
+ public void testVersions() throws Exception
+ {
+ initProps();
+ checkVersions();
+ assertTrue("Unexpected version found",versionsOK);
+ assertEquals(PROPVERSION,propertiesVersion);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
