Author: sebb
Date: Tue Nov 27 00:09:18 2012
New Revision: 1413951
URL: http://svn.apache.org/viewvc?rev=1413951&view=rev
Log:
Move to Java 6
add @Override for interface implementations
Bugzilla Id: 54199
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
Tue Nov 27 00:09:18 2012
@@ -32,6 +32,7 @@ public class BSFAssertion extends BSFTes
private static final long serialVersionUID = 234L;
+ @Override
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult(getName());
BSFManager mgr =null;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
Tue Nov 27 00:09:18 2012
@@ -72,6 +72,7 @@ public class BeanShellAssertion extends
/**
* {@inheritDoc}
*/
+ @Override
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult(getName());
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
Tue Nov 27 00:09:18 2012
@@ -51,6 +51,7 @@ public class CompareAssertion extends Ab
super();
}
+ @Override
public AssertionResult getResult(SampleResult response) {
responses.add(response);
if (responses.size() > 1) {
@@ -154,6 +155,7 @@ public class CompareAssertion extends Ab
return content;
}
+ @Override
public void iterationStart(LoopIterationEvent iterEvent) {
responses = new LinkedList<SampleResult>();
}
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java
Tue Nov 27 00:09:18 2012
@@ -42,6 +42,7 @@ public class DurationAssertion extends A
* containing a FailureMessage will be returned. Otherwise the returned
* AssertionResult will reflect the success of the Sample.
*/
+ @Override
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult(getName());
result.setFailure(false);
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
Tue Nov 27 00:09:18 2012
@@ -74,6 +74,7 @@ public class HTMLAssertion extends Abstr
* a FailureMessage will be returned. Otherwise the returned
AssertionResult
* will reflect the success of the Sample.
*/
+ @Override
public AssertionResult getResult(SampleResult inResponse) {
log.debug("HTMLAssertions.getResult() called");
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
Tue Nov 27 00:09:18 2012
@@ -36,6 +36,7 @@ public class JSR223Assertion extends JSR
private static final long serialVersionUID = 234L;
+ @Override
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult(getName());
try {
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
Tue Nov 27 00:09:18 2012
@@ -50,6 +50,7 @@ public class MD5HexAssertion extends Abs
/*
* @param response @return
*/
+ @Override
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult(getName());
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
Tue Nov 27 00:09:18 2012
@@ -180,6 +180,7 @@ public class ResponseAssertion extends A
getTestStrings().clear();
}
+ @Override
public AssertionResult getResult(SampleResult response) {
AssertionResult result;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
Tue Nov 27 00:09:18 2012
@@ -47,6 +47,7 @@ public class SMIMEAssertionTestElement e
super();
}
+ @Override
public AssertionResult getResult(SampleResult response) {
try {
return SMIMEAssertion.getResult(this, response, getName());
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
Tue Nov 27 00:09:18 2012
@@ -70,6 +70,7 @@ public class SizeAssertion extends Abstr
* Returns the result of the Assertion.
* Here it checks the Sample responseData length.
*/
+ @Override
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult(getName());
result.setFailure(false);
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java
Tue Nov 27 00:09:18 2012
@@ -55,6 +55,7 @@ public class XMLAssertion extends Abstra
* containing a FailureMessage will be returned. Otherwise the returned
* AssertionResult will reflect the success of the Sample.
*/
+ @Override
public AssertionResult getResult(SampleResult response) {
// no error as default
AssertionResult result = new AssertionResult(getName());
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
Tue Nov 27 00:09:18 2012
@@ -61,6 +61,7 @@ public class XMLSchemaAssertion extends
* getResult
*
*/
+ @Override
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult(getName());
// Note: initialised with error = failure = false
@@ -172,6 +173,7 @@ public class XMLSchemaAssertion extends
/*
* Can be caused by: - failure to read XSD file - xml does not match
XSD
*/
+ @Override
public void error(SAXParseException exception) throws
SAXParseException {
String msg = "error: " + errorDetails(exception);
@@ -185,6 +187,7 @@ public class XMLSchemaAssertion extends
* Can be caused by: - premature end of file - non-whitespace content
* after trailer
*/
+ @Override
public void fatalError(SAXParseException exception) throws
SAXParseException {
String msg = "fatal: " + errorDetails(exception);
@@ -197,6 +200,7 @@ public class XMLSchemaAssertion extends
/*
* Not clear what can cause this ? conflicting versions perhaps
*/
+ @Override
public void warning(SAXParseException exception) throws
SAXParseException {
String msg = "warning: " + errorDetails(exception);
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java?rev=1413951&r1=1413950&r2=1413951&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
Tue Nov 27 00:09:18 2012
@@ -66,6 +66,7 @@ public class XPathAssertion extends Abst
* XML, and that the XPath expression is matched (or not, as the case may
* be)
*/
+ @Override
public AssertionResult getResult(SampleResult response) {
// no error as default
AssertionResult result = new AssertionResult(getName());
