Author: sebb
Date: Sat Jul 7 12:08:12 2007
New Revision: 554242
URL: http://svn.apache.org/viewvc?view=rev&rev=554242
Log:
Fix test so it no longer depends on arbitrary HashMap ordering
Modified:
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
Modified:
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java?view=diff&rev=554242&r1=554241&r2=554242
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
Sat Jul 7 12:08:12 2007
@@ -21,9 +21,8 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.jmeter.config.ConfigTestElement;
+import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.testelement.property.CollectionProperty;
@@ -37,7 +36,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jordi Salvat i Alabart</a>
* @version $Revision: 325648 $ updated on $Date: 2005-08-18 21:38:49 +0100
(Thu, 18 Aug 2005) $
*/
-public class TestValueReplacer extends TestCase {
+public class TestValueReplacer extends JMeterTestCase {
TestPlan variables;
public TestValueReplacer(String name) {
@@ -48,7 +47,9 @@
variables = new TestPlan();
variables.addParameter("server", "jakarta.apache.org");
variables.addParameter("username", "jack");
- variables.addParameter("password", "jacks_password");
+ // The following used to be jacks_password, but the
Arguments class uses
+ // HashMap for which the order is not defined.
+ variables.addParameter("password", "his_password");
variables.addParameter("regex", ".*");
JMeterVariables vars = new JMeterVariables();
vars.put("server", "jakarta.apache.org");
@@ -64,11 +65,12 @@
element.setProperty(new StringProperty("domain",
"jakarta.apache.org"));
List args = new ArrayList();
args.add("username is jack");
- args.add("jacks_password");
+ args.add("his_password");
element.setProperty(new CollectionProperty("args",
args));
replacer.reverseReplace(element);
assertEquals("${server}",
element.getPropertyAsString("domain"));
args = (List)
element.getProperty("args").getObjectValue();
+ assertEquals("username is ${username}",
((JMeterProperty) args.get(0)).getStringValue());
assertEquals("${password}", ((JMeterProperty)
args.get(1)).getStringValue());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
