mstover1 2005/08/18 13:38:49
Modified: src/core/org/apache/jmeter/testelement/property Tag: rel-2-1
FunctionProperty.java
src/core/org/apache/jmeter/engine/util Tag: rel-2-1
ValueReplacer.java
src/core/org/apache/jmeter/samplers Tag: rel-2-1
SampleSaveConfiguration.java
src/core/org/apache/jmeter/gui Tag: rel-2-1
SavePropertyDialog.java
Log:
Fixing a few more bugs including element names not supporting functions
anymore (now they do again). Also, save dialog was improperly handling
saveResponseData and saveSamplerData
Revision Changes Path
No revision
No revision
1.18.2.2 +3 -2
jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
Index: FunctionProperty.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -r1.18.2.1 -r1.18.2.2
--- FunctionProperty.java 18 Aug 2005 17:21:51 -0000 1.18.2.1
+++ FunctionProperty.java 18 Aug 2005 20:38:48 -0000 1.18.2.2
@@ -74,6 +74,7 @@
log.debug("Not running version, return raw function
string");
return function.getRawParameters();
} else {
+ if(!ctx.isSamplingStarted()) return function.execute();
log.debug("Running version, executing function");
int iter = ctx.getVariables() != null ?
ctx.getVariables().getIteration() : -1;
if (iter < testIteration) {
No revision
No revision
1.17.2.1 +4 -4
jakarta-jmeter/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
Index: ValueReplacer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/ValueReplacer.java,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -r1.17 -r1.17.2.1
--- ValueReplacer.java 12 Jul 2005 20:50:51 -0000 1.17
+++ ValueReplacer.java 18 Aug 2005 20:38:48 -0000 1.17.2.1
@@ -120,8 +120,8 @@
}
if (val instanceof StringProperty) {
// Must not convert TestElement.gui_class etc
- // TODO but perhaps we want to convert
TestElement.name ?
- if (!val.getName().startsWith("TestElement.")) {
+ if
(!val.getName().equals(TestElement.GUI_CLASS) &&
+ !val.getName().equals(TestElement.TEST_CLASS)) {
val = transform.transformValue(val);
if (log.isDebugEnabled()) {
log.debug("Replacement result:
" + val);
No revision
No revision
1.9.2.1 +10 -0
jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
Index: SampleSaveConfiguration.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- SampleSaveConfiguration.java 12 Jul 2005 20:50:56 -0000 1.9
+++ SampleSaveConfiguration.java 18 Aug 2005 20:38:49 -0000 1.9.2.1
@@ -476,6 +476,11 @@
public boolean saveResponseData(SampleResult res) {
return responseData || TestPlan.getFunctionalMode() ||
(responseDataOnError && !res.isSuccessful());
}
+
+ public boolean saveResponseData()
+ {
+ return responseData;
+ }
/**
* @param responseData
@@ -492,6 +497,11 @@
return samplerData || TestPlan.getFunctionalMode() // as per
2.0 branch
|| (responseDataOnError && !res.isSuccessful());
}
+
+ public boolean saveSamplerData()
+ {
+ return samplerData;
+ }
/**
* @param samplerData
No revision
No revision
1.4.2.1 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
Index: SavePropertyDialog.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/SavePropertyDialog.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- SavePropertyDialog.java 12 Jul 2005 20:50:54 -0000 1.4
+++ SavePropertyDialog.java 18 Aug 2005 20:38:49 -0000 1.4.2.1
@@ -92,7 +92,7 @@
JPanel checkPanel = new JPanel(new GridLayout(x, 3));
for (int i = 0; i < methods.length; i++) {
String name = methods[i].getName();
- if (name.startsWith("save")) {
+ if (name.startsWith("save") &&
methods[i].getParameterTypes().length == 0) {
try {
name = name.substring(4);
JCheckBox check = new
JCheckBox(JMeterUtils.getResString("save " + name), ((Boolean) methods[i]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
