Author: sebb
Date: Fri Oct 19 05:16:25 2007
New Revision: 586398
URL: http://svn.apache.org/viewvc?rev=586398&view=rev
Log:
Tidy casts; use new TestPlan methods
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/TestTreeCloner.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java?rev=586398&r1=586397&r2=586398&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
Fri Oct 19 05:16:25 2007
@@ -38,6 +38,7 @@
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.threads.gui.ThreadGroupGui;
import org.apache.jmeter.util.JMeterUtils;
@@ -143,14 +144,16 @@
*/
public void configure(TestElement el) {
super.configure(el);
- functionalMode.setSelected(((AbstractTestElement)
el).getPropertyAsBoolean(TestPlan.FUNCTIONAL_MODE));
-
- serializedMode.setSelected(((AbstractTestElement)
el).getPropertyAsBoolean(TestPlan.SERIALIZE_THREADGROUPS));
-
- if (el.getProperty(TestPlan.USER_DEFINED_VARIABLES) != null) {
- argsPanel.configure((Arguments)
el.getProperty(TestPlan.USER_DEFINED_VARIABLES).getObjectValue());
+ if (el instanceof TestPlan) {
+ TestPlan tp = (TestPlan) el;
+ functionalMode.setSelected(tp.isFunctionalMode());
+ serializedMode.setSelected(tp.isSerialized());
+ final JMeterProperty udv =
tp.getUserDefinedVariablesAsProperty();
+ if (udv != null) {
+ argsPanel.configure((Arguments) udv.getObjectValue());
+ }
+ browseJar.setFiles(tp.getTestPlanClasspathArray());
}
- browseJar.setFiles( ((TestPlan)el).getTestPlanClasspathArray() );
}
/**
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=586398&r1=586397&r2=586398&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Fri Oct 19 05:16:25 2007
@@ -686,8 +686,8 @@
// Special case for the TestPlan's
Arguments sub-element:
if (element instanceof TestPlan) {
- Arguments args = (Arguments)
element.getProperty(TestPlan.USER_DEFINED_VARIABLES)
-
.getObjectValue();
+ TestPlan tp = (TestPlan)
element;
+ Arguments args =
tp.getArguments();
if (myClass.isInstance(args)) {
if (ascending)
elements.addFirst(args);
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/TestTreeCloner.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/TestTreeCloner.java?rev=586398&r1=586397&r2=586398&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/TestTreeCloner.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/TestTreeCloner.java
Fri Oct 19 05:16:25 2007
@@ -60,9 +60,9 @@
TestPlan clonedTestPlan = (TestPlan)
newTree.getArray()[1];
clonedTestPlan.setRunningVersion(true);
clonedTestPlan.recoverRunningVersion();
-
assertTrue(!plan.getProperty(TestPlan.USER_DEFINED_VARIABLES).isRunningVersion());
-
assertTrue(clonedTestPlan.getProperty(TestPlan.USER_DEFINED_VARIABLES).isRunningVersion());
- Arguments vars = (Arguments)
plan.getProperty(TestPlan.USER_DEFINED_VARIABLES).getObjectValue();
+
assertTrue(!plan.getUserDefinedVariablesAsProperty().isRunningVersion());
+
assertTrue(clonedTestPlan.getUserDefinedVariablesAsProperty().isRunningVersion());
+ Arguments vars = (Arguments)
plan.getUserDefinedVariablesAsProperty().getObjectValue();
PropertyIterator iter = ((CollectionProperty)
vars.getProperty(Arguments.ARGUMENTS)).iterator();
while (iter.hasNext()) {
JMeterProperty argProp = iter.next();
@@ -72,7 +72,7 @@
arg.setValue("yahoo");
assertEquals("yahoo", arg.getValue());
}
- vars = (Arguments)
clonedTestPlan.getProperty(TestPlan.USER_DEFINED_VARIABLES).getObjectValue();
+ vars = (Arguments)
clonedTestPlan.getUserDefinedVariablesAsProperty().getObjectValue();
iter = vars.propertyIterator();
while (iter.hasNext()) {
assertTrue(iter.next().isRunningVersion());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
