You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2023/05/19 08:32:09 UTC
[jmeter] branch master updated (1076baf68f -> 6cc575132c)
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
from 1076baf68f fix(deps): update dependency org.eclipse.jgit:org.eclipse.jgit to v5.13.1.202206130422-r
new e609610160 chore: remove unused build-logic.testing.gradle.kts
new c69730cfe7 style: remove use of deprecated API in FileServer
new 6cc575132c test: fix assertions in BoltSamplerSpec
The 3 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:
.../jvm/src/main/kotlin/build-logic.java.gradle.kts | 1 -
.../jvm/src/main/kotlin/build-logic.testing.gradle.kts | 17 -----------------
.../java/org/apache/jmeter/services/FileServer.java | 6 ++----
.../jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy | 15 ++++++++++++---
4 files changed, 14 insertions(+), 25 deletions(-)
delete mode 100644 build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts
[jmeter] 01/03: chore: remove unused build-logic.testing.gradle.kts
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit e60961016006fe4c91d61309bb64ad336ad5d865
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Fri May 19 11:18:36 2023 +0300
chore: remove unused build-logic.testing.gradle.kts
---
.../jvm/src/main/kotlin/build-logic.java.gradle.kts | 1 -
.../jvm/src/main/kotlin/build-logic.testing.gradle.kts | 17 -----------------
2 files changed, 18 deletions(-)
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 3f4a60691f..32c5d4fbd6 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -26,7 +26,6 @@ plugins {
id("idea")
id("com.github.vlsi.crlf")
id("com.github.vlsi.gradle-extensions")
- id("build-logic.testing")
id("build-logic.test-base")
id("build-logic.build-params")
id("build-logic.style")
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts
deleted file mode 100644
index 4b9a3e85b6..0000000000
--- a/build-logic/jvm/src/main/kotlin/build-logic.testing.gradle.kts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
[jmeter] 03/03: test: fix assertions in BoltSamplerSpec
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 6cc575132c7d9d332d7136e7f027d931585744d5
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Fri May 19 11:31:36 2023 +0300
test: fix assertions in BoltSamplerSpec
response.getTime() returns the response time, and it might be 0
in case the response is fast.
Fixes https://github.com/apache/jmeter/issues/5919
---
.../jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy b/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy
index a6062c7949..65e6b09efe 100644
--- a/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy
+++ b/src/protocol/bolt/src/test/groovy/org/apache/jmeter/protocol/bolt/sampler/BoltSamplerSpec.groovy
@@ -65,7 +65,9 @@ class BoltSamplerSpec extends Specification {
str.endsWith("Records: Skipped")
response.getSampleCount() == 1
response.getErrorCount() == 0
- response.getTime() > 0
+ // The sampler was executed, so start and end times should be set
+ response.getStartTime() > 0
+ response.getEndTime() > 0
}
def "should not display results by default"() {
@@ -99,7 +101,9 @@ class BoltSamplerSpec extends Specification {
str.endsWith("Mock for type 'Record'")
response.getSampleCount() == 1
response.getErrorCount() == 0
- response.getTime() > 0
+ // The sampler was executed, so start and end times should be set
+ response.getStartTime() > 0
+ response.getEndTime() > 0
}
def "should return error on failed query"() {
@@ -116,7 +120,9 @@ class BoltSamplerSpec extends Specification {
str.contains("a message")
response.getSampleCount() == 1
response.getErrorCount() == 1
- response.getTime() > 0
+ // The sampler was executed, so start and end times should be set
+ response.getStartTime() > 0
+ response.getEndTime() > 0
}
def "should return error on invalid parameters"() {
@@ -133,6 +139,9 @@ class BoltSamplerSpec extends Specification {
str.contains("Unexpected character")
response.getSampleCount() == 1
response.getErrorCount() == 1
+ // The sampler fails at parameter preparation, so no time is recorded
+ response.getStartTime() == 0
+ response.getEndTime() == 0
response.getTime() == 0
}
[jmeter] 02/03: style: remove use of deprecated API in FileServer
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit c69730cfe78cd855eb37ce31bcfd2198c9388788
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Fri May 19 11:19:11 2023 +0300
style: remove use of deprecated API in FileServer
---
src/core/src/main/java/org/apache/jmeter/services/FileServer.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
index 3b7e94326d..1f9b836a28 100644
--- a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
+++ b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
@@ -423,10 +423,8 @@ public class FileServer {
if (!fileEntry.file.canRead() || !fileEntry.file.isFile()) {
throw new IllegalArgumentException("File "+ fileEntry.file.getName()+ " must exist and be readable");
}
- // TODO: figure out the proper way to use BOMInputStream.builder()
- // See https://issues.apache.org/jira/browse/IO-792
- @SuppressWarnings("deprecation")
- BOMInputStream fis = new BOMInputStream(Files.newInputStream(fileEntry.file.toPath())); //NOSONAR
+
+ BOMInputStream fis = BOMInputStream.builder().setFile(fileEntry.file).get();
InputStreamReader isr = null;
// If file encoding is specified, read using that encoding, otherwise use default platform encoding
String charsetName = fileEntry.charSetEncoding;