You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/04/09 19:37:33 UTC
cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/assertions XMLAssertion.java SizeAssertion.java XPathAssertion.java HTMLAssertion.java ResponseAssertion.java
sebb 2005/04/09 10:37:33
Modified: src/components/org/apache/jmeter/assertions
XMLAssertion.java SizeAssertion.java
XPathAssertion.java HTMLAssertion.java
ResponseAssertion.java
Log:
Use common setResultForNull() method
Revision Changes Path
1.6 +3 -11 jakarta-jmeter/src/components/org/apache/jmeter/assertions/XMLAssertion.java
Index: XMLAssertion.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/XMLAssertion.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLAssertion.java 10 Dec 2004 21:32:51 -0000 1.5
+++ XMLAssertion.java 9 Apr 2005 17:37:33 -0000 1.6
@@ -54,7 +54,7 @@
AssertionResult result = new AssertionResult();
if(response.getResponseData() == null)
{
- return setResultForNull(result);
+ return result.setResultForNull();
}
result.setFailure(false);
@@ -96,14 +96,6 @@
return result;
}
-
- protected AssertionResult setResultForNull(AssertionResult result)
- {
- result.setError(false);
- result.setFailure(true);
- result.setFailureMessage("Response was null");
- return result;
- }
/**
* Return the body of the http return.
1.15 +3 -11 jakarta-jmeter/src/components/org/apache/jmeter/assertions/SizeAssertion.java
Index: SizeAssertion.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/SizeAssertion.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SizeAssertion.java 13 Feb 2004 01:27:26 -0000 1.14
+++ SizeAssertion.java 9 Apr 2005 17:37:33 -0000 1.15
@@ -63,7 +63,7 @@
result.setFailure(false);
if (response.getResponseData() == null)
{
- return setResultForNull(result);
+ return result.setResultForNull();
}
// is the Sample the correct size?
resultData = response.getResponseData();
@@ -103,14 +103,6 @@
}
- protected AssertionResult setResultForNull(AssertionResult result)
- {
- result.setError(false);
- result.setFailure(true);
- result.setFailureMessage("Response was null");
- return result;
- }
-
/**
* Returns the operator to be asserted. EQUAL = 1, NOTEQUAL = 2
* GREATERTHAN = 3,LESSTHAN = 4,GREATERTHANEQUAL = 5,LESSTHANEQUAL = 6
1.4 +1 -8 jakarta-jmeter/src/components/org/apache/jmeter/assertions/XPathAssertion.java
Index: XPathAssertion.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/XPathAssertion.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPathAssertion.java 8 Apr 2005 20:30:11 -0000 1.3
+++ XPathAssertion.java 9 Apr 2005 17:37:33 -0000 1.4
@@ -76,7 +76,7 @@
// no error as default
AssertionResult result = new AssertionResult();
if (response.getResponseData() == null) {
- return setResultForNull(result);
+ return result.setResultForNull();
}
result.setFailure(false);
result.setFailureMessage("");
@@ -143,13 +143,6 @@
return result;
}
- private AssertionResult setResultForNull(AssertionResult result) {
- result.setError(false);
- result.setFailure(true);
- result.setFailureMessage("Response was null");
- return result;
- }
-
/**
* Get The XPath String that will be used in matching the document
*
1.3 +2 -13 jakarta-jmeter/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
Index: HTMLAssertion.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/HTMLAssertion.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HTMLAssertion.java 16 Apr 2004 13:21:44 -0000 1.2
+++ HTMLAssertion.java 9 Apr 2005 17:37:33 -0000 1.3
@@ -74,7 +74,7 @@
AssertionResult result = new AssertionResult();
if (inResponse.getResponseData() == null) {
- return setResultForNull(result);
+ return result.setResultForNull();
}
result.setFailure(false);
@@ -203,17 +203,6 @@
}
/**
- * @param inResult
- * @return result
- */
- protected AssertionResult setResultForNull(AssertionResult inResult) {
- inResult.setError(false);
- inResult.setFailure(true);
- inResult.setFailureMessage("Response was null");
- return inResult;
- }
-
- /**
* Gets the doctype
* @return the documemt type
*/
1.20 +1 -8 jakarta-jmeter/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
Index: ResponseAssertion.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/ResponseAssertion.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ResponseAssertion.java 20 Jun 2004 00:32:52 -0000 1.19
+++ ResponseAssertion.java 9 Apr 2005 17:37:33 -0000 1.20
@@ -281,7 +281,7 @@
if(toCheck.length()==0)
{
- return setResultForNull(result);
+ return result.setResultForNull();
}
try
@@ -373,13 +373,6 @@
return "Test failed, " + what + text + "/" + stringPattern + "/";
}
-protected AssertionResult setResultForNull(AssertionResult result)
-{
- result.setError(false);
- result.setFailure(true);
- result.setFailureMessage("Response (or URL) was null");
- return result;
-}
public static class Test extends junit.framework.TestCase
{
int threadsRunning;
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org