You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by ms...@apache.org on 2003/05/08 20:29:16 UTC
cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui ParamModifierGui.java URLRewritingModifierGui.java UserParameterModifierGui.java
mstover1 2003/05/08 11:29:15
Modified: bin jmeter.properties
src/core/org/apache/jmeter JMeter.java
src/core/org/apache/jmeter/config/gui ArgumentsPanel.java
src/core/org/apache/jmeter/control/gui TestPlanGui.java
src/core/org/apache/jmeter/gui/tree JMeterTreeModel.java
src/core/org/apache/jmeter/gui/util MenuFactory.java
src/core/org/apache/jmeter/testelement/property
CollectionProperty.java MapProperty.java
src/core/org/apache/jmeter/threads TestCompiler.java
src/core/org/apache/jmeter/threads/gui ThreadGroupGui.java
src/protocol/http/org/apache/jmeter/protocol/http/config/gui
UrlConfigGui.java
src/protocol/http/org/apache/jmeter/protocol/http/modifier
URLRewritingModifier.java
src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui
ParamModifierGui.java URLRewritingModifierGui.java
UserParameterModifierGui.java
Removed: src/core/org/apache/jmeter/config Modifier.java
ResponseBasedModifier.java
src/core/org/apache/jmeter/config/gui
AbstractModifierGui.java
AbstractResponseBasedModifierGui.java
Log:
Removing obsolete modifiers and response-based modifiers, converting everything to pre and post processors
bug fix with User Parameters
Making saving and loading the workbench easier
Revision Changes Path
1.72 +1 -1 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- jmeter.properties 2 May 2003 20:58:10 -0000 1.71
+++ jmeter.properties 8 May 2003 18:29:13 -0000 1.72
@@ -72,7 +72,7 @@
#Logging levels for the logging categories in JMeter. Correct values are FATAL_ERROR, ERROR, WARN, INFO, and DEBUG
log_level.jmeter=WARN
log_level.jmeter.engine=WARN
-log_level.jmeter.gui=WARN
+log_level.jmeter.gui=DEBUG
log_level.jmeter.elements=WARN
log_level.jmeter.util=WARN
log_level.jmeter.util.classfinder=WARN
1.13 +4 -4 jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
Index: JMeter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JMeter.java 1 May 2003 15:49:05 -0000 1.12
+++ JMeter.java 8 May 2003 18:29:14 -0000 1.13
@@ -64,8 +64,6 @@
import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
import org.apache.avalon.excalibur.cli.CLUtil;
import org.apache.jmeter.config.gui.AbstractConfigGui;
-import org.apache.jmeter.config.gui.AbstractModifierGui;
-import org.apache.jmeter.config.gui.AbstractResponseBasedModifierGui;
import org.apache.jmeter.control.gui.AbstractControllerGui;
import org.apache.jmeter.control.gui.TestPlanGui;
import org.apache.jmeter.control.gui.WorkBenchGui;
@@ -82,6 +80,8 @@
import org.apache.jmeter.gui.tree.JMeterTreeModel;
import org.apache.jmeter.plugin.JMeterPlugin;
import org.apache.jmeter.plugin.PluginManager;
+import org.apache.jmeter.processor.gui.AbstractPostProcessorGui;
+import org.apache.jmeter.processor.gui.AbstractPreProcessorGui;
import org.apache.jmeter.reporters.ResultCollector;
import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
import org.apache.jmeter.save.SaveService;
@@ -433,8 +433,8 @@
{ ThreadGroupGui.class.getName(), "org/apache/jmeter/images/thread.gif"},
{ AbstractVisualizer.class.getName(), "org/apache/jmeter/images/meter.png"},
{ AbstractConfigGui.class.getName(), "org/apache/jmeter/images/testtubes.png"},
- { AbstractModifierGui.class.getName(), "org/apache/jmeter/images/testtubes.gif"},
- { AbstractResponseBasedModifierGui.class.getName(), "org/apache/jmeter/images/testtubes.gif"},
+ { AbstractPreProcessorGui.class.getName(), "org/apache/jmeter/images/testtubes.gif"},
+ { AbstractPostProcessorGui.class.getName(), "org/apache/jmeter/images/testtubes.gif"},
{ AbstractControllerGui.class.getName(), "org/apache/jmeter/images/knob.gif"},
{ WorkBenchGui.class.getName(), "org/apache/jmeter/images/clipboard.gif"},
{ AbstractSamplerGui.class.getName(), "org/apache/jmeter/images/pipet.png"}
1.11 +3 -2 jakarta-jmeter/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
Index: ArgumentsPanel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ArgumentsPanel.java 27 Apr 2003 12:22:00 -0000 1.10
+++ ArgumentsPanel.java 8 May 2003 18:29:14 -0000 1.11
@@ -344,8 +344,9 @@
// table.setRowHeight(renderer.getPreferredHeight());
// table.setDefaultRenderer(String.class,renderer);
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
- return new JScrollPane(table);
+ JScrollPane pane = new JScrollPane(table);
+ pane.setPreferredSize(pane.getMinimumSize());
+ return pane;
}
private JPanel makeButtonPanel() {
1.11 +3 -3 jakarta-jmeter/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
Index: TestPlanGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/TestPlanGui.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TestPlanGui.java 27 Apr 2003 12:22:01 -0000 1.10
+++ TestPlanGui.java 8 May 2003 18:29:14 -0000 1.11
@@ -53,8 +53,8 @@
addMenu.add(MenuFactory.makeMenu(MenuFactory.LISTENERS, "Add"));
addMenu.add(MenuFactory.makeMenu(MenuFactory.CONFIG_ELEMENTS, "Add"));
addMenu.add(MenuFactory.makeMenu(MenuFactory.ASSERTIONS, "Add"));
- addMenu.add(MenuFactory.makeMenu(MenuFactory.MODIFIERS, "Add"));
- addMenu.add(MenuFactory.makeMenu(MenuFactory.RESPONSE_BASED_MODIFIERS, "Add"));
+ addMenu.add(MenuFactory.makeMenu(MenuFactory.PRE_PROCESSORS, "Add"));
+ addMenu.add(MenuFactory.makeMenu(MenuFactory.POST_PROCESSORS, "Add"));
addMenu.add(MenuFactory.makeMenu(MenuFactory.TIMERS, "Add"));
pop.add(addMenu);
MenuFactory.addFileMenu(pop);
1.15 +8 -1 jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
Index: JMeterTreeModel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JMeterTreeModel.java 30 Apr 2003 16:52:14 -0000 1.14
+++ JMeterTreeModel.java 8 May 2003 18:29:14 -0000 1.15
@@ -136,6 +136,13 @@
((TestPlan)current.getUserObject()).setFunctionalMode(item.getPropertyAsBoolean(TestPlan.FUNCTIONAL_MODE));
addSubTree(subTree.getTree(item), current);
}
+ else if(item instanceof WorkBench)
+ {
+ current = (JMeterTreeNode) ((JMeterTreeNode) getRoot()).getChildAt(1);
+ ((TestElement) current.getUserObject()).addTestElement(item);
+ ((WorkBench)current.getUserObject()).setName(item.getPropertyAsString(TestElement.NAME));
+ addSubTree(subTree.getTree(item), current);
+ }
else
{
addSubTree(subTree.getTree(item), addComponent(item, current));
1.17 +3 -32 jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Index: MenuFactory.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MenuFactory.java 5 May 2003 17:23:02 -0000 1.16
+++ MenuFactory.java 8 May 2003 18:29:14 -0000 1.17
@@ -107,10 +107,6 @@
* !ToDo (Field description)
***************************************/
public final static String CONFIG_ELEMENTS = "menu_config_element";
- /****************************************
- * !ToDo (Field description)
- ***************************************/
- public final static String MODIFIERS = "menu_modifiers";
public final static String POST_PROCESSORS = "menu_post_processors";
@@ -118,10 +114,6 @@
/****************************************
* !ToDo (Field description)
***************************************/
- public final static String RESPONSE_BASED_MODIFIERS = "menu_response_based_modifiers";
- /****************************************
- * !ToDo (Field description)
- ***************************************/
public final static String ASSERTIONS = "menu_assertions";
/****************************************
* !ToDo (Field description)
@@ -135,15 +127,12 @@
private static Set elementsToSkip = new HashSet();
private static List timers, controllers, samplers,
- configElements, modifiers, responseBasedModifiers,
- assertions, listeners, nonTestElements,postProcessors,preProcessors;
+ configElements, assertions, listeners, nonTestElements,postProcessors,preProcessors;
private static JMenu timerMenu;
private static JMenu controllerMenu;
private static JMenu generativeControllerMenu;
private static JMenu listenerMenu;
- private static JMenu ModifierMenu;
- private static JMenu ResponseBasedModifierMenu;
private static JMenu assertionMenu;
private static JMenu configMenu;
private static JMenu insertControllerMenu;
@@ -266,7 +255,6 @@
JPopupMenu pop = new JPopupMenu();
pop.add(MenuFactory.makeMenus(new String[]{MenuFactory.CONTROLLERS,
MenuFactory.SAMPLERS, MenuFactory.CONFIG_ELEMENTS,
- MenuFactory.MODIFIERS,MenuFactory.RESPONSE_BASED_MODIFIERS,
MenuFactory.TIMERS,
MenuFactory.LISTENERS,
MenuFactory.PRE_PROCESSORS,
@@ -289,8 +277,7 @@
{
JPopupMenu pop = new JPopupMenu();
pop.add(MenuFactory.makeMenus(new String[]{MenuFactory.CONFIG_ELEMENTS,
- MenuFactory.ASSERTIONS,MenuFactory.MODIFIERS,
- MenuFactory.RESPONSE_BASED_MODIFIERS,
+ MenuFactory.ASSERTIONS,
MenuFactory.TIMERS,
MenuFactory.LISTENERS,
MenuFactory.PRE_PROCESSORS,
@@ -460,8 +447,6 @@
controllers = new LinkedList();
samplers = new LinkedList();
configElements = new LinkedList();
- modifiers = new LinkedList();
- responseBasedModifiers = new LinkedList();
assertions = new LinkedList();
listeners = new LinkedList();
postProcessors = new LinkedList();
@@ -472,9 +457,7 @@
menuMap.put(CONFIG_ELEMENTS, configElements);
menuMap.put(CONTROLLERS, controllers);
menuMap.put(LISTENERS, listeners);
- menuMap.put(MODIFIERS, modifiers);
menuMap.put(NON_TEST_ELEMENTS, nonTestElements);
- menuMap.put(RESPONSE_BASED_MODIFIERS, responseBasedModifiers);
menuMap.put(SAMPLERS, samplers);
menuMap.put(POST_PROCESSORS,postProcessors);
menuMap.put(PRE_PROCESSORS,preProcessors);
@@ -534,21 +517,9 @@
item.getClass().getName()));
}
- if(categories.contains(RESPONSE_BASED_MODIFIERS))
- {
- responseBasedModifiers.add(new MenuInfo(item.getStaticLabel(),
- item.getClass().getName()));
- }
-
if(categories.contains(NON_TEST_ELEMENTS))
{
nonTestElements.add(new MenuInfo(item.getStaticLabel(),
- item.getClass().getName()));
- }
-
- if(categories.contains(MODIFIERS))
- {
- modifiers.add(new MenuInfo(item.getStaticLabel(),
item.getClass().getName()));
}
1.8 +21 -4 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
Index: CollectionProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CollectionProperty.java 5 May 2003 17:23:02 -0000 1.7
+++ CollectionProperty.java 8 May 2003 18:29:14 -0000 1.8
@@ -1,8 +1,10 @@
package org.apache.jmeter.testelement.property;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.testelement.TestElement;
public class CollectionProperty extends MultiProperty
@@ -20,6 +22,7 @@
public CollectionProperty()
{
super();
+ value = new ArrayList();
}
public boolean equals(Object o)
@@ -166,10 +169,7 @@
*/
public void addProperty(JMeterProperty prop)
{
- if (value.size() == 0 || value.iterator().next().getClass().equals(prop.getClass()))
- {
- value.add(prop);
- }
+ value.add(prop);
}
public void addItem(Object item)
@@ -205,6 +205,23 @@
savedValue = null;
}
recoverRunningVersionOfSubElements(owner);
+ }
+
+ public static class Test extends JMeterTestCase
+ {
+ public Test(String name)
+ {
+ super(name);
+ }
+
+ public void testAddingProperties() throws Exception
+ {
+ CollectionProperty coll = new CollectionProperty();
+ coll.addItem("joe");
+ coll.addProperty(new FunctionProperty());
+ assertEquals("joe",coll.get(0).getName());
+ assertEquals("org.apache.jmeter.testelement.property.FunctionProperty",coll.get(1).getClass().getName());
+ }
}
}
1.8 +4 -7 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/MapProperty.java
Index: MapProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/MapProperty.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MapProperty.java 5 May 2003 17:23:02 -0000 1.7
+++ MapProperty.java 8 May 2003 18:29:14 -0000 1.8
@@ -126,13 +126,10 @@
public void addProperty(String name, JMeterProperty prop)
{
- if (value.size() == 0 || value.values().iterator().next().getClass().equals(prop.getClass()))
- {
- if (!value.containsKey(name))
- {
- value.put(name, prop);
- }
- }
+ if (!value.containsKey(name))
+ {
+ value.put(name, prop);
+ }
}
public void setMap(Map newMap)
1.24 +5 -40 jakarta-jmeter/src/core/org/apache/jmeter/threads/TestCompiler.java
Index: TestCompiler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/TestCompiler.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TestCompiler.java 2 May 2003 12:28:47 -0000 1.23
+++ TestCompiler.java 8 May 2003 18:29:15 -0000 1.24
@@ -11,8 +11,6 @@
import org.apache.jmeter.assertions.Assertion;
import org.apache.jmeter.config.ConfigTestElement;
-import org.apache.jmeter.config.Modifier;
-import org.apache.jmeter.config.ResponseBasedModifier;
import org.apache.jmeter.control.Controller;
import org.apache.jmeter.control.GenericController;
import org.apache.jmeter.engine.event.LoopIterationListener;
@@ -120,8 +118,6 @@
pack.setSampler(sampler);
runPreProcessors(pack.getPreProcessors());
configureWithConfigElements(sampler, pack.getConfigs());
- configureWithResponseModifiers(sampler, pack.getResponseModifiers());
- configureWithModifiers(sampler, pack.getModifiers());
//replaceStatics(ret);
return pack;
}
@@ -229,14 +225,6 @@
{
configs.add(item);
}
- if (item instanceof Modifier)
- {
- modifiers.add(item);
- }
- if (item instanceof ResponseBasedModifier)
- {
- responseModifiers.add(item);
- }
if (item instanceof SampleListener)
{
listeners.add(item);
@@ -386,29 +374,6 @@
while (iter.hasNext())
{
sam.addTestElement((ConfigTestElement) iter.next());
- }
- }
-
- private void configureWithModifiers(Sampler sam, List modifiers)
- {
- Iterator iter = modifiers.iterator();
- while (iter.hasNext())
- {
- Modifier mod = (Modifier) iter.next();
- mod.modifyEntry(sam);
- }
- }
-
- private void configureWithResponseModifiers(Sampler sam, List responseModifiers)
- {
- Iterator iter = responseModifiers.iterator();
- while (iter.hasNext())
- {
- ResponseBasedModifier mod = (ResponseBasedModifier) iter.next();
- if (previousResult != null)
- {
- mod.modifyEntry(sam, previousResult);
- }
}
}
}
1.13 +4 -2 jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
Index: ThreadGroupGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ThreadGroupGui.java 27 Apr 2003 12:22:01 -0000 1.12
+++ ThreadGroupGui.java 8 May 2003 18:29:15 -0000 1.13
@@ -161,7 +161,9 @@
JPopupMenu pop = new JPopupMenu();
pop.add(
MenuFactory.makeMenus(
- new String[] { MenuFactory.CONTROLLERS, MenuFactory.LISTENERS, MenuFactory.SAMPLERS, MenuFactory.TIMERS, MenuFactory.CONFIG_ELEMENTS },
+ new String[] { MenuFactory.CONTROLLERS, MenuFactory.LISTENERS, MenuFactory.SAMPLERS,
+ MenuFactory.TIMERS, MenuFactory.CONFIG_ELEMENTS,MenuFactory.PRE_PROCESSORS,
+ MenuFactory.POST_PROCESSORS },
JMeterUtils.getResString("Add"),
"Add"));
MenuFactory.addEditMenu(pop, true);
1.11 +8 -7 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Index: UrlConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- UrlConfigGui.java 27 Apr 2003 23:04:34 -0000 1.10
+++ UrlConfigGui.java 8 May 2003 18:29:15 -0000 1.11
@@ -57,6 +57,7 @@
import java.awt.BorderLayout;
import java.awt.Component;
+import java.awt.FlowLayout;
import javax.swing.BorderFactory;
import javax.swing.Box;
@@ -69,7 +70,6 @@
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.ConfigTestElement;
-import org.apache.jmeter.gui.util.HorizontalPanel;
import org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel;
import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
@@ -222,7 +222,7 @@
webServerPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
JMeterUtils.getResString("web_server")));
webServerPanel.add(getDomainPanel(), BorderLayout.NORTH);
- webServerPanel.add(getPortPanel(), BorderLayout.SOUTH);
+ webServerPanel.add(getPortPanel(), BorderLayout.WEST);
JPanel webRequestPanel = new JPanel();
@@ -233,7 +233,7 @@
northPanel.add(getProtocolAndMethodPanel(), BorderLayout.NORTH);
northPanel.add(getPathPanel(), BorderLayout.SOUTH);
- webRequestPanel.add(northPanel, BorderLayout.NORTH);
+ webServerPanel.add(northPanel, BorderLayout.SOUTH);
webRequestPanel.add(getParameterPanel(), BorderLayout.CENTER);
this.add(webServerPanel, BorderLayout.NORTH);
@@ -303,7 +303,7 @@
useKeepAlive.setName(USE_KEEPALIVE);
useKeepAlive.setSelected(true);
- Box panel = Box.createHorizontalBox();
+ JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT));
panel.add(label);
panel.add(Box.createHorizontalStrut(5));
panel.add(path);
@@ -311,6 +311,7 @@
panel.add(followRedirects);
panel.add(Box.createHorizontalStrut(5));
panel.add(useKeepAlive);
+ panel.setMinimumSize(panel.getPreferredSize());
return panel;
}
@@ -341,7 +342,7 @@
JLabel methodLabel = new JLabel(JMeterUtils.getResString("method"));
- JPanel panel = new HorizontalPanel();
+ JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT));
panel.add(protocolLabel);
panel.add(protocol);
@@ -350,7 +351,7 @@
panel.add(methodLabel);
panel.add(get);
panel.add(post);
-
+ panel.setMinimumSize(panel.getPreferredSize());
return panel;
}
1.12 +23 -13 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
Index: URLRewritingModifier.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- URLRewritingModifier.java 30 Apr 2003 21:37:30 -0000 1.11
+++ URLRewritingModifier.java 8 May 2003 18:29:15 -0000 1.12
@@ -5,13 +5,15 @@
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
-import org.apache.jmeter.config.ResponseBasedModifier;
+import org.apache.jmeter.processor.PreProcessor;
import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
+import org.apache.jmeter.threads.JMeterContext;
+import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
@@ -26,7 +28,7 @@
* To change this generated comment edit the template variable "typecomment":
* Window>Preferences>Java>Templates.
*/
-public class URLRewritingModifier extends AbstractTestElement implements Serializable, ResponseBasedModifier
+public class URLRewritingModifier extends AbstractTestElement implements Serializable, PreProcessor
{
transient private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.http");
private Pattern case1, case2, case3, case4;
@@ -37,8 +39,10 @@
/**
* @see ResponseBasedModifier#modifyEntry(Sampler, SampleResult)
*/
- public boolean modifyEntry(Sampler sampler, SampleResult responseText)
+ public void process()
{
+ Sampler sampler = JMeterContextService.getContext().getCurrentSampler();
+ SampleResult responseText = JMeterContextService.getContext().getPreviousResult();
initRegex(getArgumentName());
String text = new String(responseText.getResponseData());
Perl5Matcher matcher = JMeterUtils.getMatcher();
@@ -65,11 +69,6 @@
}
modify((HTTPSampler) sampler, value);
- if (value.length() > 0)
- {
- return true;
- }
- return false;
}
private void modify(HTTPSampler sampler, String value)
{
@@ -131,12 +130,15 @@
public static class Test extends TestCase
{
SampleResult response;
+ JMeterContext context;
public Test(String name)
{
super(name);
}
public void setUp()
- {}
+ {
+ context = JMeterContextService.getContext();
+ }
public void testGrabSessionId() throws Exception
{
String html = "location: http://server.com/index.html?session_id=jfdkjdkf%20jddkfdfjkdjfdf%22;";
@@ -146,7 +148,9 @@
mod.setArgumentName("session_id");
HTTPSampler sampler = createSampler();
sampler.addArgument("session_id", "adfasdfdsafasdfasd");
- mod.modifyEntry(sampler, response);
+ context.setCurrentSampler(sampler);
+ context.setPreviousResult(response);
+ mod.process();
Arguments args = sampler.getArguments();
assertEquals("jfdkjdkf jddkfdfjkdjfdf\"", ((Argument) args.getArguments().get(0).getObjectValue()).getValue());
assertEquals("http://server.com:80/index.html?session_id=jfdkjdkf+jddkfdfjkdjfdf%22", sampler.toString());
@@ -159,7 +163,9 @@
URLRewritingModifier mod = new URLRewritingModifier();
mod.setArgumentName("session_id");
HTTPSampler sampler = createSampler();
- mod.modifyEntry(sampler, response);
+ context.setCurrentSampler(sampler);
+ context.setPreviousResult(response);
+ mod.process();
Arguments args = sampler.getArguments();
assertEquals("jfdkjdkfjddkfdfjkdjfdf", ((Argument) args.getArguments().get(0).getObjectValue()).getValue());
}
@@ -181,7 +187,9 @@
URLRewritingModifier mod = new URLRewritingModifier();
mod.setArgumentName("session_id");
HTTPSampler sampler = createSampler();
- mod.modifyEntry(sampler, response);
+ context.setCurrentSampler(sampler);
+ context.setPreviousResult(response);
+ mod.process();
Arguments args = sampler.getArguments();
assertEquals("jfdkjdkfjddkfdfjkdjfdf", ((Argument) args.getArguments().get(0).getObjectValue()).getValue());
}
@@ -196,7 +204,9 @@
mod.setPathExtension(true);
mod.setPathExtensionNoEquals(true);
HTTPSampler sampler = createSampler();
- mod.modifyEntry(sampler, response);
+ context.setCurrentSampler(sampler);
+ context.setPreviousResult(response);
+ mod.process();
Arguments args = sampler.getArguments();
assertEquals("index.html;%24sid%24KQNq3AAADQZoEQAxlkX8uQV5bjqVBPbT", sampler.getPath());
}
1.8 +3 -3 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
Index: ParamModifierGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ParamModifierGui.java 27 Apr 2003 23:04:33 -0000 1.7
+++ ParamModifierGui.java 8 May 2003 18:29:15 -0000 1.8
@@ -10,8 +10,8 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
-import org.apache.jmeter.config.gui.AbstractModifierGui;
import org.apache.jmeter.gui.util.HorizontalPanel;
+import org.apache.jmeter.processor.gui.AbstractPreProcessorGui;
import org.apache.jmeter.protocol.http.modifier.ParamMask;
import org.apache.jmeter.protocol.http.modifier.ParamModifier;
import org.apache.jmeter.testelement.TestElement;
@@ -25,7 +25,7 @@
*@created Jan 18, 2002
*@version $Revision$
***************************************/
-public class ParamModifierGui extends AbstractModifierGui implements FocusListener
+public class ParamModifierGui extends AbstractPreProcessorGui implements FocusListener
{
private final String NAME = "name";
1.9 +2 -2 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java
Index: URLRewritingModifierGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- URLRewritingModifierGui.java 3 May 2003 16:24:16 -0000 1.8
+++ URLRewritingModifierGui.java 8 May 2003 18:29:15 -0000 1.9
@@ -4,8 +4,8 @@
import javax.swing.JCheckBox;
-import org.apache.jmeter.config.gui.AbstractResponseBasedModifierGui;
import org.apache.jmeter.gui.util.VerticalPanel;
+import org.apache.jmeter.processor.gui.AbstractPreProcessorGui;
import org.apache.jmeter.protocol.http.modifier.URLRewritingModifier;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
@@ -17,7 +17,7 @@
* To change this generated comment edit the template variable "typecomment":
* Window>Preferences>Java>Templates.
*/
-public class URLRewritingModifierGui extends AbstractResponseBasedModifierGui {
+public class URLRewritingModifierGui extends AbstractPreProcessorGui {
JLabeledTextField argumentName;
JCheckBox pathExt;
1.7 +3 -3 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java
Index: UserParameterModifierGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UserParameterModifierGui.java 27 Apr 2003 23:04:33 -0000 1.6
+++ UserParameterModifierGui.java 8 May 2003 18:29:15 -0000 1.7
@@ -63,7 +63,7 @@
import javax.swing.JTextArea;
import javax.swing.JTextField;
-import org.apache.jmeter.config.gui.AbstractModifierGui;
+import org.apache.jmeter.processor.gui.AbstractPreProcessorGui;
import org.apache.jmeter.protocol.http.modifier.UserParameterModifier;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
@@ -76,7 +76,7 @@
*@created $Date$
*@version 1.0
***********************************************************/
-public class UserParameterModifierGui extends AbstractModifierGui {
+public class UserParameterModifierGui extends AbstractPreProcessorGui {
//-------------------------------------------
// Constants and Data Members
//-------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org