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/07/16 17:30:36 UTC
cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler PackageTest.java
mstover1 2003/07/16 08:30:36
Modified: src/core/org/apache/jmeter/config Argument.java
src/core/org/apache/jmeter/testelement
AbstractTestElement.java
src/core/org/apache/jmeter/testelement/property
AbstractProperty.java MultiProperty.java
TestElementProperty.java
src/core/org/apache/jmeter/threads TestCompiler.java
Added: src/core/org/apache/jmeter/testelement PackageTest.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
PackageTest.java
Log:
Fixing bu #21626
Revision Changes Path
1.7 +6 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Argument.java 15 Jun 2003 18:35:28 -0000 1.6
+++ Argument.java 16 Jul 2003 15:30:10 -0000 1.7
@@ -175,4 +175,9 @@
{
return getPropertyAsString(METADATA);
}
+
+ public String toString()
+ {
+ return getName()+getMetaData()+getValue();
+ }
}
1.23 +3 -6 jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
Index: AbstractTestElement.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AbstractTestElement.java 16 Jul 2003 13:12:03 -0000 1.22
+++ AbstractTestElement.java 16 Jul 2003 15:30:10 -0000 1.23
@@ -251,10 +251,12 @@
|| (prop instanceof StringProperty
&& prop.getStringValue().equals("")))
{
+ log.debug("setting property " + property);
propMap.put(property.getName(), property);
}
else
{
+ log.debug("merging in property: " + property.getClass());
prop.mergeIn(property);
}
}
@@ -336,11 +338,6 @@
*/
public void setRunningVersion(boolean runningVersion)
{
- log.debug(
- "Setting "
- + this.getClass()
- + " to running version: "
- + runningVersion);
this.runningVersion = runningVersion;
PropertyIterator iter = propertyIterator();
while (iter.hasNext())
1.1 jakarta-jmeter/src/core/org/apache/jmeter/testelement/PackageTest.java
Index: PackageTest.java
===================================================================
/*
* Created on Jul 16, 2003
*
* To change the template for this generated file go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
package org.apache.jmeter.testelement;
import junit.framework.TestCase;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.config.LoginConfig;
import org.apache.jmeter.testelement.property.NullProperty;
import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jmeter.testelement.property.TestElementProperty;
/**
* @author ano ano
*
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
public class PackageTest extends TestCase
{
/**
* @param arg0
*/
public PackageTest(String arg0)
{
super(arg0);
// TODO Auto-generated constructor stub
}
public void testRecovery() throws Exception
{
ConfigTestElement config = new ConfigTestElement();
config.addProperty(new StringProperty("name","config"));
config.setRunningVersion(true);
LoginConfig loginConfig = new LoginConfig();
loginConfig.setUsername("user1");
loginConfig.setPassword("pass1");
assertEquals(new NullProperty(),config.getProperty("login"));
config.addProperty(new TestElementProperty("login",loginConfig));
assertEquals(loginConfig.toString(),config.getPropertyAsString("login"));
config.recoverRunningVersion();
assertEquals(new NullProperty(),config.getProperty("login"));
}
public void testArguments() throws Exception
{
Arguments args = new Arguments();
args.addArgument("arg1","val1","=");
TestElementProperty prop = new TestElementProperty("args",args);
ConfigTestElement te = new ConfigTestElement();
te.addProperty(prop);
te.setRunningVersion(true);
Arguments config = new Arguments();
config.addArgument("config1","configValue","=");
TestElementProperty configProp = new TestElementProperty("args",config);
ConfigTestElement te2 = new ConfigTestElement();
te2.addProperty(configProp);
te.addTestElement(te2);
assertEquals(2,args.getArgumentCount());
assertEquals("config1=configValue",args.getArgument(1).toString());
te.recoverRunningVersion();
te.addTestElement(te2);
assertEquals(2,args.getArgumentCount());
assertEquals("config1=configValue",args.getArgument(1).toString());
}
}
1.10 +1 -2 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Index: AbstractProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractProperty.java 16 Jul 2003 13:12:08 -0000 1.9
+++ AbstractProperty.java 16 Jul 2003 15:30:15 -0000 1.10
@@ -313,7 +313,6 @@
public boolean equals(Object o)
{
- log.debug("Testing whether " + this + " is equal to " + o);
return compareTo(o) == 0;
}
1.6 +2 -6 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/MultiProperty.java
Index: MultiProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/MultiProperty.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MultiProperty.java 16 Jul 2003 13:12:11 -0000 1.5
+++ MultiProperty.java 16 Jul 2003 15:30:15 -0000 1.6
@@ -135,17 +135,13 @@
{
return;
}
-
+ log.debug("merging in " + prop.getClass());
if (prop instanceof MultiProperty)
{
PropertyIterator iter = ((MultiProperty) prop).iterator();
while (iter.hasNext())
{
JMeterProperty item = iter.next();
- if(isRunningVersion())
- {
- item.setTemporary(true,null);
- }
addProperty(item);
}
}
1.10 +4 -2 jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java
Index: TestElementProperty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestElementProperty.java 16 Jul 2003 13:12:11 -0000 1.9
+++ TestElementProperty.java 16 Jul 2003 15:30:15 -0000 1.10
@@ -136,8 +136,10 @@
*/
public void mergeIn(JMeterProperty prop)
{
+ log.debug("merging in " + prop);
if (isEqualType(prop))
{
+ log.debug("was of equal type");
value.addTestElement((TestElement) prop.getObjectValue());
}
}
@@ -151,8 +153,8 @@
{
value = savedValue;
}
- super.recoverRunningVersion(null);
value.recoverRunningVersion();
+ super.recoverRunningVersion(null);
}
/* (non-Javadoc)
1.30 +8 -6 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- TestCompiler.java 28 Jun 2003 19:35:40 -0000 1.29
+++ TestCompiler.java 16 Jul 2003 15:30:15 -0000 1.30
@@ -315,7 +315,9 @@
Iterator iter = configs.iterator();
while (iter.hasNext())
{
- sam.addTestElement((ConfigTestElement) iter.next());
+ ConfigTestElement config = (ConfigTestElement)iter.next();
+ sam.addTestElement(config);
+ log.info("adding: " + config);
}
}
}
1.1 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PackageTest.java
Index: PackageTest.java
===================================================================
/*
* Created on Jul 16, 2003
*
* To change the template for this generated file go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
package org.apache.jmeter.protocol.http.sampler;
import junit.framework.TestCase;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui;
import org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
/**
* @author ano ano
*
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
public class PackageTest extends TestCase
{ /**
* @param arg0
*/
public PackageTest(String arg0)
{
super(arg0);
// TODO Auto-generated constructor stub
}
public void testConfiguring() throws Exception
{
HTTPSampler sampler = (HTTPSampler) new HttpTestSampleGui().createTestElement();
sampler.addArgument("arg1", "val1");
ConfigTestElement config = (ConfigTestElement) new HttpDefaultsGui().createTestElement();
((Arguments) config.getProperty(HTTPSampler.ARGUMENTS).getObjectValue()).addArgument(new HTTPArgument("config1", "configValue"));
config.setRunningVersion(true);
sampler.setRunningVersion(true);
sampler.setRunningVersion(true);
sampler.addTestElement(config);
assertEquals("config1=configValue", sampler.getArguments().getArgument(1).toString());
sampler.recoverRunningVersion();
config.recoverRunningVersion();
assertEquals(1, sampler.getArguments().getArgumentCount());
sampler.addTestElement(config);
assertEquals("config1=configValue", sampler.getArguments().getArgument(1).toString());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org