Author: sebb
Date: Fri Jan 13 12:31:59 2006
New Revision: 368842
URL: http://svn.apache.org/viewcvs?rev=368842&view=rev
Log:
Move test code to test tree
Added:
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/engine/TestTreeCloner.java
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/TreeCloner.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/TreeCloner.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/TreeCloner.java?rev=368842&r1=368841&r2=368842&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/TreeCloner.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/TreeCloner.java
Fri Jan 13 12:31:59 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -20,16 +19,8 @@
import java.util.LinkedList;
-import org.apache.jmeter.config.Argument;
-import org.apache.jmeter.config.Arguments;
-import org.apache.jmeter.control.GenericController;
import org.apache.jmeter.engine.util.NoThreadClone;
-import org.apache.jmeter.reporters.ResultCollector;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.TestPlan;
-import org.apache.jmeter.testelement.property.CollectionProperty;
-import org.apache.jmeter.testelement.property.JMeterProperty;
-import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.collections.HashTreeTraverser;
import org.apache.jorphan.collections.ListedHashTree;
@@ -78,56 +69,4 @@
public void processPath() {
}
- public static class Test extends junit.framework.TestCase {
- public Test(String name) {
- super(name);
- }
-
- public void testCloning() throws Exception {
- ListedHashTree original = new ListedHashTree();
- GenericController controller = new GenericController();
- controller.setName("controller");
- Arguments args = new Arguments();
- args.setName("args");
- TestPlan plan = new TestPlan();
- plan.addParameter("server", "jakarta");
- original.add(controller, args);
- original.add(plan);
- ResultCollector listener = new ResultCollector();
- listener.setName("Collector");
- original.add(controller, listener);
- TreeCloner cloner = new TreeCloner();
- original.traverse(cloner);
- ListedHashTree newTree = cloner.getClonedTree();
- assertTrue(original != newTree);
- assertEquals(original.size(), newTree.size());
-
assertEquals(original.getTree(original.getArray()[0]).size(),
newTree.getTree(newTree.getArray()[0]).size());
- assertTrue(original.getArray()[0] !=
newTree.getArray()[0]);
- assertEquals(((GenericController)
original.getArray()[0]).getName(), ((GenericController) newTree
- .getArray()[0]).getName());
-
assertSame(original.getTree(original.getArray()[0]).getArray()[1],
newTree.getTree(newTree.getArray()[0])
- .getArray()[1]);
- 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();
- PropertyIterator iter = ((CollectionProperty)
vars.getProperty(Arguments.ARGUMENTS)).iterator();
- while (iter.hasNext()) {
- JMeterProperty argProp = iter.next();
- assertTrue(!argProp.isRunningVersion());
- assertTrue(argProp.getObjectValue() instanceof
Argument);
- Argument arg = (Argument)
argProp.getObjectValue();
- arg.setValue("yahoo");
- assertEquals("yahoo", arg.getValue());
- }
- vars = (Arguments)
clonedTestPlan.getProperty(TestPlan.USER_DEFINED_VARIABLES).getObjectValue();
- iter = vars.propertyIterator();
- while (iter.hasNext()) {
- assertTrue(iter.next().isRunningVersion());
- }
- }
-
- }
}
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/ValueReplacer.java?rev=368842&r1=368841&r2=368842&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
Fri Jan 13 12:31:59 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
@@ -18,7 +17,6 @@
package org.apache.jmeter.engine.util;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -26,19 +24,13 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
-import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.functions.InvalidVariableException;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestPlan;
-import org.apache.jmeter.testelement.property.CollectionProperty;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.MultiProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.testelement.property.StringProperty;
-import org.apache.jmeter.threads.JMeterContextService;
-import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -146,61 +138,5 @@
props.add(val);
}
return props;
- }
-
- public static class Test extends TestCase {
- TestPlan variables;
-
- public Test(String name) {
- super(name);
- }
-
- public void setUp() {
- variables = new TestPlan();
- variables.addParameter("server", "jakarta.apache.org");
- variables.addParameter("username", "jack");
- variables.addParameter("password", "jacks_password");
- variables.addParameter("regex", ".*");
- JMeterVariables vars = new JMeterVariables();
- vars.put("server", "jakarta.apache.org");
- JMeterContextService.getContext().setVariables(vars);
-
JMeterContextService.getContext().setSamplingStarted(true);
- }
-
- public void testReverseReplacement() throws Exception {
- ValueReplacer replacer = new ValueReplacer(variables);
-
assertTrue(variables.getUserDefinedVariables().containsKey("server"));
- assertTrue(replacer.variables.containsKey("server"));
- TestElement element = new TestPlan();
- element.setProperty(new StringProperty("domain",
"jakarta.apache.org"));
- List args = new ArrayList();
- args.add("username is jack");
- args.add("jacks_password");
- element.setProperty(new CollectionProperty("args",
args));
- replacer.reverseReplace(element);
- assertEquals("${server}",
element.getPropertyAsString("domain"));
- args = (List)
element.getProperty("args").getObjectValue();
- assertEquals("${password}", ((JMeterProperty)
args.get(1)).getStringValue());
- }
-
- public void testReplace() throws Exception {
- ValueReplacer replacer = new ValueReplacer();
-
replacer.setUserDefinedVariables(variables.getUserDefinedVariables());
- TestElement element = new ConfigTestElement();
- element.setProperty(new StringProperty("domain",
"${server}"));
- replacer.replaceValues(element);
- log.debug("domain property = " +
element.getProperty("domain"));
- element.setRunningVersion(true);
- assertEquals("jakarta.apache.org",
element.getPropertyAsString("domain"));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
-
JMeterContextService.getContext().setSamplingStarted(false);
- }
}
}
Added:
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/engine/TestTreeCloner.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/engine/TestTreeCloner.java?rev=368842&view=auto
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/engine/TestTreeCloner.java
(added)
+++
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/engine/TestTreeCloner.java
Fri Jan 13 12:31:59 2006
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jmeter.engine;
+
+import org.apache.jmeter.config.Argument;
+import org.apache.jmeter.config.Arguments;
+import org.apache.jmeter.control.GenericController;
+import org.apache.jmeter.reporters.ResultCollector;
+import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jmeter.testelement.property.CollectionProperty;
+import org.apache.jmeter.testelement.property.JMeterProperty;
+import org.apache.jmeter.testelement.property.PropertyIterator;
+import org.apache.jorphan.collections.ListedHashTree;
+
+public class TestTreeCloner extends junit.framework.TestCase {
+ public TestTreeCloner(String name) {
+ super(name);
+ }
+
+ public void testCloning() throws Exception {
+ ListedHashTree original = new ListedHashTree();
+ GenericController controller = new GenericController();
+ controller.setName("controller");
+ Arguments args = new Arguments();
+ args.setName("args");
+ TestPlan plan = new TestPlan();
+ plan.addParameter("server", "jakarta");
+ original.add(controller, args);
+ original.add(plan);
+ ResultCollector listener = new ResultCollector();
+ listener.setName("Collector");
+ original.add(controller, listener);
+ TreeCloner cloner = new TreeCloner();
+ original.traverse(cloner);
+ ListedHashTree newTree = cloner.getClonedTree();
+ assertTrue(original != newTree);
+ assertEquals(original.size(), newTree.size());
+
assertEquals(original.getTree(original.getArray()[0]).size(),
newTree.getTree(newTree.getArray()[0]).size());
+ assertTrue(original.getArray()[0] !=
newTree.getArray()[0]);
+ assertEquals(((GenericController)
original.getArray()[0]).getName(), ((GenericController) newTree
+ .getArray()[0]).getName());
+
assertSame(original.getTree(original.getArray()[0]).getArray()[1],
newTree.getTree(newTree.getArray()[0])
+ .getArray()[1]);
+ 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();
+ PropertyIterator iter = ((CollectionProperty)
vars.getProperty(Arguments.ARGUMENTS)).iterator();
+ while (iter.hasNext()) {
+ JMeterProperty argProp = iter.next();
+ assertTrue(!argProp.isRunningVersion());
+ assertTrue(argProp.getObjectValue() instanceof
Argument);
+ Argument arg = (Argument)
argProp.getObjectValue();
+ arg.setValue("yahoo");
+ assertEquals("yahoo", arg.getValue());
+ }
+ vars = (Arguments)
clonedTestPlan.getProperty(TestPlan.USER_DEFINED_VARIABLES).getObjectValue();
+ iter = vars.propertyIterator();
+ while (iter.hasNext()) {
+ assertTrue(iter.next().isRunningVersion());
+ }
+ }
+}
\ No newline at end of file
Added:
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java?rev=368842&view=auto
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
(added)
+++
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
Fri Jan 13 12:31:59 2006
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2003-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jmeter.engine.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.apache.jmeter.config.ConfigTestElement;
+import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jmeter.testelement.property.CollectionProperty;
+import org.apache.jmeter.testelement.property.JMeterProperty;
+import org.apache.jmeter.testelement.property.StringProperty;
+import org.apache.jmeter.threads.JMeterContextService;
+import org.apache.jmeter.threads.JMeterVariables;
+
+/**
+ * @author Michael Stover
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jordi Salvat i Alabart</a>
+ * @version $Revision: 325648 $ updated on $Date: 2005-08-18 21:38:49 +0100
(Thu, 18 Aug 2005) $
+ */
+public class TestValueReplacer extends TestCase {
+ TestPlan variables;
+
+ public TestValueReplacer(String name) {
+ super(name);
+ }
+
+ public void setUp() {
+ variables = new TestPlan();
+ variables.addParameter("server", "jakarta.apache.org");
+ variables.addParameter("username", "jack");
+ variables.addParameter("password", "jacks_password");
+ variables.addParameter("regex", ".*");
+ JMeterVariables vars = new JMeterVariables();
+ vars.put("server", "jakarta.apache.org");
+ JMeterContextService.getContext().setVariables(vars);
+
JMeterContextService.getContext().setSamplingStarted(true);
+ }
+
+ public void testReverseReplacement() throws Exception {
+ ValueReplacer replacer = new ValueReplacer(variables);
+
assertTrue(variables.getUserDefinedVariables().containsKey("server"));
+ assertTrue(replacer.variables.containsKey("server"));
+ TestElement element = new TestPlan();
+ element.setProperty(new StringProperty("domain",
"jakarta.apache.org"));
+ List args = new ArrayList();
+ args.add("username is jack");
+ args.add("jacks_password");
+ element.setProperty(new CollectionProperty("args",
args));
+ replacer.reverseReplace(element);
+ assertEquals("${server}",
element.getPropertyAsString("domain"));
+ args = (List)
element.getProperty("args").getObjectValue();
+ assertEquals("${password}", ((JMeterProperty)
args.get(1)).getStringValue());
+ }
+
+ public void testReplace() throws Exception {
+ ValueReplacer replacer = new ValueReplacer();
+
replacer.setUserDefinedVariables(variables.getUserDefinedVariables());
+ TestElement element = new ConfigTestElement();
+ element.setProperty(new StringProperty("domain",
"${server}"));
+ replacer.replaceValues(element);
+ //log.debug("domain property = " +
element.getProperty("domain"));
+ element.setRunningVersion(true);
+ assertEquals("jakarta.apache.org",
element.getPropertyAsString("domain"));
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see junit.framework.TestCase#tearDown()
+ */
+ protected void tearDown() throws Exception {
+
JMeterContextService.getContext().setSamplingStarted(false);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
