tusharbhatia 01/08/16 12:07:58
Modified: src/org/apache/jmeter/protocol/http/control
HttpTestSample.java
Log:
Fixed non-gui mode error that would be generated because GUI elements are
being added statically. Moved them to getAddList method.
Revision Changes Path
1.21 +495 -256
jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/HttpTestSample.java
Index: HttpTestSample.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/HttpTestSample.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- HttpTestSample.java 2001/08/09 18:48:51 1.20
+++ HttpTestSample.java 2001/08/16 19:07:58 1.21
@@ -1,256 +1,495 @@
-/* Project: Mako
- * Copyright (c) Xerox Corporation 1999-2001. All rights reserved. Xerox, The
- * Document Company, and the stylized X are trademarks of the
Xerox
- * Corporation. All other products are trademarks of their
respective
- * companies.
- *
- * All rights reserved
- * $Header:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/HttpTestSample.java,v
1.20 2001/08/09 18:48:51 mstover1 Exp $
- */
-package org.apache.jmeter.protocol.http.control;
-
-import java.util.*;
-
-import org.apache.jmeter.config.ConfigElement;
-import org.apache.jmeter.protocol.http.config.*;
-import org.apache.jmeter.protocol.http.config.MultipartUrlConfig;
-import org.apache.jmeter.control.GenericController;
-import org.apache.jmeter.control.NoEntryException;
-import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.protocol.http.sampler.*;
-import org.apache.jmeter.control.SamplerController;
-import org.apache.jmeter.samplers.*;
-import org.apache.jmeter.gui.JMeterComponentModel;
-import org.apache.jmeter.gui.MenuFactory;
-
-import org.apache.log4j.*;
-import org.apache.jmeter.control.AbstractGenerativeController;
-
-/************************************************************
- * Title: Apache JMeter Description: Copyright: Copyright (c) 2000 Company:
- * Apache Foundation
- *
- *@author Michael Stover
- *@created $Date: 2001/08/09 18:48:51 $
- *@version 1.0
- ***********************************************************/
-
-public class HttpTestSample extends AbstractGenerativeController implements
JMeterComponentModel
-{
- private UrlConfig defaultUrl;
- private boolean getImages = false;
- private static List addableList = new LinkedList();
-
- private static Category catClass =
- Category.getInstance(HttpTestSample.class);
-
- /************************************************************
- * Constructor for the HttpTestSample object
- ***********************************************************/
-
- public HttpTestSample()
- {
- super();
- catClass.debug("Start : HttpTestSample1");
- defaultUrl = new UrlConfig();
- defaultUrl.setPort(80);
- defaultUrl.setProtocol("http");
- defaultUrl.setMethod(UrlConfig.GET);
- catClass.debug("End : HttpTestSample1");
- }
-
- /************************************************************
- * !ToDo (Method description)
- *
- *@param getImages !ToDo (Parameter description)
- ***********************************************************/
- public void setGetImages(boolean getImages)
- {
- this.getImages = getImages;
- }
-
- /************************************************************
- * Set the default url and parameters to be displayed when this controller is
- * added to a ThreadGroup etc.
- *
- *@param config the default url
- ***********************************************************/
- public void setDefaultUrl(UrlConfig config)
- {
- defaultUrl = config;
- if (catClass.isDebugEnabled())
- {
- catClass.debug("Setting defaultUrl - " + config.toString());
- }
- }
-
- /************************************************************
- * !ToDoo (Method description)
- *
- *@return !ToDo (Return description)
- ***********************************************************/
- public boolean isGetImages()
- {
- return getImages;
- }
-
- /************************************************************
- * Gets the DefaultUrl attribute of the HttpTestSample object
- *
- *@return The DefaultUrl value
- ***********************************************************/
-
- public UrlConfig getDefaultUrl()
- {
-
- if (catClass.isDebugEnabled())
- {
- catClass.debug("Returning defaultUrl - " +
- defaultUrl.toString());
- }
- return defaultUrl;
- }
-
-
- /************************************************************
- * Gets the ClassLabel attribute of the HttpTestSample object
- *
- *@return The ClassLabel value
- ***********************************************************/
-
- public String getClassLabel()
- {
-
- return "Web Testing";
- }
-
-
- /************************************************************
- * Gets the GuiClass attribute of the HttpTestSample object
- *
- *@return The GuiClass value
- ***********************************************************/
-
- public Class getGuiClass()
- {
-
- return
org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui.class;
- }
-
-
- /************************************************************
- * Gets the AddList attribute of the HttpTestSample object
- *
- *@return The AddList value
- ***********************************************************/
-
- public Collection getAddList()
- {
-
- if (catClass.isDebugEnabled())
- {
- for (Iterator iter = addableList.iterator(); iter.hasNext(); )
- {
- catClass.debug(iter.next());
- }
- }
- return addableList;
- }
-
-
- /************************************************************
- * Gets the TagHandlerClass attribute of the HttpTestSample object
- *
- *@return The TagHandlerClass value
- ***********************************************************/
- public Class getTagHandlerClass()
- {
-
- return org.apache.jmeter.save.handlers.HttpTestSampleHandler.class;
- }
-
- /************************************************************
- * !ToDo (Method description)
- ***********************************************************/
- public void convertUrlToMultipart()
- {
- MultipartUrlConfig newConfig = new MultipartUrlConfig();
- newConfig.addConfigElement(defaultUrl);
- defaultUrl = newConfig;
- }
-
- /************************************************************
- * !ToDo (Method description)
- ***********************************************************/
- public void convertUrlToDefault()
- {
- UrlConfig newConfig = new UrlConfig();
- newConfig.addConfigElement(defaultUrl);
- defaultUrl = newConfig;
- }
-
- /************************************************************
- * Clones this object
- *
- *@return the cloned instance
- ***********************************************************/
-
- public Object clone()
- {
- catClass.debug("Start : clone1");
- HttpTestSample control = new HttpTestSample();
- control.setDefaultUrl(defaultUrl);
- control.setGetImages(getImages);
- this.standardCloneProc(control);
-
- catClass.debug("End : clone1");
- return control;
- }
-
- /************************************************************
- * Description of the Method
- *
- *@return Description of the Returned Value
- ***********************************************************/
-
- protected Entry createEntry()
- {
- Entry entry = new Entry();
- entry.addConfigElement(defaultUrl, UrlConfig.class);
- // IMPORTANT : when addind new types of instance of
- // ensure that you add those more specific classes first
- // e.g. UrlConfigFull extends UrlConfig so the test for
- // instance of UrlConfigFull should come before the test for
- // UrlConfig
- if (defaultUrl instanceof MultipartUrlConfig)
- {
- entry.setSamplerClass(MultipartFormSampler.class);
- }
- else if (defaultUrl instanceof UrlConfig)
- {
- if (getImages)
- {
- entry.setSamplerClass(HTTPSamplerFull.class);
- }
- else
- {
- entry.setSamplerClass(HTTPSampler.class);
- }
- }
- configureEntry(entry);
- return entry;
- }
-
- static
- {
- addableList.add(new UrlConfigFull().getClassLabel());
- addableList.add(new UrlConfig().getClassLabel());
- addableList.add(new MultipartUrlConfig().getClassLabel());
- addableList.add(new CookieManager().getClassLabel());
- addableList.add(new HeaderManager().getClassLabel());
- addableList.add(new AuthManager().getClassLabel());
- addableList.add(MenuFactory.getAssertionMenu());
- }
-
-}
-
+/* Project: Mako
+
+ * Copyright (c) Xerox Corporation 1999-2001. All rights reserved. Xerox, The
+
+ * Document Company, and the stylized X are trademarks of the
Xerox
+
+ * Corporation. All other products are trademarks of their
respective
+
+ * companies.
+
+ *
+
+ * All rights reserved
+
+ * $Header:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/HttpTestSample.java,v
1.21 2001/08/16 19:07:58 tusharbhatia Exp $
+
+ */
+
+package org.apache.jmeter.protocol.http.control;
+
+
+
+import java.util.*;
+
+
+
+import org.apache.jmeter.config.ConfigElement;
+
+import org.apache.jmeter.protocol.http.config.*;
+
+import org.apache.jmeter.protocol.http.config.MultipartUrlConfig;
+
+import org.apache.jmeter.control.GenericController;
+
+import org.apache.jmeter.control.NoEntryException;
+
+import org.apache.jmeter.samplers.SampleResult;
+
+import org.apache.jmeter.protocol.http.sampler.*;
+
+import org.apache.jmeter.control.SamplerController;
+
+import org.apache.jmeter.samplers.*;
+
+import org.apache.jmeter.gui.JMeterComponentModel;
+
+import org.apache.jmeter.gui.MenuFactory;
+
+
+
+import org.apache.log4j.*;
+
+import org.apache.jmeter.control.AbstractGenerativeController;
+
+
+
+/************************************************************
+
+ * Title: Apache JMeter Description: Copyright: Copyright (c) 2000 Company:
+
+ * Apache Foundation
+
+ *
+
+ *@author Michael Stover
+
+ *@created $Date: 2001/08/16 19:07:58 $
+
+ *@version 1.0
+
+ ***********************************************************/
+
+
+
+public class HttpTestSample extends AbstractGenerativeController implements
JMeterComponentModel
+
+{
+
+ private UrlConfig defaultUrl;
+
+ private boolean getImages = false;
+
+ private static List addableList = null;
+
+
+
+ private static Category catClass =
+
+ Category.getInstance(HttpTestSample.class);
+
+
+
+ /************************************************************
+
+ * Constructor for the HttpTestSample object
+
+ ***********************************************************/
+
+
+
+ public HttpTestSample()
+
+ {
+
+ super();
+
+ catClass.debug("Start : HttpTestSample1");
+
+ defaultUrl = new UrlConfig();
+
+ defaultUrl.setPort(80);
+
+ defaultUrl.setProtocol("http");
+
+ defaultUrl.setMethod(UrlConfig.GET);
+
+ catClass.debug("End : HttpTestSample1");
+
+ }
+
+
+
+ /************************************************************
+
+ * !ToDo (Method description)
+
+ *
+
+ *@param getImages !ToDo (Parameter description)
+
+ ***********************************************************/
+
+ public void setGetImages(boolean getImages)
+
+ {
+
+ this.getImages = getImages;
+
+ }
+
+
+
+ /************************************************************
+
+ * Set the default url and parameters to be displayed when this controller is
+
+ * added to a ThreadGroup etc.
+
+ *
+
+ *@param config the default url
+
+ ***********************************************************/
+
+ public void setDefaultUrl(UrlConfig config)
+
+ {
+
+ defaultUrl = config;
+
+ if (catClass.isDebugEnabled())
+
+ {
+
+ catClass.debug("Setting defaultUrl - " + config.toString());
+
+ }
+
+ }
+
+
+
+ /************************************************************
+
+ * !ToDoo (Method description)
+
+ *
+
+ *@return !ToDo (Return description)
+
+ ***********************************************************/
+
+ public boolean isGetImages()
+
+ {
+
+ return getImages;
+
+ }
+
+
+
+ /************************************************************
+
+ * Gets the DefaultUrl attribute of the HttpTestSample object
+
+ *
+
+ *@return The DefaultUrl value
+
+ ***********************************************************/
+
+
+
+ public UrlConfig getDefaultUrl()
+
+ {
+
+
+
+ if (catClass.isDebugEnabled())
+
+ {
+
+ catClass.debug("Returning defaultUrl - " +
+
+ defaultUrl.toString());
+
+ }
+
+ return defaultUrl;
+
+ }
+
+
+
+
+
+ /************************************************************
+
+ * Gets the ClassLabel attribute of the HttpTestSample object
+
+ *
+
+ *@return The ClassLabel value
+
+ ***********************************************************/
+
+
+
+ public String getClassLabel()
+
+ {
+
+
+
+ return "Web Testing";
+
+ }
+
+
+
+
+
+ /************************************************************
+
+ * Gets the GuiClass attribute of the HttpTestSample object
+
+ *
+
+ *@return The GuiClass value
+
+ ***********************************************************/
+
+
+
+ public Class getGuiClass()
+
+ {
+
+
+
+ return
org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui.class;
+
+ }
+
+
+
+
+
+ /************************************************************
+
+ * Gets the AddList attribute of the HttpTestSample object
+
+ *
+
+ *@return The AddList value
+
+ ***********************************************************/
+
+
+
+ public Collection getAddList()
+ {
+ if(addableList == null){
+ addableList = new LinkedList();
+ addableList.add(new UrlConfigFull().getClassLabel());
+ addableList.add(new UrlConfig().getClassLabel());
+ addableList.add(new MultipartUrlConfig().getClassLabel());
+ addableList.add(new CookieManager().getClassLabel());
+ addableList.add(new HeaderManager().getClassLabel());
+ addableList.add(new AuthManager().getClassLabel());
+ addableList.add(MenuFactory.getAssertionMenu());
+ }
+
+
+ if (catClass.isDebugEnabled())
+
+ {
+
+ for (Iterator iter = addableList.iterator(); iter.hasNext(); )
+
+ {
+
+ catClass.debug(iter.next());
+
+ }
+
+ }
+
+ return addableList;
+
+ }
+
+
+
+
+
+ /************************************************************
+
+ * Gets the TagHandlerClass attribute of the HttpTestSample object
+
+ *
+
+ *@return The TagHandlerClass value
+
+ ***********************************************************/
+
+ public Class getTagHandlerClass()
+
+ {
+
+
+
+ return org.apache.jmeter.save.handlers.HttpTestSampleHandler.class;
+
+ }
+
+
+
+ /************************************************************
+
+ * !ToDo (Method description)
+
+ ***********************************************************/
+
+ public void convertUrlToMultipart()
+
+ {
+
+ MultipartUrlConfig newConfig = new MultipartUrlConfig();
+
+ newConfig.addConfigElement(defaultUrl);
+
+ defaultUrl = newConfig;
+
+ }
+
+
+
+ /************************************************************
+
+ * !ToDo (Method description)
+
+ ***********************************************************/
+
+ public void convertUrlToDefault()
+
+ {
+
+ UrlConfig newConfig = new UrlConfig();
+
+ newConfig.addConfigElement(defaultUrl);
+
+ defaultUrl = newConfig;
+
+ }
+
+
+
+ /************************************************************
+
+ * Clones this object
+
+ *
+
+ *@return the cloned instance
+
+ ***********************************************************/
+
+
+
+ public Object clone()
+
+ {
+
+ catClass.debug("Start : clone1");
+
+ HttpTestSample control = new HttpTestSample();
+
+ control.setDefaultUrl(defaultUrl);
+
+ control.setGetImages(getImages);
+
+ this.standardCloneProc(control);
+
+
+
+ catClass.debug("End : clone1");
+
+ return control;
+
+ }
+
+
+
+ /************************************************************
+
+ * Description of the Method
+
+ *
+
+ *@return Description of the Returned Value
+
+ ***********************************************************/
+
+
+
+ protected Entry createEntry()
+
+ {
+
+ Entry entry = new Entry();
+
+ entry.addConfigElement(defaultUrl, UrlConfig.class);
+
+ // IMPORTANT : when addind new types of instance of
+
+ // ensure that you add those more specific classes first
+
+ // e.g. UrlConfigFull extends UrlConfig so the test for
+
+ // instance of UrlConfigFull should come before the test for
+
+ // UrlConfig
+
+ if (defaultUrl instanceof MultipartUrlConfig)
+
+ {
+
+ entry.setSamplerClass(MultipartFormSampler.class);
+
+ }
+
+ else if (defaultUrl instanceof UrlConfig)
+
+ {
+
+ if (getImages)
+
+ {
+
+ entry.setSamplerClass(HTTPSamplerFull.class);
+
+ }
+
+ else
+
+ {
+
+ entry.setSamplerClass(HTTPSampler.class);
+
+ }
+
+ }
+
+ configureEntry(entry);
+
+ return entry;
+
+ }
+}
+
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
