sebb 2005/05/14 15:30:15
Modified: src/core/org/apache/jmeter/testelement TestPlan.java
src/core/org/apache/jmeter/engine StandardJMeterEngine.java
src/core/org/apache/jmeter/reporters ResultCollector.java
Log:
Confine functionalMode to TestPlan
Revision Changes Path
1.15 +15 -6
jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestPlan.java
Index: TestPlan.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestPlan.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TestPlan.java 10 Dec 2004 21:32:52 -0000 1.14
+++ TestPlan.java 14 May 2005 22:30:15 -0000 1.15
@@ -62,6 +62,9 @@
private static List itemsCanAdd = new LinkedList();
private static TestPlan plan;
+ // There's only 1 test plan, so can cache the mode here
+ private static boolean functionalMode = false;
+
static {
// WARNING! This String value must be identical to the String value
// returned in org.apache.jmeter.threads.ThreadGroup.getClassLabel()
@@ -85,10 +88,10 @@
setProperty(new CollectionProperty(THREAD_GROUPS, threadGroups));
}
- public boolean isFunctionalMode()
- {
- return getPropertyAsBoolean(FUNCTIONAL_MODE);
- }
+// public boolean isFunctionalMode()
+// {
+// return getPropertyAsBoolean(FUNCTIONAL_MODE);
+// }
public void setUserDefinedVariables(Arguments vars)
{
@@ -126,6 +129,12 @@
public void setFunctionalMode(boolean funcMode)
{
setProperty(new BooleanProperty(FUNCTIONAL_MODE, funcMode));
+ functionalMode = funcMode;
+ }
+
+ public static boolean getFunctionalMode()
+ {
+ return functionalMode;
}
public void setSerialized(boolean serializeTGs)
1.58 +0 -11
jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Index: StandardJMeterEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- StandardJMeterEngine.java 2 May 2005 23:33:02 -0000 1.57
+++ StandardJMeterEngine.java 14 May 2005 22:30:15 -0000 1.58
@@ -29,7 +29,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.jmeter.reporters.ResultCollector;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testbeans.TestBeanHelper;
import org.apache.jmeter.testelement.TestElement;
@@ -199,15 +198,6 @@
}
}
- protected void setMode()
- {
- SearchByClass testPlan = new SearchByClass(TestPlan.class);
- getTestTree().traverse(testPlan);
- Object[] plan = testPlan.getSearchResults().toArray();
- ResultCollector.enableFunctionalMode(((TestPlan) plan[0])
- .isFunctionalMode());
- }
-
protected void notifyTestListenersOfStart()
{
Iterator iter = testListeners.getSearchResults().iterator();
@@ -353,7 +343,6 @@
getTestTree().getArray()[0]));
removeThreadGroups(testLevelElements);
SearchByClass searcher = new SearchByClass(ThreadGroup.class);
- setMode();
getTestTree().traverse(searcher);
TestCompiler.initialize();
//for each thread group, generate threads
1.50 +0 -10
jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ResultCollector.java 14 May 2005 22:22:47 -0000 1.49
+++ ResultCollector.java 14 May 2005 22:30:15 -0000 1.50
@@ -83,8 +83,6 @@
public final static String SAVE_CONFIG = "saveConfig";
- private static boolean functionalMode = false;
-
public static final String ERROR_LOGGING =
"ResultCollector.error_logging";
// protected List results = Collections.synchronizedList(new
ArrayList());
@@ -313,14 +311,6 @@
return true;
}
- public static void enableFunctionalMode(boolean mode) {
- functionalMode = mode;
- }
-
- public boolean getFunctionalMode() {
- return functionalMode || isErrorLogging();
- }
-
/**
* Gets the serializedSampleResult attribute of the ResultCollector
object.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
