mstover1 2003/02/18 08:03:45
Modified: src/core/org/apache/jmeter/config Argument.java
Arguments.java
src/core/org/apache/jmeter/config/gui ArgumentsPanel.java
src/core/org/apache/jmeter/resources messages.properties
messages_de.properties messages_ja.properties
messages_no.properties
src/protocol/http/org/apache/jmeter/protocol/http/gui
HTTPArgumentsPanel.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java
Log:
Minor gui updates, new methods in the Argument classes, new resource messages
Revision Changes Path
1.3 +2 -7 jakarta-jmeter/src/core/org/apache/jmeter/config/Argument.java
Index: Argument.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/config/Argument.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Argument.java 5 Feb 2003 05:12:05 -0000 1.2
+++ Argument.java 18 Feb 2003 16:03:44 -0000 1.3
@@ -161,7 +161,7 @@
***************************************/
public Object getValue()
{
- return (String)getProperty(VALUE);
+ return getProperty(VALUE);
}
/****************************************
@@ -171,11 +171,6 @@
***************************************/
public Object getMetaData()
{
- String meta = (String)getProperty(METADATA);
- if(meta == null)
- {
- meta = "=";
- }
- return meta;
+ return getProperty(METADATA);
}
}
1.2 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/config/Arguments.java
Index: Arguments.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/config/Arguments.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Arguments.java 29 Dec 2002 15:31:45 -0000 1.1
+++ Arguments.java 18 Feb 2003 16:03:44 -0000 1.2
@@ -84,7 +84,7 @@
JMeterUtils.getResString("metadata")
};
- private final static String ARGUMENTS = "Arguments.arguments";
+ public final static String ARGUMENTS = "Arguments.arguments";
/****************************************
1.4 +7 -1
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ArgumentsPanel.java 31 Jan 2003 19:05:50 -0000 1.3
+++ ArgumentsPanel.java 18 Feb 2003 16:03:44 -0000 1.4
@@ -178,7 +178,7 @@
while(model.next())
{
args.addArgument((String)model.getColumnValue(Arguments.COLUMN_NAMES[0]),
-
model.getColumnValue(Arguments.COLUMN_NAMES[1]));
+
model.getColumnValue(Arguments.COLUMN_NAMES[1]),"=");
}
this.configureTestElement(args);
return (TestElement)args.clone();
@@ -391,7 +391,13 @@
labelPanel.add(tableLabel);
this.add(labelPanel,BorderLayout.NORTH);
this.addInnerPanel();
+ table.revalidate();
+ sizeColumns(table);
}
+
+ protected void sizeColumns(JTable table)
+ {
+ }
1.29 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- messages.properties 14 Feb 2003 04:17:15 -0000 1.28
+++ messages.properties 18 Feb 2003 16:03:44 -0000 1.29
@@ -336,4 +336,5 @@
match_num_field=Match No. (0 for Random):
menu_extractors=Extractors and Post Request Processors
string_from_file_file_name=Enter full path to file
-simple_data_writer_title=Simple Data Writer
\ No newline at end of file
+simple_data_writer_title=Simple Data Writer
+include_equals=Include Equals?
\ No newline at end of file
1.25 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties
Index: messages_de.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- messages_de.properties 14 Feb 2003 04:17:15 -0000 1.24
+++ messages_de.properties 18 Feb 2003 16:03:44 -0000 1.25
@@ -333,4 +333,5 @@
menu_extractors=Extractors and Post Request Processors
graph_results_median=Median
string_from_file_file_name=Enter full path to file
-simple_data_writer_title=Simple Data Writer
\ No newline at end of file
+simple_data_writer_title=Simple Data Writer
+include_equals=Include Equals?
\ No newline at end of file
1.22 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- messages_ja.properties 14 Feb 2003 04:17:15 -0000 1.21
+++ messages_ja.properties 18 Feb 2003 16:03:44 -0000 1.22
@@ -328,4 +328,5 @@
menu_extractors=Extractors and Post Request Processors
graph_results_median=Median
string_from_file_file_name=Enter full path to file
-simple_data_writer_title=Simple Data Writer
\ No newline at end of file
+simple_data_writer_title=Simple Data Writer
+include_equals=Include Equals?
\ No newline at end of file
1.22 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- messages_no.properties 14 Feb 2003 04:17:15 -0000 1.21
+++ messages_no.properties 18 Feb 2003 16:03:44 -0000 1.22
@@ -320,4 +320,5 @@
menu_extractors=Extractors and Post Request Processors
graph_results_median=Median
string_from_file_file_name=Enter full path to file
-simple_data_writer_title=Simple Data Writer
\ No newline at end of file
+simple_data_writer_title=Simple Data Writer
+include_equals=Include Equals?
\ No newline at end of file
1.7 +48 -5
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
Index: HTTPArgumentsPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HTTPArgumentsPanel.java 17 Oct 2002 19:47:19 -0000 1.6
+++ HTTPArgumentsPanel.java 18 Feb 2003 16:03:45 -0000 1.7
@@ -2,6 +2,9 @@
import java.util.Iterator;
+import javax.swing.JTable;
+import javax.swing.table.TableColumn;
+
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.gui.ArgumentsPanel;
import org.apache.jmeter.gui.util.PowerTableModel;
@@ -20,13 +23,32 @@
private static final String ENCODED_VALUE =
JMeterUtils.getResString("encoded_value");
private static final String ENCODE_OR_NOT =
JMeterUtils.getResString("encode?");
+ private static final String INCLUDE_EQUALS =
JMeterUtils.getResString("include_equals");
protected void initializeTableModel() {
tableModel = new PowerTableModel(new
String[]{Arguments.COLUMN_NAMES[0],Arguments.COLUMN_NAMES[1],
- ENCODE_OR_NOT},
- new Class[]{String.class,String.class,Boolean.class});
+ ENCODE_OR_NOT,INCLUDE_EQUALS},
+ new
Class[]{String.class,String.class,Boolean.class,Boolean.class});
}
+
+ protected void sizeColumns(JTable table)
+ {
+ int resizeMode = table.getAutoResizeMode();
+ table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+ fixSize(table.getColumn(INCLUDE_EQUALS));
+ fixSize(table.getColumn(ENCODE_OR_NOT));
+ table.setAutoResizeMode(resizeMode);
+ }
+
+ private void fixSize(TableColumn column)
+ {
+ column.sizeWidthToFit();
+ //column.setMinWidth(column.getWidth());
+ column.setMaxWidth((int)(column.getWidth() * 1.5));
+ column.setWidth(column.getMaxWidth());
+ column.setResizable(false);
+ }
public HTTPArgumentsPanel()
{
@@ -47,8 +69,10 @@
{
if(((Boolean)model.getColumnValue(ENCODE_OR_NOT)).booleanValue())
{
- args.addArgument(new
HTTPArgument((String)model.getColumnValue(Arguments.COLUMN_NAMES[0]),
-
model.getColumnValue(Arguments.COLUMN_NAMES[1])));
+ HTTPArgument arg = new
HTTPArgument((String)model.getColumnValue(Arguments.COLUMN_NAMES[0]),
+ model.getColumnValue(Arguments.COLUMN_NAMES[1]));
+ setMetaData(arg);
+ args.addArgument(arg);
}
else
{
@@ -56,12 +80,26 @@
arg.setAlwaysEncode(false);
arg.setName((String)model.getColumnValue(Arguments.COLUMN_NAMES[0]));
arg.setValue(model.getColumnValue(Arguments.COLUMN_NAMES[1]));
+ setMetaData(arg);
args.addArgument(arg);
}
}
this.configureTestElement(args);
return (TestElement)args.clone();
}
+
+ protected void setMetaData(HTTPArgument arg)
+ {
+ Data model = tableModel.getData();
+ if(((Boolean)model.getColumnValue(INCLUDE_EQUALS)).booleanValue() ||
model.getColumnValue(Arguments.COLUMN_NAMES[1]).toString().length() > 0)
+ {
+ arg.setMetaData("=");
+ }
+ else
+ {
+ arg.setMetaData("");
+ }
+ }
/****************************************
* !ToDo (Method description)
@@ -80,9 +118,14 @@
{
HTTPArgument arg = (HTTPArgument)iter.next();
tableModel.addRow(new
Object[]{arg.getName(),arg.getValue(),
- new Boolean(arg.getAlwaysEncode())});
+ new Boolean(arg.getAlwaysEncode()),
new Boolean(isMetaDataNormal(arg))});
}
}
checkDeleteStatus();
}
+
+ protected boolean isMetaDataNormal(HTTPArgument arg)
+ {
+ return arg.getMetaData() == null || arg.getMetaData().equals("=") ||
(arg.getValue() != null && arg.getValue().toString().length() > 0);
+ }
}
1.22 +18 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Index: HTTPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- HTTPSampler.java 5 Feb 2003 18:41:56 -0000 1.21
+++ HTTPSampler.java 18 Feb 2003 16:03:45 -0000 1.22
@@ -253,6 +253,7 @@
}
public void addEncodedArgument(String name, String value, String metaData)
{
+ log.debug("adding argument: name: " + name + " value: " + value + "
metaData: " + metaData);
Arguments args = getArguments();
HTTPArgument arg = new HTTPArgument(name, value, metaData, true);
if (arg.getName().equals(arg.getEncodedName()) &&
arg.getValue().equals(arg.getEncodedValue()))
@@ -494,15 +495,19 @@
{
first = false;
}
+ log.debug("Making query: appending name = '" + item.getEncodedName() +
"'");
buf.append(item.getEncodedName());
if (item.getMetaData() == null)
{
+ log.debug("Making query: appending metadata(which was null) = '" +
item.getMetaData() + "'");
buf.append("=");
}
else
{
+ log.debug("Making query: appending metadata = '" +
item.getMetaData() + "'");
buf.append(item.getMetaData());
}
+ log.debug("Making query: appending value = '" + item.getEncodedValue()
+ "'");
buf.append(item.getEncodedValue());
}
return buf.toString();
@@ -1049,6 +1054,17 @@
{
super(name);
}
+
+ public void testArgumentWithoutEquals() throws Exception
+ {
+ HTTPSampler sampler = new HTTPSampler();
+ sampler.setProtocol("http");
+ sampler.setMethod(HTTPSampler.GET);
+ sampler.setPath("/index.html?pear");
+ sampler.setDomain("www.apache.org");
+
assertEquals("http://www.apache.org:80/index.html?pear",sampler.getUrl().toString());
+ }
+
public void testMakingUrl() throws Exception
{
HTTPSampler config = new HTTPSampler();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
