Author: sebb
Date: Fri Jan 13 12:50:49 2006
New Revision: 368849
URL: http://svn.apache.org/viewcvs?rev=368849&view=rev
Log:
Move test code to test tree
Added:
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/action/TestSave.java
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/util/
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/util/TestMenuFactory.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Save.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Save.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Save.java?rev=368849&r1=368848&r2=368849&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Save.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Save.java
Fri Jan 13 12:50:49 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -29,7 +28,6 @@
import javax.swing.JFileChooser;
-import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.exceptions.IllegalUserActionException;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
@@ -38,7 +36,6 @@
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jorphan.collections.HashTree;
-import org.apache.jorphan.collections.ListedHashTree;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -132,7 +129,8 @@
}
}
- private void convertSubTree(HashTree tree) {
+ // package protected to all for separate test code
+ void convertSubTree(HashTree tree) {
Iterator iter = new LinkedList(tree.list()).iterator();
while (iter.hasNext()) {
JMeterTreeNode item = (JMeterTreeNode) iter.next();
@@ -162,28 +160,4 @@
}
}
- public static class Test extends junit.framework.TestCase {
- Save save;
-
- public Test(String name) {
- super(name);
- }
-
- public void setUp() {
- save = new Save();
- }
-
- public void testTreeConversion() throws Exception {
- HashTree tree = new ListedHashTree();
- JMeterTreeNode root = new JMeterTreeNode(new
Arguments(), null);
- tree.add(root, root);
- tree.getTree(root).add(root, root);
- save.convertSubTree(tree);
- assertEquals(tree.getArray()[0].getClass().getName(),
root.getTestElement().getClass().getName());
- tree = tree.getTree(tree.getArray()[0]);
- assertEquals(tree.getArray()[0].getClass().getName(),
root.getTestElement().getClass().getName());
-
assertEquals(tree.getTree(tree.getArray()[0]).getArray()[0].getClass().getName(),
root.getTestElement()
- .getClass().getName());
- }
- }
}
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=368849&r1=368848&r2=368849&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Fri Jan 13 12:50:49 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -38,7 +37,6 @@
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.gui.action.ActionRouter;
-import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testbeans.gui.TestBeanGUI;
import org.apache.jmeter.util.JMeterUtils;
@@ -383,38 +381,38 @@
}
}
- // //////////////////////////// Test code
- // ////////////////////////////////////
-
- public static class Test extends JMeterTestCase {
-
- public Test() {
- super();
- }
-
- public Test(String name) {
- super(name);
- }
-
- private static void check(String s, int i) throws Exception {
- assertFalse("The number of " + s + " should not be 0",
0 == i);
- }
-
- public void testMenu() throws Exception {
- check("menumap", menuMap.size());
-
- check("assertions", assertions.size());
- check("configElements", configElements.size());
- check("controllers", controllers.size());
- check("listeners", listeners.size());
- check("nonTestElements", nonTestElements.size());
- check("postProcessors", postProcessors.size());
- check("preProcessors", preProcessors.size());
- check("samplers", samplers.size());
- check("timers", timers.size());
-
- check("elementstoskip", elementsToSkip.size());
-
- }
+ // Methods used for Test cases
+ static int menuMap_size() {
+ return menuMap.size();
+ }
+ static int assertions_size() {
+ return assertions.size();
+ }
+ static int configElements_size() {
+ return configElements.size();
+ }
+ static int controllers_size() {
+ return controllers.size();
+ }
+ static int listeners_size() {
+ return listeners.size();
+ }
+ static int nonTestElements_size() {
+ return nonTestElements.size();
+ }
+ static int postProcessors_size() {
+ return postProcessors.size();
+ }
+ static int preProcessors_size() {
+ return preProcessors.size();
+ }
+ static int samplers_size() {
+ return samplers.size();
+ }
+ static int timers_size() {
+ return timers.size();
+ }
+ static int elementsToSkip_size() {
+ return elementsToSkip.size();
}
}
Added:
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/action/TestSave.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/action/TestSave.java?rev=368849&view=auto
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/action/TestSave.java
(added)
+++
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/action/TestSave.java
Fri Jan 13 12:50:49 2006
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2001-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.gui.action;
+
+import org.apache.jmeter.config.Arguments;
+import org.apache.jmeter.gui.tree.JMeterTreeNode;
+import org.apache.jorphan.collections.HashTree;
+import org.apache.jorphan.collections.ListedHashTree;
+
+public class TestSave extends junit.framework.TestCase {
+ Save save;
+
+ public TestSave(String name) {
+ super(name);
+ }
+
+ public void setUp() {
+ save = new Save();
+ }
+
+ public void testTreeConversion() throws Exception {
+ HashTree tree = new ListedHashTree();
+ JMeterTreeNode root = new JMeterTreeNode(new
Arguments(), null);
+ tree.add(root, root);
+ tree.getTree(root).add(root, root);
+ save.convertSubTree(tree);
+ assertEquals(tree.getArray()[0].getClass().getName(),
root.getTestElement().getClass().getName());
+ tree = tree.getTree(tree.getArray()[0]);
+ assertEquals(tree.getArray()[0].getClass().getName(),
root.getTestElement().getClass().getName());
+
assertEquals(tree.getTree(tree.getArray()[0]).getArray()[0].getClass().getName(),
root.getTestElement()
+ .getClass().getName());
+ }
+}
Added:
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/util/TestMenuFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/util/TestMenuFactory.java?rev=368849&view=auto
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/util/TestMenuFactory.java
(added)
+++
jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/util/TestMenuFactory.java
Fri Jan 13 12:50:49 2006
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2001-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.gui.util;
+
+import org.apache.jmeter.junit.JMeterTestCase;
+
+public final class TestMenuFactory extends JMeterTestCase {
+
+ public TestMenuFactory() {
+ super();
+ }
+
+ public TestMenuFactory(String name) {
+ super(name);
+ }
+
+ private static void check(String s, int i) throws Exception {
+ assertFalse("The number of " + s + " should not be 0",
0 == i);
+ }
+
+ public void testMenu() throws Exception {
+ check("menumap", MenuFactory.menuMap_size());
+
+ check("assertions", MenuFactory.assertions_size());
+ check("configElements",
MenuFactory.configElements_size());
+ check("controllers", MenuFactory.controllers_size());
+ check("listeners", MenuFactory.listeners_size());
+ check("nonTestElements",
MenuFactory.nonTestElements_size());
+ check("postProcessors",
MenuFactory.postProcessors_size());
+ check("preProcessors",
MenuFactory.preProcessors_size());
+ check("samplers", MenuFactory.samplers_size());
+ check("timers", MenuFactory.timers_size());
+
+ check("elementstoskip",
MenuFactory.elementsToSkip_size());
+
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
