Author: pmouawad
Date: Thu Feb 18 13:48:28 2016
New Revision: 1731074
URL: http://svn.apache.org/viewvc?rev=1731074&view=rev
Log:
Minor formatting
Contributed by Graham Russell
#resolve #129
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
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=1731074&r1=1731073&r2=1731074&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
Thu Feb 18 13:48:28 2016
@@ -101,7 +101,8 @@ public class SizeAssertion extends Abstr
if (msg.length() > 0) {
result.setFailure(true);
Object[] arguments = { Long.valueOf(resultSize), msg,
Long.valueOf(getAllowedSize()) };
- String message =
MessageFormat.format(JMeterUtils.getResString("size_assertion_failure"),
arguments); //$NON-NLS-1$
+ String message = MessageFormat.format(
+ JMeterUtils.getResString("size_assertion_failure"),
arguments); //$NON-NLS-1$
result.setFailureMessage(message);
}
return result;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java?rev=1731074&r1=1731073&r2=1731074&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
Thu Feb 18 13:48:28 2016
@@ -138,9 +138,9 @@ public class SizeAssertionGui extends Ab
size.setText(assertion.getAllowedSize());
setState(assertion.getCompOper());
showScopeSettings(assertion, true);
-
+
if (assertion.isTestFieldResponseHeaders()) {
- responseHeadersButton.setSelected(true);
+ responseHeadersButton.setSelected(true);
} else if (assertion.isTestFieldResponseBody()) {
responseBodyButton.setSelected(true);
} else if (assertion.isTestFieldResponseCode()) {
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java?rev=1731074&r1=1731073&r2=1731074&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
Thu Feb 18 13:48:28 2016
@@ -328,15 +328,13 @@ public class TableVisualizer extends Abs
public Object invoke(Object pInvokee) {
Boolean success = (Boolean) super.invoke(pInvokee);
- if(success != null) {
- if(success.booleanValue()) {
+ if (success != null) {
+ if (success.booleanValue()) {
return imageSuccess;
- }
- else {
+ } else {
return imageFailure;
}
- }
- else {
+ } else {
return null;
}
}
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java?rev=1731074&r1=1731073&r2=1731074&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
Thu Feb 18 13:48:28 2016
@@ -168,7 +168,7 @@ public class GraphiteBackendListenerClie
for (Map.Entry<String, Float> entry :
okPercentiles.entrySet()) {
graphiteMetricsManager.addMetric(timestampInSeconds,
contextName,
entry.getKey(),
-
Double.toString(metric.getOkPercentile(entry.getValue().floatValue())));
+
Double.toString(metric.getOkPercentile(entry.getValue().floatValue())));
}
}
if(metric.getFailures()>0) {
@@ -177,7 +177,7 @@ public class GraphiteBackendListenerClie
for (Map.Entry<String, Float> entry :
koPercentiles.entrySet()) {
graphiteMetricsManager.addMetric(timestampInSeconds,
contextName,
entry.getKey(),
-
Double.toString(metric.getKoPercentile(entry.getValue().floatValue())));
+
Double.toString(metric.getKoPercentile(entry.getValue().floatValue())));
}
}
graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
METRIC_ALL_MIN_RESPONSE_TIME, Double.toString(metric.getAllMinTime()));
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java?rev=1731074&r1=1731073&r2=1731074&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/LoopController.java Thu Feb
18 13:48:28 2016
@@ -71,9 +71,9 @@ public class LoopController extends Gene
public int getLoops() {
// Evaluation occurs when nbLoops is not yet evaluated
// or when nbLoops is equal to special value INFINITE_LOOP_COUNT
- if(nbLoops==null || // No evaluated yet
- nbLoops.intValue()==0 || // Last iteration led to nbLoops ==
0,
- // in this case as resetLoopCount
will not be called,
+ if (nbLoops==null || // No evaluated yet
+ nbLoops.intValue()==0 || // Last iteration led to nbLoops == 0,
+ // in this case as resetLoopCount
will not be called,
// it leads to no further evaluations
if we don't evaluate, see BUG 56276
nbLoops.intValue()==INFINITE_LOOP_COUNT // Number of iteration
is set to infinite
) {
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java?rev=1731074&r1=1731073&r2=1731074&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
Thu Feb 18 13:48:28 2016
@@ -135,7 +135,7 @@ public class HTTPFileArgsPanel extends J
if(tableComponent != null) {
boolean visible =
force!=null?force.booleanValue():!tableComponent.isVisible();
tableComponent.setVisible(visible);
-
+
result |= visible;
}
}
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java?rev=1731074&r1=1731073&r2=1731074&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
Thu Feb 18 13:48:28 2016
@@ -75,9 +75,7 @@ public class AnchorModifier extends Abst
result = (HTTPSampleResult) res;
}
List<HTTPSamplerBase> potentialLinks = new ArrayList<>();
- String responseText = ""; // $NON-NLS-1$
- responseText = result.getResponseDataAsString();
- Document html;
+ String responseText = result.getResponseDataAsString();
int index = responseText.indexOf('<'); // $NON-NLS-1$
if (index == -1) {
index = 0;
@@ -85,7 +83,7 @@ public class AnchorModifier extends Abst
if (log.isDebugEnabled()) {
log.debug("Check for matches against: "+sampler.toString());
}
- html = (Document)
HtmlParsingUtils.getDOM(responseText.substring(index));
+ Document html = (Document)
HtmlParsingUtils.getDOM(responseText.substring(index));
addAnchorUrls(html, result, sampler, potentialLinks);
addFormUrls(html, result, sampler, potentialLinks);
addFramesetUrls(html, result, sampler, potentialLinks);
@@ -106,11 +104,9 @@ public class AnchorModifier extends Abst
// config.parseArguments(url.getQueryString());
}
sampler.setProtocol(url.getProtocol());
- return;
} else {
log.debug("No matches found");
}
- return;
}
private void modifyArgument(Argument arg, Arguments args) {
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java?rev=1731074&r1=1731073&r2=1731074&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
Thu Feb 18 13:48:28 2016
@@ -137,7 +137,8 @@ public abstract class HTMLParser {
* @return an Iterator for the resource URLs
* @throws HTMLParseException when parsing the <code>html</code> fails
*/
- public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[]
html, URL baseUrl, String encoding) throws HTMLParseException {
+ public Iterator<URL> getEmbeddedResourceURLs(
+ String userAgent, byte[] html, URL baseUrl, String encoding)
throws HTMLParseException {
// The Set is used to ignore duplicated binary files.
// Using a LinkedHashSet to avoid unnecessary overhead in iterating
// the elements in the set later on. As a side-effect, this will keep
@@ -187,7 +188,8 @@ public abstract class HTMLParser {
* @return an Iterator for the resource URLs
* @throws HTMLParseException when parsing the <code>html</code> fails
*/
- public abstract Iterator<URL> getEmbeddedResourceURLs(String userAgent,
byte[] html, URL baseUrl, URLCollection coll, String encoding)
+ public abstract Iterator<URL> getEmbeddedResourceURLs(
+ String userAgent, byte[] html, URL baseUrl, URLCollection coll,
String encoding)
throws HTMLParseException;
/**
@@ -210,7 +212,8 @@ public abstract class HTMLParser {
* @return an Iterator for the resource URLs
* @throws HTMLParseException when parsing the <code>html</code> fails
*/
- public Iterator<URL> getEmbeddedResourceURLs(String userAgent, byte[]
html, URL baseUrl, Collection<URLString> coll, String encoding) throws
HTMLParseException {
+ public Iterator<URL> getEmbeddedResourceURLs(
+ String userAgent, byte[] html, URL baseUrl, Collection<URLString>
coll, String encoding) throws HTMLParseException {
return getEmbeddedResourceURLs(userAgent, html, baseUrl, new
URLCollection(coll), encoding);
}
@@ -230,12 +233,9 @@ public abstract class HTMLParser {
* @return true if IE version < IE v10
*/
protected final boolean isEnableConditionalComments(Float ieVersion) {
- if(ieVersion == null) {
- return false;
- }
- // Conditionnal comment have been dropped in IE10
+ // Conditional comment have been dropped in IE10
//
http://msdn.microsoft.com/en-us/library/ie/hh801214%28v=vs.85%29.aspx
- return ieVersion.floatValue() < IE_10;
+ return ieVersion != null && ieVersion.floatValue() < IE_10;
}
/**
@@ -244,21 +244,20 @@ public abstract class HTMLParser {
* @return version null if not IE or the version after MSIE
*/
protected Float extractIEVersion(String userAgent) {
- if(StringUtils.isEmpty(userAgent)) {
+ if (StringUtils.isEmpty(userAgent)) {
log.info("userAgent is null");
return null;
}
Matcher matcher = IE_UA_PATTERN.matcher(userAgent);
String ieVersion = null;
- while (matcher.find()) {
+ if (matcher.find()) {
if (matcher.groupCount() > 0) {
ieVersion = matcher.group(1);
} else {
ieVersion = matcher.group();
}
- break;
}
- if(ieVersion != null) {
+ if (ieVersion != null) {
return Float.valueOf(ieVersion);
} else {
return null;
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java?rev=1731074&r1=1731073&r2=1731074&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
Thu Feb 18 13:48:28 2016
@@ -186,7 +186,7 @@ public class LagartoBasedHtmlParser exte
}
String expressionString = expression.toString().trim();
enabled.push(Boolean.valueOf(htmlCCommentExpressionMatcher.match(ieVersion.floatValue(),
- expressionString)));
+ expressionString)));
}
}
