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 se...@apache.org on 2005/06/17 00:34:28 UTC
cvs commit: jakarta-jmeter/bin upgrade.properties
sebb 2005/06/16 15:34:28
Modified: src/core/org/apache/jmeter/save/converters
TestElementPropertyConverter.java
src/protocol/http/org/apache/jmeter/protocol/http/control
Header.java
bin upgrade.properties
Log:
Bug 35370 - upgrade existing test plans to support Header property name change
Revision Changes Path
1.5 +28 -3 jakarta-jmeter/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
Index: TestElementPropertyConverter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestElementPropertyConverter.java 17 May 2005 22:48:26 -0000 1.4
+++ TestElementPropertyConverter.java 16 Jun 2005 22:34:28 -0000 1.5
@@ -18,6 +18,8 @@
package org.apache.jmeter.save.converters;
import org.apache.jmeter.config.ConfigTestElement;
+import org.apache.jmeter.protocol.http.control.Header;
+import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.testelement.property.TestElementProperty;
@@ -75,6 +77,22 @@
}
}
+/*
+ * TODO - convert to woek more like upgrade.properties/NameUpdater.java
+ *
+ * Special processing is carried out for the Header Class
+ * The String property TestElement.name is converted to Header.name
+ * for example:
+ <elementProp name="User-Agent" elementType="org.apache.jmeter.protocol.http.control.Header">
+ <stringProp name="Header.value">Mozilla%2F4.0+%28compatible%3B+MSIE+5.5%3B+Windows+98%29</stringProp>
+ <stringProp name="TestElement.name">User-Agent</stringProp>
+ </elementProp>
+ * becomes
+ <elementProp name="User-Agent" elementType="org.apache.jmeter.protocol.http.control.Header">
+ <stringProp name="Header.value">Mozilla%2F4.0+%28compatible%3B+MSIE+5.5%3B+Windows+98%29</stringProp>
+ <stringProp name="Header.name">User-Agent</stringProp>
+ </elementProp>
+*/
/*
* (non-Javadoc)
*
@@ -89,13 +107,20 @@
TestElementProperty prop = (TestElementProperty) createCollection(context
.getRequiredType());
prop.setName(ConversionHelp.decode(reader.getAttribute("name")));
- prop.setObjectValue(Class.forName(
- reader.getAttribute("elementType")).newInstance());
+ String element = reader.getAttribute("elementType");
+ boolean isHeader = "org.apache.jmeter.protocol.http.control.Header".equals(element);
+ prop.setObjectValue(Class.forName(element).newInstance());
while (reader.hasMoreChildren())
{
reader.moveDown();
JMeterProperty subProp = (JMeterProperty) readItem(reader, context,
prop);
+ if (isHeader) {
+ String name = subProp.getName();
+ if (TestElement.NAME.equals(name)){
+ subProp.setName(Header.HNAME);
+ }
+ }
prop.addProperty(subProp);
reader.moveUp();
}
1.9 +5 -5 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java
Index: Header.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Header.java 15 Jun 2005 22:53:14 -0000 1.8
+++ Header.java 16 Jun 2005 22:34:28 -0000 1.9
@@ -31,7 +31,7 @@
*/
public class Header extends AbstractTestElement implements Serializable
{
- private static final String HNAME = "Header.name";
+ public static final String HNAME = "Header.name";
private static final String VALUE = "Header.value";
/**
@@ -67,7 +67,7 @@
}
/**
- * Get the value for this object.
+ * Get the name for this object.
*/
public synchronized String getName()
{
@@ -75,7 +75,7 @@
}
/**
- * Set the value for this object.
+ * Set the name for this object.
*/
public synchronized void setName(String name)
{
1.7 +3 -2 jakarta-jmeter/bin/upgrade.properties
Index: upgrade.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/upgrade.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- upgrade.properties 19 May 2004 20:15:42 -0000 1.6
+++ upgrade.properties 16 Jun 2005 22:34:28 -0000 1.7
@@ -35,4 +35,5 @@
org.apache.jmeter.protocol.jdbc.control.gui.JdbcTestSampleGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler/JDBCSampler.query=query
-org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler.JDBCSampler.dataSource/NULL=
\ No newline at end of file
+org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler.JDBCSampler.dataSource/NULL=
+org.apache.jmeter.protocol.http.control.Header/TestElement.name=Header.name
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org