Allow SampleResult#setEndTime be set in JSR223Sampler

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 @@
 @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 SampleResult sample(Entry entry) {
         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 SampleResult sample(Entry entry) {
             result.setResponseCode("500"); // $NON-NLS-1$
             result.setResponseMessage(e.toString());
         }
-        result.sampleEnd();
+        if (result.getEndTime() == 0) {
+            result.sampleEnd();
+        }
         return result;
     }
 

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);
+    }
+}