Author: sebb Date: Wed Apr 21 00:00:09 2010 New Revision: 936117 URL: http://svn.apache.org/viewvc?rev=936117&view=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=936117&r1=936116&r2=936117&view=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=936117&r1=936116&r2=936117&view=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=936117&r1=936116&r2=936117&view=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=936117&r1=936116&r2=936117&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java Wed Apr 21 00:00:09 2010 @@ -82,7 +82,7 @@ public class TestSampleResult extends Te SampleResult res = new SampleResult(); res.sampleStart(); res.samplePause(); - assertTrue(wr.toString().length() == 0); + assertEquals(0, wr.toString().length()); res.samplePause(); assertFalse(wr.toString().length() == 0); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java?rev=936117&r1=936116&r2=936117&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleSaveConfiguration.java Wed Apr 21 00:00:09 2010 @@ -97,7 +97,7 @@ public class TestSampleSaveConfiguration public void testFalse() throws Exception { SampleSaveConfiguration a = new SampleSaveConfiguration(false); SampleSaveConfiguration b = new SampleSaveConfiguration(false); - assertTrue("Hash codes should be equal",a.hashCode() == b.hashCode()); + assertEquals("Hash codes should be equal",a.hashCode(), b.hashCode()); assertTrue("Objects should be equal",a.equals(b)); assertTrue("Objects should be equal",b.equals(a)); } @@ -105,7 +105,7 @@ public class TestSampleSaveConfiguration public void testTrue() throws Exception { SampleSaveConfiguration a = new SampleSaveConfiguration(true); SampleSaveConfiguration b = new SampleSaveConfiguration(true); - assertTrue("Hash codes should be equal",a.hashCode() == b.hashCode()); + assertEquals("Hash codes should be equal",a.hashCode(), b.hashCode()); assertTrue("Objects should be equal",a.equals(b)); assertTrue("Objects should be equal",b.equals(a)); } @@ -121,16 +121,16 @@ public class TestSampleSaveConfiguration SampleSaveConfiguration a = new SampleSaveConfiguration(false); SampleSaveConfiguration b = new SampleSaveConfiguration(false); a.setFormatter(null); - assertTrue("Hash codes should be equal",a.hashCode() == b.hashCode()); + assertEquals("Hash codes should be equal",a.hashCode(), b.hashCode()); assertTrue("Objects should be equal",a.equals(b)); assertTrue("Objects should be equal",b.equals(a)); b.setFormatter(null); - assertTrue("Hash codes should be equal",a.hashCode() == b.hashCode()); + assertEquals("Hash codes should be equal",a.hashCode(), b.hashCode()); assertTrue("Objects should be equal",a.equals(b)); assertTrue("Objects should be equal",b.equals(a)); a.setFormatter(new SimpleDateFormat()); b.setFormatter(new SimpleDateFormat()); - assertTrue("Hash codes should be equal",a.hashCode() == b.hashCode()); + assertEquals("Hash codes should be equal",a.hashCode(), b.hashCode()); assertTrue("Objects should be equal",a.equals(b)); assertTrue("Objects should be equal",b.equals(a)); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jorphan/collections/PackageTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jorphan/collections/PackageTest.java?rev=936117&r1=936116&r2=936117&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jorphan/collections/PackageTest.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jorphan/collections/PackageTest.java Wed Apr 21 00:00:09 2010 @@ -53,13 +53,13 @@ public class PackageTest extends TestCas assertTrue(tree1.equals(tree2)); assertTrue(tree2.equals(tree1)); assertTrue(tree2.equals(tree2)); - assertTrue(tree1.hashCode() == tree2.hashCode()); + assertEquals(tree1.hashCode(), tree2.hashCode()); assertTrue(tree3.equals(tree3)); assertTrue(tree3.equals(tree4)); assertTrue(tree4.equals(tree3)); assertTrue(tree4.equals(tree4)); - assertTrue(tree3.hashCode() == tree4.hashCode()); + assertEquals(tree3.hashCode(), tree4.hashCode()); assertNotSame(tree1, tree2); assertNotSame(tree1, tree3); @@ -85,7 +85,7 @@ public class PackageTest extends TestCas tree2.add("abcd", tree4); assertTrue(tree1.equals(tree2)); assertTrue(tree2.equals(tree1)); - assertTrue(tree1.hashCode() == tree2.hashCode()); + assertEquals(tree1.hashCode(), tree2.hashCode()); } @@ -111,13 +111,13 @@ public class PackageTest extends TestCas assertTrue(tree1.equals(tree2)); assertTrue(tree2.equals(tree1)); assertTrue(tree2.equals(tree2)); - assertTrue(tree1.hashCode() == tree2.hashCode()); + assertEquals(tree1.hashCode(), tree2.hashCode()); assertTrue(tree3.equals(tree3)); assertTrue(tree3.equals(tree4)); assertTrue(tree4.equals(tree3)); assertTrue(tree4.equals(tree4)); - assertTrue(tree3.hashCode() == tree4.hashCode()); + assertEquals(tree3.hashCode(), tree4.hashCode()); assertNotSame(tree1, tree2); assertNotSame(tree1, tree3); @@ -138,7 +138,7 @@ public class PackageTest extends TestCas tree2.add("abcd", tree4); assertTrue(tree1.equals(tree2)); assertTrue(tree2.equals(tree1)); - assertTrue(tree1.hashCode() == tree2.hashCode()); + assertEquals(tree1.hashCode(), tree2.hashCode()); tree1.add("a1"); tree1.add("a2"); --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org