mstover1 2003/07/15 07:16:40
Modified: src/components/org/apache/jmeter/assertions
ResponseAssertion.java SizeAssertion.java
XMLAssertion.java
src/components/org/apache/jmeter/extractor
RegexExtractor.java
src/core/org/apache/jmeter/gui/action RemoteStart.java
Log:
Various minor fixes
Revision Changes Path
1.9 +13 -2
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ResponseAssertion.java 7 Apr 2003 14:35:18 -0000 1.8
+++ ResponseAssertion.java 15 Jul 2003 14:16:40 -0000 1.9
@@ -286,6 +286,10 @@
boolean pass = true;
boolean not = (NOT & getTestType()) > 0;
AssertionResult result = new AssertionResult();
+ if(response.getResponseData() == null)
+ {
+ return setResultForNull(result);
+ }
String responseString = new String(response.getResponseData());
try
{
@@ -334,6 +338,13 @@
}
return result;
}
+protected AssertionResult setResultForNull(AssertionResult result)
+{
+ result.setError(false);
+ result.setFailure(true);
+ result.setFailureMessage("Response was null");
+ return result;
+}
public static class Test extends junit.framework.TestCase
{
int threadsRunning;
1.8 +24 -38
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SizeAssertion.java 9 Jul 2003 21:28:44 -0000 1.7
+++ SizeAssertion.java 15 Jul 2003 14:16:40 -0000 1.8
@@ -71,9 +71,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Wolfram Rittmeyer</a>
* @version $Revision$, $Date$
*/
-public class SizeAssertion
- extends AbstractTestElement
- implements Serializable, Assertion
+public class SizeAssertion extends AbstractTestElement implements Serializable,
Assertion
{
int comparator = 1;
@@ -100,22 +98,18 @@
{
AssertionResult result = new AssertionResult();
result.setFailure(false);
-
+ if (response.getResponseData() == null)
+ {
+ return setResultForNull(result);
+ }
// is the Sample the correct size?
resultData = getResultBody(response.getResponseData());
long resultSize = resultData.length;
if ((!(compareSize(resultSize)) && (getAllowedSize() > 0)))
{
result.setFailure(true);
- Object[] arguments =
- {
- new Long(resultSize),
- new String(comparatorErrorMessage),
- new Long(getAllowedSize())};
- String message =
- MessageFormat.format(
- JMeterUtils.getResString("size_assertion_failure"),
- arguments);
+ Object[] arguments = { new Long(resultSize), new
String(comparatorErrorMessage), new Long(getAllowedSize())};
+ String message =
MessageFormat.format(JMeterUtils.getResString("size_assertion_failure"), arguments);
result.setFailureMessage(message);
}
return result;
@@ -139,6 +133,14 @@
}
+ 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
@@ -162,8 +164,7 @@
{
if (size < 0L)
{
- throw new IllegalArgumentException(
- JMeterUtils.getResString("argument_must_not_be_negative"));
+ throw new
IllegalArgumentException(JMeterUtils.getResString("argument_must_not_be_negative"));
}
if (size == Long.MAX_VALUE)
{
@@ -184,10 +185,7 @@
{
if (resultData[i] == '\n' && resultData[i + 1] == '\n')
{
- return getByteArraySlice(
- resultData,
- (i + 3),
- resultData.length);
+ return getByteArraySlice(resultData, (i + 3), resultData.length);
}
}
return resultData;
@@ -243,39 +241,27 @@
{
case EQUAL :
result = (resultSize == getAllowedSize());
- comparatorErrorMessage =
- JMeterUtils.getResString(
- "size_assertion_comparator_error_equal");
+ comparatorErrorMessage =
JMeterUtils.getResString("size_assertion_comparator_error_equal");
break;
case NOTEQUAL :
result = (resultSize != getAllowedSize());
- comparatorErrorMessage =
- JMeterUtils.getResString(
- "size_assertion_comparator_error_notequal");
+ comparatorErrorMessage =
JMeterUtils.getResString("size_assertion_comparator_error_notequal");
break;
case GREATERTHAN :
result = (resultSize > getAllowedSize());
- comparatorErrorMessage =
- JMeterUtils.getResString(
- "size_assertion_comparator_error_greater");
+ comparatorErrorMessage =
JMeterUtils.getResString("size_assertion_comparator_error_greater");
break;
case LESSTHAN :
result = (resultSize < getAllowedSize());
- comparatorErrorMessage =
- JMeterUtils.getResString(
- "size_assertion_comparator_error_less");
+ comparatorErrorMessage =
JMeterUtils.getResString("size_assertion_comparator_error_less");
break;
case GREATERTHANEQUAL :
result = (resultSize >= getAllowedSize());
- comparatorErrorMessage =
- JMeterUtils.getResString(
- "size_assertion_comparator_error_greaterequal");
+ comparatorErrorMessage =
JMeterUtils.getResString("size_assertion_comparator_error_greaterequal");
break;
case LESSTHANEQUAL :
result = (resultSize <= getAllowedSize());
- comparatorErrorMessage =
- JMeterUtils.getResString(
- "size_assertion_comparator_error_lessequal");
+ comparatorErrorMessage =
JMeterUtils.getResString("size_assertion_comparator_error_lessequal");
break;
}
return result;
1.3 +13 -1
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLAssertion.java 9 Jul 2003 21:28:44 -0000 1.2
+++ XMLAssertion.java 15 Jul 2003 14:16:40 -0000 1.3
@@ -84,6 +84,10 @@
{
// no error as default
AssertionResult result = new AssertionResult();
+ if(response.getResponseData() == null)
+ {
+ return setResultForNull(result);
+ }
result.setFailure(false);
// the result data
@@ -124,6 +128,14 @@
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.7 +4 -0
jakarta-jmeter/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Index: RegexExtractor.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/extractor/RegexExtractor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RegexExtractor.java 12 Jun 2003 13:39:42 -0000 1.6
+++ RegexExtractor.java 15 Jul 2003 14:16:40 -0000 1.7
@@ -58,6 +58,10 @@
{
initTemplate();
JMeterContext context = JMeterContextService.getContext();
+ if(context.getPreviousResult() == null ||
context.getPreviousResult().getResponseData() == null)
+ {
+ return;
+ }
log.debug("RegexExtractor processing result");
context.getVariables().put(getRefName(), getDefaultValue());
Perl5Matcher matcher = (Perl5Matcher) localMatcher.get();
1.12 +6 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/RemoteStart.java
Index: RemoteStart.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/RemoteStart.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RemoteStart.java 27 Jun 2003 19:12:54 -0000 1.11
+++ RemoteStart.java 15 Jul 2003 14:16:40 -0000 1.12
@@ -98,7 +98,11 @@
public void doAction(ActionEvent e)
{
- String name = ((Component) e.getSource()).getName().trim();
+ String name = ((Component) e.getSource()).getName();
+ if(name != null)
+ {
+ name = name.trim();
+ }
String action = e.getActionCommand();
if (action.equals("remote_stop"))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
