Author: sebb
Date: Wed Apr 21 00:00:09 2010
New Revision: 936117
URL: http://svn.apache.org/viewvc?rev=936117view=rev
Log:
Use assertEquals(exp,actual) rather than assertTrue(actual==exp) to give more
info on failure
Modified:
jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java
jakarta/jmeter/trunk/test/src/org/apache/jorphan/collections/PackageTest.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java?rev=936117r1=936116r2=936117view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java
Wed Apr 21 00:00:09 2010
@@ -761,7 +761,7 @@ public final class ClutilTestCase extend
assertEquals((clOptions1.get(2)).getDescriptor().getId(), ALL_OPT);
assertEquals((clOptions1.get(3)).getDescriptor().getId(), CLEAR1_OPT);
-assertTrue(parser1.getUnparsedArgs()[0].equals(ler));
+assertEquals(ler,parser1.getUnparsedArgs()[0]);
final CLArgsParser parser2 = new
CLArgsParser(parser1.getUnparsedArgs(), options2);
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java?rev=936117r1=936116r2=936117view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java
Wed Apr 21 00:00:09 2010
@@ -46,13 +46,13 @@ public class TestRandomOrderController e
}
usedSamplers.add(samplerName);
}
-assertTrue(All samplers were returned, usedSamplers.size() == 4);
+assertEquals(All samplers were returned, 4, usedSamplers.size());
}
public void testRandomOrderNoElements() {
RandomOrderController roc = new RandomOrderController();
roc.initialize();
-assertTrue(roc.next() == null);
+assertNull(roc.next());
}
public void testRandomOrderOneElement() {
@@ -68,6 +68,6 @@ public class TestRandomOrderController e
}
usedSamplers.add(samplerName);
}
-assertTrue(All samplers were returned, usedSamplers.size() == 1);
+assertEquals(All samplers were returned, 1, usedSamplers.size());
}
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java?rev=936117r1=936116r2=936117view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
Wed Apr 21 00:00:09 2010
@@ -59,14 +59,14 @@ public class UrlConfigTest extends JMete
}
public void testSimpleConfig() {
-assertTrue(config.getName().equals(Full Config));
-assertEquals(config.getDomain(), www.lazer.com);
+assertEquals(Full Config, config.getName());
+assertEquals(www.lazer.com, config.getDomain());
}
public void testOverRide() {
JMeterProperty jmp = partialConfig.getProperty(HTTPSamplerBase.DOMAIN);
assertTrue(jmp instanceof NullProperty);
-assertTrue(new NullProperty(HTTPSamplerBase.DOMAIN).equals(jmp));
+assertEquals(jmp, new NullProperty(HTTPSamplerBase.DOMAIN));
partialConfig.addTestElement(defaultConfig);
assertEquals(partialConfig.getPropertyAsString(HTTPSamplerBase.DOMAIN),
www.xerox.com);
assertEquals(partialConfig.getPropertyAsString(HTTPSamplerBase.PATH),
main.jsp);
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java?rev=936117r1=936116r2=936117view=diff