Author: sebb Date: Fri Apr 28 13:13:11 2006 New Revision: 397997 URL: http://svn.apache.org/viewcvs?rev=397997&view=rev Log: Assertion Result now show Label always
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java jakarta/jmeter/branches/rel-2-1/xdocs/images/screenshots/assertion_results.png jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/component_reference.xml Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java?rev=397997&r1=397996&r2=397997&view=diff ============================================================================== --- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java (original) +++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java Fri Apr 28 13:13:11 2006 @@ -1,6 +1,5 @@ -// $Header$ /* - * Copyright 2001-2004 The Apache Software Foundation. + * Copyright 2001-2004,2006 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,12 +51,7 @@ public void add(SampleResult sample) { StringBuffer sb = new StringBuffer(100); - String sd = sample.getSamplerData(); - if (null != sd) { - sb.append(sd); - } else { - sb.append(sample.getSampleLabel()); - } + sb.append(sample.getSampleLabel()); sb.append(getAssertionResult(sample)); sb.append("\n"); synchronized (textArea) { @@ -77,7 +71,7 @@ AssertionResult item = assertionResults[i]; if (item.isFailure() || item.isError()) { - display.append("\n\t\t"); + display.append("\n\t"); // $NON-NLS-1$ display.append(item.getFailureMessage()); } } Modified: jakarta/jmeter/branches/rel-2-1/xdocs/images/screenshots/assertion_results.png URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/images/screenshots/assertion_results.png?rev=397997&r1=397996&r2=397997&view=diff ============================================================================== Binary files - no diff available. Modified: jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/component_reference.xml?rev=397997&r1=397996&r2=397997&view=diff ============================================================================== --- jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/component_reference.xml (original) +++ jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/component_reference.xml Fri Apr 28 13:13:11 2006 @@ -1529,8 +1529,8 @@ </component> <component name="Assertion Results" index="§-num;.3.5" screenshot="assertion_results.png"> -<description><p>The Assertion Results visualizer shows the URL of each sample taken (no time information -is shown). It also reports failures of any <a href="test_plan.html#assertions">Assertions</a> that +<description><p>The Assertion Results visualizer shows the Label of each sample taken. +It also reports failures of any <a href="test_plan.html#assertions">Assertions</a> that are part of the test plan.</p></description> <links> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]