Author: sebb
Date: Sat Apr 12 06:51:15 2008
New Revision: 647450
URL: http://svn.apache.org/viewvc?rev=647450&view=rev
Log:
Don't instantiate GUI in unit tests
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java?rev=647450&r1=647449&r2=647450&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java
Sat Apr 12 06:51:15 2008
@@ -26,14 +26,9 @@
import junit.framework.TestSuite;
-import org.apache.jmeter.gui.GuiPackage;
-import org.apache.jmeter.gui.tree.JMeterTreeListener;
-import org.apache.jmeter.gui.tree.JMeterTreeModel;
import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.save.SaveService;
import org.apache.jorphan.collections.HashTree;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
/**
*
@@ -41,8 +36,6 @@
*/
public class TestLoad extends JMeterTestCase {
- private static final Logger log = LoggingManager.getLoggerForClass();
-
private static final String basedir = new
File(System.getProperty("user.dir")).getParent();
private static final File testfiledir = new
File(basedir,"bin/testfiles");
private static final File demofiledir = new File(basedir,"xdocs/demos");
@@ -55,8 +48,6 @@
notTestPlan.add("ProxyServerTestPlan.jmx");// used by
TestSaveService
}
- private static GuiPackage guiInstance = null;
-
private static final FilenameFilter jmxFilter = new FilenameFilter() {
public boolean accept(File dir, String name) {
return name.endsWith(".jmx");
@@ -80,7 +71,7 @@
public static TestSuite suite(){
TestSuite suite=new TestSuite("Load Test");
- suite.addTest(new TestLoad("checkGuiPackage"));
+ //suite.addTest(new TestLoad("checkGuiPackage"));
scanFiles(suite,testfiledir);
scanFiles(suite,demofiledir);
return suite;
@@ -93,17 +84,6 @@
suite.addTest(new
TestLoad("checkTestFile",testFiles[i],dir));
}
}
-
- public void checkGuiPackage(){
- guiInstance = GuiPackage.getInstance();
- if (guiInstance == null){// e.g. if running this test
stand-alone
- System.out.println("Creating GuiPackage");
- JMeterTreeModel treeModel = new JMeterTreeModel();
- JMeterTreeListener treeLis = new
JMeterTreeListener(treeModel);
- guiInstance = GuiPackage.getInstance(treeLis,
treeModel);
- }
- assertNotNull("GuiPackage should not be null",guiInstance);
- }
public void checkTestFile() throws Exception{
HashTree tree = null;
@@ -119,14 +99,6 @@
final Object object = tree.getArray()[0];
final String name = testFile.getName();
- if (parent.equals("demos") && guiInstance != null) {
- try {
- guiInstance.addSubTree(tree);
- } catch (Exception e){
- log.warn(parent+ ": " +name,e);
- fail(parent+ ": " +name+" "+e);
- }
- }
if (! (object instanceof
org.apache.jmeter.testelement.TestPlan) && !notTestPlan.contains(name)){
fail(parent+ ": " +name+" tree should be TestPlan, but
is "+object.getClass().getName());
}
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java?rev=647450&r1=647449&r2=647450&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java Sat
Apr 12 06:51:15 2008
@@ -42,12 +42,8 @@
import org.apache.jmeter.config.gui.ObsoleteGui;
import org.apache.jmeter.engine.util.CompoundVariable;
import org.apache.jmeter.functions.Function;
-import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.gui.UnsharedComponent;
-import org.apache.jmeter.gui.action.ActionRouter;
-import org.apache.jmeter.gui.tree.JMeterTreeListener;
-import org.apache.jmeter.gui.tree.JMeterTreeModel;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testbeans.TestBean;
@@ -131,20 +127,6 @@
* Use a suite to allow the tests to be generated at run-time
*/
public static Test suite() throws Exception {
- // ensure the GuiPackage is initialized.
- JMeterTreeModel treeModel = new JMeterTreeModel();
- JMeterTreeListener treeLis = new JMeterTreeListener(treeModel);
- treeLis.setActionHandler(ActionRouter.getInstance());
- GuiPackage.getInstance(treeLis, treeModel);
-// Does not seem to be necessary after all
-// try {
-// // The GuiPackage needs a MainFrame to work:
-// org.apache.jmeter.gui.MainFrame main = new
org.apache.jmeter.gui.MainFrame(ActionRouter.getInstance(),
-// treeModel, treeLis);
-// } catch (RuntimeException e) {
-// System.out.println("Cannot create MainFrame: " + e);
-// }
-
// The Locale used to instantiate the GUI objects
JMeterUtils.setLocale(TEST_LOCALE);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
