This is an automated email from the ASF dual-hosted git repository. fschumacher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit ab65dfe7048158b945a89ab47e2db2535c879fa7 Author: Graham Russell <[email protected]> AuthorDate: Thu Aug 15 10:30:50 2019 +0100 Readability changes Part of #479 on github --- .../apache/jmeter/assertions/CompareAssertion.java | 126 +++++++++++---------- .../apache/jmeter/assertions/gui/AssertionGui.java | 7 +- .../jmeter/protocol/java/test/SleepTest.java | 8 +- 3 files changed, 72 insertions(+), 69 deletions(-) diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java index 8535793..6c63b55 100644 --- a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java +++ b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java @@ -65,66 +65,70 @@ public class CompareAssertion extends AbstractTestElement implements Assertion, } private void compareTime(CompareAssertionResult result) { - if (compareTime >= 0) { - long prevTime = -1; - SampleResult prevResult = null; - boolean success = true; - StringBuilder buf = new StringBuilder(); - for(SampleResult sResult : responses) { - long currentTime = sResult.getTime(); - if (prevTime != -1) { - success = Math.abs(prevTime - currentTime) <= compareTime; - prevResult = sResult; - } - if (!success) { - result.setFailure(true); - buf.setLength(0); - appendResultDetails(buf, prevResult); - buf.append(JMeterUtils.getResString("comparison_response_time")).append(prevTime); //$NON-NLS-1$ - result.addToBaseResult(buf.toString()); - buf.setLength(0); - appendResultDetails(buf, sResult); - buf.append(JMeterUtils.getResString("comparison_response_time")).append(currentTime); //$NON-NLS-1$ - result.addToSecondaryResult(buf.toString()); - result.setFailureMessage( - JMeterUtils.getResString("comparison_differ_time")+ //$NON-NLS-1$ - compareTime+ - JMeterUtils.getResString("comparison_unit")); //$NON-NLS-1$ - break; - } + if (compareTime < 0) { + return; + } + long prevTime = -1; + SampleResult prevResult = null; + boolean success = true; + StringBuilder buf = new StringBuilder(); + for (SampleResult sResult : responses) { + long currentTime = sResult.getTime(); + if (prevTime != -1) { + success = Math.abs(prevTime - currentTime) <= compareTime; + prevResult = sResult; + } + if (success) { prevResult = sResult; prevTime = currentTime; + } else { + result.setFailure(true); + buf.setLength(0); + appendResultDetails(buf, prevResult); + buf.append(JMeterUtils.getResString("comparison_response_time")).append(prevTime); //$NON-NLS-1$ + result.addToBaseResult(buf.toString()); + buf.setLength(0); + appendResultDetails(buf, sResult); + buf.append(JMeterUtils.getResString("comparison_response_time")).append(currentTime); //$NON-NLS-1$ + result.addToSecondaryResult(buf.toString()); + result.setFailureMessage( + JMeterUtils.getResString("comparison_differ_time") + //$NON-NLS-1$ + compareTime + + JMeterUtils.getResString("comparison_unit")); //$NON-NLS-1$ + break; } } } private void compareContent(CompareAssertionResult result) { - if (compareContent) { - String prevContent = null; - SampleResult prevResult = null; - boolean success = true; - StringBuilder buf = new StringBuilder(); - for (SampleResult sResult : responses) { - String currentContent = sResult.getResponseDataAsString(); - currentContent = filterString(currentContent); - if (prevContent != null) { - success = prevContent.equals(currentContent); - } - if (!success) { - result.setFailure(true); - buf.setLength(0); - appendResultDetails(buf, prevResult); - buf.append(prevContent); - result.addToBaseResult(buf.toString()); - buf.setLength(0); - appendResultDetails(buf, sResult); - buf.append(currentContent); - result.addToSecondaryResult(buf.toString()); - result.setFailureMessage(JMeterUtils.getResString("comparison_differ_content")); //$NON-NLS-1$ - break; - } + if (!compareContent) { + return; + } + String prevContent = null; + SampleResult prevResult = null; + boolean success = true; + StringBuilder buf = new StringBuilder(); + for (SampleResult sResult : responses) { + String currentContent = sResult.getResponseDataAsString(); + currentContent = filterString(currentContent); + if (prevContent != null) { + success = prevContent.equals(currentContent); + } + if (success) { prevResult = sResult; prevContent = currentContent; + } else { + result.setFailure(true); + buf.setLength(0); + appendResultDetails(buf, prevResult); + buf.append(prevContent); + result.addToBaseResult(buf.toString()); + buf.setLength(0); + appendResultDetails(buf, sResult); + buf.append(currentContent); + result.addToSecondaryResult(buf.toString()); + result.setFailureMessage(JMeterUtils.getResString("comparison_differ_content")); //$NON-NLS-1$ + break; } } } @@ -145,15 +149,19 @@ public class CompareAssertion extends AbstractTestElement implements Assertion, private String filterString(final String content) { if (stringsToSkip == null || stringsToSkip.isEmpty()) { return content; - } else { - String result = content; - for (SubstitutionElement regex : stringsToSkip) { - emptySub.setSubstitution(regex.getSubstitute()); - result = Util.substitute(JMeterUtils.getMatcher(), JMeterUtils.getPatternCache().getPattern(regex.getRegex()), - emptySub, result, Util.SUBSTITUTE_ALL); - } - return result; } + + String result = content; + for (SubstitutionElement regex : stringsToSkip) { + emptySub.setSubstitution(regex.getSubstitute()); + result = Util.substitute( + JMeterUtils.getMatcher(), + JMeterUtils.getPatternCache().getPattern(regex.getRegex()), + emptySub, + result, + Util.SUBSTITUTE_ALL); + } + return result; } @Override diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java index 953f534..c4b337c 100644 --- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java +++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java @@ -301,11 +301,8 @@ public class AssertionGui extends AbstractAssertionGui { tableModel.addRow(new Object[] { jMeterProperty.getStringValue() }); } - if (model.getTestStrings().size() == 0) { - deletePattern.setEnabled(false); - } else { - deletePattern.setEnabled(true); - } + boolean testStringsPresent = model.getTestStrings().size() != 0; + deletePattern.setEnabled(testStringsPresent); tableModel.fireTableDataChanged(); } diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java index 50ef9c9..2685cb8 100644 --- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java +++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java @@ -212,11 +212,9 @@ public class SleepTest extends AbstractJavaSamplerClient implements Serializable * @return a String identifier for this test instance */ private String whoAmI() { - StringBuilder sb = new StringBuilder(); - sb.append(Thread.currentThread().toString()); - sb.append("@"); - sb.append(Integer.toHexString(hashCode())); - return sb.toString(); + return Thread.currentThread().toString() + + "@" + + Integer.toHexString(hashCode()); } @Override
