You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/12/21 14:03:36 UTC
svn commit: r1775423 -
/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
Author: pmouawad
Date: Wed Dec 21 14:03:36 2016
New Revision: 1775423
URL: http://svn.apache.org/viewvc?rev=1775423&view=rev
Log:
Sonar : Fix code smells
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
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=1775423&r1=1775422&r2=1775423&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java Wed Dec 21 14:03:36 2016
@@ -28,7 +28,6 @@ import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
-import org.apache.commons.io.IOUtils;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
@@ -121,7 +120,7 @@ public class HTMLAssertion extends Abstr
log.debug("HTMLAssertions.getResult(): Tidy instance created!");
}
- } catch (Exception e) {//TODO replace with proper Exception
+ } catch (Exception e) {
log.error("Unable to instantiate tidy parser", e);
result.setFailure(true);
result.setFailureMessage("Unable to instantiate tidy parser");
@@ -137,8 +136,6 @@ public class HTMLAssertion extends Abstr
StringWriter errbuf = new StringWriter();
tidy.setErrout(new PrintWriter(errbuf));
- // Node node = tidy.parseDOM(new
- // ByteArrayInputStream(response.getResponseData()), null);
ByteArrayOutputStream os = new ByteArrayOutputStream();
log.debug("Start : parse");
Node node = tidy.parse(new ByteArrayInputStream(inResponse.getResponseData()), os);
@@ -175,7 +172,7 @@ public class HTMLAssertion extends Abstr
result.setFailure(false);
}
- } catch (Exception e) {//TODO replace with proper Exception
+ } catch (Exception e) {
// return with an error
log.warn("Cannot parse result content", e);
result.setFailure(true);
@@ -194,27 +191,15 @@ public class HTMLAssertion extends Abstr
// check if filename defined
if ((lFilename != null) && (!"".equals(lFilename.trim()))) {
- FileWriter lOutputWriter = null;
- try {
-
- // open file
- lOutputWriter = new FileWriter(lFilename, false);
-
+
+ try (FileWriter lOutputWriter = new FileWriter(lFilename, false)){
// write to file
lOutputWriter.write(inOutput);
-
- // flush
- lOutputWriter.flush();
-
if (log.isDebugEnabled()) {
log.debug("writeOutput() -> output successfully written to file " + lFilename);
}
-
} catch (IOException ex) {
log.warn("writeOutput() -> could not write output to file " + lFilename, ex);
- } finally {
- // close file
- IOUtils.closeQuietly(lOutputWriter);
}
}
}