[jmeter] branch master updated: Allow SampleResult#setEndTime be set in JSR223Sampler

[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


The following commit(s) were added to refs/heads/master by this push:
     new 2da0eb558c Allow SampleResult#setEndTime be set in JSR223Sampler
2da0eb558c is described below

commit 2da0eb558c53ad0e4369fe310e3b460ba11d502f
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Tue Nov 29 20:52:36 2022 +0100

    Allow SampleResult#setEndTime be set in JSR223Sampler
    
    Fixes #5733 and closes #5736
---
 .../protocol/java/sampler/JSR223Sampler.java       | 10 +++--
 .../protocol/java/sampler/JSR223SamplerTest.java   | 46 ++++++++++++++++++++++
 xdocs/changes.xml                                  |  1 +
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
index 085e6e1e18..e68eb36ac4 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
@@ -18,7 +18,7 @@
 package org.apache.jmeter.protocol.java.sampler;
 
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
 @TestElementMetadata(labelResource = "displayName")
 public class JSR223Sampler extends JSR223TestElement implements Cloneable, Sampler, TestBean, ConfigMergabilityIndicator {
     private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<>(
-            Arrays.asList("org.apache.jmeter.config.gui.SimpleConfigGui"));
+            Collections.singletonList("org.apache.jmeter.config.gui.SimpleConfigGui"));
 
     private static final long serialVersionUID = 235L;
 
@@ -58,7 +58,7 @@ public class JSR223Sampler extends JSR223TestElement implements Cloneable, Sampl
         result.setResponseMessageOK();
 
         final String filename = getFilename();
-        if (filename.length() > 0){
+        if (!filename.isEmpty()){
             result.setSamplerData("File: "+filename);
         } else {
             result.setSamplerData(getScript());
@@ -79,7 +79,9 @@ public class JSR223Sampler extends JSR223TestElement implements Cloneable, Sampl
             result.setResponseCode("500"); // $NON-NLS-1$
             result.setResponseMessage(e.toString());
         }
-        result.sampleEnd();
+        if (result.getEndTime() == 0) {
+            result.sampleEnd();
+        }
         return result;
     }
 
diff --git a/src/protocol/java/src/test/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerTest.java b/src/protocol/java/src/test/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerTest.java
new file mode 100644
index 0000000000..f2478c7e4d
--- /dev/null
+++ b/src/protocol/java/src/test/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerTest.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+package org.apache.jmeter.protocol.java.sampler;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.jmeter.samplers.SampleResult;
+import org.junit.jupiter.api.Test;
+
+class JSR223SamplerTest {
+
+    @Test
+    void sampleWithEndTimeSet() {
+        JSR223Sampler sampler = new JSR223Sampler();
+        sampler.setName("jsr223Test");
+        sampler.setScript("SampleResult.setEndTime(42); 'OK'");
+        sampler.setScriptLanguage("groovy");
+        SampleResult sampleResult = sampler.sample(null);
+        assertEquals(42, sampleResult.getEndTime());
+    }
+
+    @Test
+    void sampleWithoutEndTimeSet() {
+        JSR223Sampler sampler = new JSR223Sampler();
+        sampler.setName("jsr223Test");
+        sampler.setScript("'OK'");
+        sampler.setScriptLanguage("groovy");
+        SampleResult sampleResult = sampler.sample(null);
+        assertEquals(System.currentTimeMillis(), sampleResult.getEndTime(), 1000);
+    }
+}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index a900cf48e2..048343e00a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -119,6 +119,7 @@ Summary
 
 <h3>Other Samplers</h3>
 <ul>
+  <li><pr>5736</pr><issue>5733</issue>Allow <code>SampleResult#setEndTime</code> be set in <code>JSR223Sampler</code></li>
 </ul>
 
 <h3>Controllers</h3>