sebb 2004/06/12 11:32:05
Modified: src/core/org/apache/jmeter/save Tag: rel-2_0
SaveService.java
src/components/org/apache/jmeter/visualizers Tag: rel-2_0
ViewResultsFullVisualizer.java GraphAccum.java
AssertionVisualizer.java
src/core/org/apache/jmeter/reporters Tag: rel-2_0
ResultSaver.java
src/core/org/apache/jmeter/samplers Tag: rel-2_0
SampleResult.java
Log:
getAssertionResult and getSubResults now return empty arrays instead of null
Revision Changes Path
No revision
No revision
1.37.2.1 +8 -14 jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java
Index: SaveService.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -r1.37 -r1.37.2.1
--- SaveService.java 17 Feb 2004 02:41:26 -0000 1.37
+++ SaveService.java 12 Jun 2004 18:32:04 -0000 1.37.2.1
@@ -637,12 +637,9 @@
SampleResult[] subResults = result.getSubResults();
- if (subResults != null)
+ for (int i = 0; i < subResults.length; i++)
{
- for (int i = 0; i < subResults.length; i++)
- {
- config.addChild(getConfiguration(subResults[i], funcTest));
- }
+ config.addChild(getConfiguration(subResults[i], funcTest));
}
AssertionResult[] assResults = result.getAssertionResults();
@@ -650,13 +647,10 @@
if (funcTest)
{
config.addChild(
- createConfigForString("samplerData", result.getSamplerData()));
- if (assResults != null)
+ createConfigForString("samplerData", result.getSamplerData()));
+ for (int i = 0; i < assResults.length; i++)
{
- for (int i = 0; i < assResults.length; i++)
- {
- config.addChild(getConfiguration(assResults[i]));
- }
+ config.addChild(getConfiguration(assResults[i]));
}
config.addChild(getConfiguration(result.getResponseData()));
}
@@ -779,7 +773,7 @@
String message = null;
AssertionResult[] results = sample.getAssertionResults();
- if ((results != null) && (results.length > 0))
+ if (results.length > 0)
{
message = results[0].getFailureMessage();
}
No revision
No revision
1.42.2.2 +13 -16
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Index: ViewResultsFullVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
retrieving revision 1.42.2.1
retrieving revision 1.42.2.2
diff -u -r1.42.2.1 -r1.42.2.2
--- ViewResultsFullVisualizer.java 13 Apr 2004 18:31:56 -0000 1.42.2.1
+++ ViewResultsFullVisualizer.java 12 Jun 2004 18:32:05 -0000 1.42.2.2
@@ -138,24 +138,21 @@
{
SampleResult[] subResults = res.getSubResults();
- if (subResults != null)
+ int leafIndex = 0;
+
+ for (int i = 0; i < subResults.length; i++)
{
- int leafIndex = 0;
+ SampleResult child = subResults[i];
- for (int i = 0; i < subResults.length; i++)
+ if (log.isDebugEnabled())
{
- SampleResult child = subResults[i];
-
- if (log.isDebugEnabled())
- {
- log.debug("updateGui1 : child sample result - " + child);
- }
- DefaultMutableTreeNode leafNode =
- new DefaultMutableTreeNode(child);
-
- treeModel.insertNodeInto(leafNode, currNode, leafIndex++);
- addSubResults(leafNode, child);
+ log.debug("updateGui1 : child sample result - " + child);
}
+ DefaultMutableTreeNode leafNode =
+ new DefaultMutableTreeNode(child);
+
+ treeModel.insertNodeInto(leafNode, currNode, leafIndex++);
+ addSubResults(leafNode, child);
}
}
1.10.2.1 +4 -7
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccum.java
Index: GraphAccum.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccum.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- GraphAccum.java 13 Feb 2004 01:48:46 -0000 1.10
+++ GraphAccum.java 12 Jun 2004 18:32:05 -0000 1.10.2.1
@@ -70,7 +70,7 @@
*/
protected boolean previousPtsAlloc = false;
- protected static int width = 2000;
+ protected final static int width = 2000;
protected final static int PLOT_X_WIDTH = 10;
transient private static Logger log = LoggingManager.getLoggerForClass();
@@ -289,10 +289,7 @@
// Allocate previousPts only the first time
if (!previousPtsAlloc)
{
- if (resultList != null)
- {
- resultListCount += resultList.length;
- }
+ resultListCount += resultList.length;
previousPts = new Point[resultListCount + 2];
}
1.16.2.1 +8 -11
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java
Index: AssertionVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- AssertionVisualizer.java 5 Mar 2004 01:33:33 -0000 1.16
+++ AssertionVisualizer.java 12 Jun 2004 18:32:05 -0000 1.16.2.1
@@ -84,17 +84,14 @@
{
StringBuffer display = new StringBuffer();
AssertionResult assertionResults[] = res.getAssertionResults();
- if (assertionResults != null)
+ for (int i = 0; i < assertionResults.length; i++)
{
- for (int i = 0; i < assertionResults.length; i++)
- {
- AssertionResult item = assertionResults[i];
+ AssertionResult item = assertionResults[i];
- if (item.isFailure() || item.isError())
- {
- display.append("\n\t\t");
- display.append(item.getFailureMessage());
- }
+ if (item.isFailure() || item.isError())
+ {
+ display.append("\n\t\t");
+ display.append(item.getFailureMessage());
}
}
return display.toString();
No revision
No revision
1.4.2.3 +4 -7
jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultSaver.java
Index: ResultSaver.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultSaver.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- ResultSaver.java 12 Jun 2004 18:10:18 -0000 1.4.2.2
+++ ResultSaver.java 12 Jun 2004 18:32:05 -0000 1.4.2.3
@@ -100,11 +100,8 @@
SampleResult s = e.getResult();
saveSample(s);
SampleResult []sr = s.getSubResults();
- if (sr != null){
- for (int i = 0; i < sr.length; i++){
- saveSample(sr[i]);
- }
-
+ for (int i = 0; i < sr.length; i++){
+ saveSample(sr[i]);
}
}
No revision
No revision
1.29.2.2 +9 -7
jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleResult.java
Index: SampleResult.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleResult.java,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -u -r1.29.2.1 -r1.29.2.2
--- SampleResult.java 28 May 2004 00:32:11 -0000 1.29.2.1
+++ SampleResult.java 12 Jun 2004 18:32:05 -0000 1.29.2.2
@@ -61,8 +61,10 @@
*/
public final static String BINARY = "bin";
- /* empty array which can be returned instead of null */
+ /* empty arrays which can be returned instead of null */
private static final byte [] EMPTY_BA = new byte [0];
+ private static final SampleResult [] EMPTY_SR = new SampleResult[0];
+ private static final AssertionResult [] EMPTY_AR = new AssertionResult[0];
private byte[] responseData;
private String responseCode;
@@ -279,13 +281,13 @@
* Gets the assertion results associated with this sample.
*
* @return an array containing the assertion results for this sample.
- * Returns null if there are no assertion results.
+ * Returns empty array if there are no assertion results.
*/
public AssertionResult[] getAssertionResults()
{
if (assertionResults == null)
{
- return null;
+ return EMPTY_AR;
}
return (AssertionResult[]) assertionResults.toArray(
new AssertionResult[0]);
@@ -305,13 +307,13 @@
* Gets the subresults associated with this sample.
*
* @return an array containing the subresults for this sample. Returns
- * null if there are no subresults.
+ * an empty array if there are no subresults.
*/
public SampleResult[] getSubResults()
{
if (subResults == null)
{
- return null;
+ return EMPTY_SR;
}
return (SampleResult[]) subResults.toArray(new SampleResult[0]);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
