mstover1 2003/08/06 14:18:08
Modified: src/core/org/apache/jmeter/engine/util FunctionParser.java
PackageTest.java
src/core/org/apache/jmeter/util JMeterUtils.java
Log:
Updating javadocs, build version
Revision Changes Path
1.3 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/engine/util/FunctionParser.java
Index: FunctionParser.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/FunctionParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionParser.java 28 Jul 2003 00:54:30 -0000 1.2
+++ FunctionParser.java 6 Aug 2003 21:18:08 -0000 1.3
@@ -49,7 +49,7 @@
{
break;
}
- if(current[0] != '$' && current[0] != ',')
+ if(current[0] != '$' && current[0] != ',' && current[0] !=
'\\')
{
buffer.append(previous);
}
1.2 +28 -1
jakarta-jmeter/src/core/org/apache/jmeter/engine/util/PackageTest.java
Index: PackageTest.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/PackageTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PackageTest.java 27 Jul 2003 20:59:57 -0000 1.1
+++ PackageTest.java 6 Aug 2003 21:18:08 -0000 1.2
@@ -42,7 +42,7 @@
variables.put("my_regex", ".*");
variables.put("server", "jakarta.apache.org");
result = new SampleResult();
- result.setResponseData("<html>hello world</html>".getBytes());
+ result.setResponseData("<html>hello world</html> costs:
$3.47,$5.67".getBytes());
transformer = new ReplaceStringWithFunctions(new CompoundVariable(),
variables);
JMeterContextService.getContext().setSamplingStarted(true);
JMeterContextService.getContext().setPreviousResult(result);
@@ -125,6 +125,33 @@
assertEquals("org.apache.jmeter.testelement.property.FunctionProperty",
newProp.getClass().getName());
assertEquals("html", newProp.getStringValue());
}
+
+ public void testParseExample8() throws Exception
+ {
+ StringProperty prop = new StringProperty("html",
"${__regexFunction((\\\\$\\d+\\.\\d+),$1$)}");
+ JMeterProperty newProp = transformer.transformValue(prop);
+ newProp.setRunningVersion(true);
+ assertEquals("org.apache.jmeter.testelement.property.FunctionProperty",
newProp.getClass().getName());
+ assertEquals("$3.47", newProp.getStringValue());
+ }
+
+ public void testParseExample9() throws Exception
+ {
+ StringProperty prop = new StringProperty("html",
"${__regexFunction(([$]\\d+\\.\\d+),$1$)}");
+ JMeterProperty newProp = transformer.transformValue(prop);
+ newProp.setRunningVersion(true);
+
assertEquals("org.apache.jmeter.testelement.property.FunctionProperty",
newProp.getClass().getName());
+ assertEquals("$3.47", newProp.getStringValue());
+ }
+
+ public void testParseExample10() throws Exception
+ {
+ StringProperty prop = new StringProperty("html",
"${__regexFunction(\\ (\\\\\\$\\d+\\.\\d+\\,\\\\$\\d+\\.\\d+),$1$)}");
+ JMeterProperty newProp = transformer.transformValue(prop);
+ newProp.setRunningVersion(true);
+
assertEquals("org.apache.jmeter.testelement.property.FunctionProperty",
newProp.getClass().getName());
+ assertEquals("$3.47,$5.67", newProp.getStringValue());
+ }
public void testNestedExample1() throws Exception
{
1.39 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- JMeterUtils.java 15 Jul 2003 18:26:01 -0000 1.38
+++ JMeterUtils.java 6 Aug 2003 21:18:08 -0000 1.39
@@ -98,7 +98,7 @@
*/
public class JMeterUtils implements UnitTestManager
{
- private static final String VERSION = "1.9.RC3";
+ private static final String VERSION = "1.9";
private static PatternCacheLRU patternCache =
new PatternCacheLRU(1000, new Perl5Compiler());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
