You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/09/28 19:30:12 UTC
[jmeter] branch master updated (3509370 -> a498279)
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 3509370 Use lazy initialization for JOrphanUtils#SECURE_RANDOM
new d6642e0 Add Override annotation
new cbf8eb4 Remove useless assignment of variable
new 9f53686 Return early from if clauses
new ca8eabf Change order of expected/actual in assertion
new 46d7775 javadoc: This method has no return value
new d5e13a2 Use == to compare enumerations
new a498279 NUM_THREADS is defined on AbstractThreadGroup
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java | 1 +
.../extractor/json/render/RenderAsJmesPathRenderer.java | 12 +++++-------
.../jmeter/assertions/jmespath/TestJMESPathAssertion.java | 6 +++---
.../protocol/http/gui/action/ParseCurlCommandAction.java | 5 ++---
4 files changed, 11 insertions(+), 13 deletions(-)
[jmeter] 07/07: NUM_THREADS is defined on AbstractThreadGroup
Posted by fs...@apache.org.
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 a498279ee832be9de0a084fed2cbbe348f855204
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Sep 28 21:23:08 2019 +0200
NUM_THREADS is defined on AbstractThreadGroup
---
.../apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index 065337d..c21ab37 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -198,7 +198,7 @@ public class ParseCurlCommandAction extends AbstractAction implements MenuCreato
ThreadGroup threadGroup = new ThreadGroup();
threadGroup.setProperty(TestElement.GUI_CLASS, ThreadGroupGui.class.getName());
threadGroup.setProperty(TestElement.NAME, "Thread Group");
- threadGroup.setProperty(ThreadGroup.NUM_THREADS,"${__P(threads,10)}");
+ threadGroup.setProperty(AbstractThreadGroup.NUM_THREADS, "${__P(threads,10)}");
threadGroup.setProperty(ThreadGroup.RAMP_TIME,"${__P(rampup,30)}");
threadGroup.setScheduler(true);
threadGroup.setProperty(ThreadGroup.DURATION,"${__P(duration,3600)}");
[jmeter] 06/07: Use == to compare enumerations
Posted by fs...@apache.org.
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 d5e13a2c9f41587bbd52cd2cceb415a6dbf4fe1e
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Sep 28 21:20:28 2019 +0200
Use == to compare enumerations
---
.../apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index cc63e9f..065337d 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -430,7 +430,7 @@ public class ParseCurlCommandAction extends AbstractAction implements MenuCreato
for (int i = 0; i < authManager.getAuthObjects().size(); i++) {
if (!authManager.getAuthObjectAt(i).getUser().equals(auth.getUser())
|| !authManager.getAuthObjectAt(i).getPass().equals(auth.getPass())
- || !authManager.getAuthObjectAt(i).getMechanism().equals(auth.getMechanism())) {
+ || authManager.getAuthObjectAt(i).getMechanism() != auth.getMechanism()) {
return true;
}
}
[jmeter] 05/07: javadoc: This method has no return value
Posted by fs...@apache.org.
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 46d7775ff88349b540d3c640a152355f4bfe1f30
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Sep 28 21:19:13 2019 +0200
javadoc: This method has no return value
---
.../apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
index 072706a..cc63e9f 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java
@@ -408,7 +408,6 @@ public class ParseCurlCommandAction extends AbstractAction implements MenuCreato
* Create Authorization manager
*
* @param request {@link Request}
- * @return {@link AuthManager} element
*/
private void createAuthManager(Request request, AuthManager authManager) {
Authorization auth = request.getAuthorization();
[jmeter] 03/07: Return early from if clauses
Posted by fs...@apache.org.
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 9f536867ccb22bb9c8a44160faa6cbfff363b7f8
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Sep 28 21:13:01 2019 +0200
Return early from if clauses
Reduce else branches for if clauses to help readability.
While at it, we can convert one of the used StringBuilder paths to a
simple String concatenation and narrow the scope of the remaining
StringBuilder.
---
.../extractor/json/render/RenderAsJmesPathRenderer.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java
index 1b05b7d..8ec550f 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java
@@ -59,18 +59,16 @@ public class RenderAsJmesPathRenderer extends AbstractRenderAsJsonRenderer {
JsonNode result = JMESPathCache.getInstance().get(expression).search(actualObj);
if (result.isNull()) {
return NO_MATCH; //$NON-NLS-1$
- } else {
+ }
+ if (result.isArray()) {
StringBuilder builder = new StringBuilder();
- if (result.isArray()) {
- int i = 0;
- for (JsonNode element : (ArrayNode) result) {
- builder.append("Result[").append(i++).append("]=").append(writeJsonNode(OBJECT_MAPPER, element)).append("\n");
- }
- } else {
- builder.append("Result[").append(0).append("]=").append(writeJsonNode(OBJECT_MAPPER, result)).append("\n");
+ int i = 0;
+ for (JsonNode element : (ArrayNode) result) {
+ builder.append("Result[").append(i++).append("]=").append(writeJsonNode(OBJECT_MAPPER, element)).append("\n");
}
return builder.toString();
}
+ return "Result[0]=" + writeJsonNode(OBJECT_MAPPER, result) + "\n";
} catch (Exception e) { // NOSONAR We handle it through return message
log.debug("Exception extracting from '{}' with expression '{}'", textToParse, expression);
return "Exception: " + e.getMessage(); //$NON-NLS-1$
[jmeter] 02/07: Remove useless assignment of variable
Posted by fs...@apache.org.
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 cbf8eb4e0df08ed35d2f53902927a0d4ee4a8e6b
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Sep 28 21:06:58 2019 +0200
Remove useless assignment of variable
In the case of a single element, the variable i was always 0. Make that
explicit. Now we can narrow the scope of the variable i closer to the
for loop.
---
.../apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java
index e4a9004..1b05b7d 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/render/RenderAsJmesPathRenderer.java
@@ -61,13 +61,13 @@ public class RenderAsJmesPathRenderer extends AbstractRenderAsJsonRenderer {
return NO_MATCH; //$NON-NLS-1$
} else {
StringBuilder builder = new StringBuilder();
- int i = 0;
if (result.isArray()) {
+ int i = 0;
for (JsonNode element : (ArrayNode) result) {
builder.append("Result[").append(i++).append("]=").append(writeJsonNode(OBJECT_MAPPER, element)).append("\n");
}
} else {
- builder.append("Result[").append(i++).append("]=").append(writeJsonNode(OBJECT_MAPPER, result)).append("\n");
+ builder.append("Result[").append(0).append("]=").append(writeJsonNode(OBJECT_MAPPER, result)).append("\n");
}
return builder.toString();
}
[jmeter] 04/07: Change order of expected/actual in assertion
Posted by fs...@apache.org.
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 ca8eabf03a20f4b6437ad6271d4ca83022e4a62c
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Sep 28 21:17:07 2019 +0200
Change order of expected/actual in assertion
The assert methods use the first parameter for the expected and the
second parameter for the actual value.
---
.../apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java
index 6e44b85..de06969 100644
--- a/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java
+++ b/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java
@@ -187,11 +187,11 @@ public class TestJMESPathAssertion {
AssertionResult result = instance.getResult(samplerResult);
assertEquals(expResult.getName(), result.getName());
if (result.isError() && !result.isFailure()) {
- assertEquals(resultType, ResultType.ERROR);
+ assertEquals(ResultType.ERROR, resultType);
} else if (result.isFailure() && !result.isError()) {
- assertEquals(resultType, ResultType.FAILURE);
+ assertEquals(ResultType.FAILURE, resultType);
} else if (!result.isError() && !result.isFailure()){
- assertEquals(resultType, ResultType.SUCCESS);
+ assertEquals(ResultType.SUCCESS, resultType);
} else {
fail("Got unexpected state where AssertionResult is in error and in failure");
}
[jmeter] 01/07: Add Override annotation
Posted by fs...@apache.org.
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 d6642e0cfe3ae105d6ec3f2ddfa69ea56eb66d97
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Sep 28 21:00:57 2019 +0200
Add Override annotation
---
.../org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java
index 4e2e60f..7a981bd 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java
@@ -54,6 +54,7 @@ public class JMESPathAssertionGui extends JSONPathAssertionGui {
super();
}
+ @Override
protected final void initFields() {
// get the superclass fields and set their name to current component fields.
super.jsonPath = new JLabeledTextField(JMeterUtils.getResString(JMES_ASSERTION_PATH));