test: move TreeBuilder.oneRequest to core testFixtures

Author: vlsi

src/core/src/testFixtures/kotlin/org/apache/jmeter/treebuilder/TreeBuilderExtensions.kt

@@ -0,0 +1,34 @@
+/*
+ * 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.treebuilder
+
+import org.apache.jmeter.control.LoopController
+import org.apache.jmeter.threads.ThreadGroup
+
+fun TreeBuilder.oneRequest(body: ThreadGroup.() -> Unit) {
+    ThreadGroup::class {
+        numThreads = 1
+        rampUp = 0
+        setSamplerController(
+            LoopController().apply {
+                loops = 1
+            }
+        )
+        body()
+    }
+}

src/functions/src/test/kotlin/org/apache/jmeter/timers/ConstantThroughputTimerKtTest.kt

@@ -17,30 +17,15 @@
 
 package org.apache.jmeter.timers
 
-import org.apache.jmeter.control.LoopController
 import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.sampler.DebugSampler
 import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
-import org.apache.jmeter.threads.ThreadGroup
-import org.apache.jmeter.treebuilder.TreeBuilder
+import org.apache.jmeter.treebuilder.oneRequest
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import kotlin.time.Duration.Companion.seconds
 
 class ConstantThroughputTimerKtTest : JMeterTestCase() {
-    fun TreeBuilder.oneRequest(body: ThreadGroup.() -> Unit) {
-        ThreadGroup::class {
-            numThreads = 1
-            rampUp = 0
-            setSamplerController(
-                LoopController().apply {
-                    loops = 1
-                }
-            )
-            body()
-        }
-    }
-
     @Test
     fun `throughput as variable`() {
         val events = executePlanAndCollectEvents(5.seconds) {

src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerDisableArgumentsTest.kt

@@ -29,8 +29,10 @@ import com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor
 import com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo
 import com.github.tomakehurst.wiremock.junit5.WireMockTest
+import org.apache.jmeter.config.ConfigTestElement
 import org.apache.jmeter.junit.JMeterTestCase
 import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
+import org.apache.jmeter.treebuilder.oneRequest
 import org.apache.jmeter.treebuilder.TreeBuilder
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
@@ -39,8 +41,8 @@ import kotlin.time.Duration.Companion.seconds
 @WireMockTest
 class HttpSamplerDisableArgumentsTest : JMeterTestCase() {
 
-    fun TreeBuilder.httpGet(body: HTTPSamplerProxy.() -> Unit) {
-        org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
+    fun TreeBuilder.httpRequest(body: HTTPSamplerProxy.() -> Unit) {
+        HTTPSamplerProxy::class {
             name = "Test disabled params"
             method = "GET"
             domain = "localhost"
@@ -49,27 +51,6 @@ class HttpSamplerDisableArgumentsTest : JMeterTestCase() {
         }
     }
 
-    fun TreeBuilder.httpPut(body: HTTPSamplerProxy.() -> Unit) {
-        org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
-            name = "Test disabled params"
-            method = "PUT"
-            domain = "localhost"
-            path = "/test"
-            body()
-        }
-    }
-
-    fun TreeBuilder.httpPost(body: HTTPSamplerProxy.() -> Unit) {
-        org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
-            name = "Test disabled params"
-            method = "POST"
-            domain = "localhost"
-            path = "/test"
-            doMultipart = true
-            body()
-        }
-    }
-
     @ParameterizedTest
     @ValueSource(strings = ["Java", "HttpClient4"])
     fun `GET disable param1 should send enabled param2`(httpImplementation: String, server: WireMockRuntimeInfo) {
@@ -79,7 +60,8 @@ class HttpSamplerDisableArgumentsTest : JMeterTestCase() {
 
         executePlanAndCollectEvents(10.seconds) {
             oneRequest {
-                httpGet {
+                httpRequest {
+                    method = "GET"
                     implementation = httpImplementation
                     port = server.httpPort
                     addArgument("param1", "value1")
@@ -104,7 +86,8 @@ class HttpSamplerDisableArgumentsTest : JMeterTestCase() {
 
         executePlanAndCollectEvents(1000.seconds) {
             oneRequest {
-                httpPut {
+                httpRequest {
+                    method = "PUT"
                     implementation = httpImplementation
                     port = server.httpPort
                     postBodyRaw = true
@@ -132,15 +115,18 @@ class HttpSamplerDisableArgumentsTest : JMeterTestCase() {
 
         executePlanAndCollectEvents(10.seconds) {
             oneRequest {
-                httpPost {
-                    org.apache.jmeter.config.ConfigTestElement::class {
+                httpRequest {
+                    ConfigTestElement::class {
                         addArgument("param0", "value0")
                         arguments.getArgument(0).isEnabled = false
+                        addArgument("param4", "value4")
                         props {
                             // guiClass is needed for org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase.applies
                             it[guiClass] = "org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui"
                         }
                     }
+                    method = "POST"
+                    doMultipart = true
                     implementation = httpImplementation
                     port = server.httpPort
                     addArgument("param1", "value1")

src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTest.kt

@@ -31,6 +31,7 @@ import org.apache.jmeter.protocol.http.control.Header
 import org.apache.jmeter.protocol.http.util.HTTPFileArg
 import org.apache.jmeter.test.assertions.executePlanAndCollectEvents
 import org.apache.jmeter.treebuilder.TreeBuilder
+import org.apache.jmeter.treebuilder.oneRequest
 import org.junit.jupiter.api.Assumptions.assumeTrue
 import org.junit.jupiter.api.io.TempDir
 import org.junit.jupiter.params.ParameterizedTest
@@ -48,7 +49,7 @@ class HttpSamplerTest : JMeterTestCase() {
     lateinit var dir: Path
 
     fun TreeBuilder.httpPost(body: HTTPSamplerProxy.() -> Unit) {
-        org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy::class {
+        HTTPSamplerProxy::class {
             name = "Upload file"
             method = "POST"
             domain = "localhost"

src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/sampler/HttpSamplerTestingUtils.kt

@@ -20,22 +20,6 @@ package org.apache.jmeter.protocol.http.sampler
 import com.github.tomakehurst.wiremock.client.WireMock.equalTo
 import com.github.tomakehurst.wiremock.client.WireMock.matching
 import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder
-import org.apache.jmeter.control.LoopController
-import org.apache.jmeter.threads.ThreadGroup
-import org.apache.jmeter.treebuilder.TreeBuilder
-
-fun TreeBuilder.oneRequest(body: ThreadGroup.() -> Unit) {
-    ThreadGroup::class {
-        numThreads = 1
-        rampUp = 0
-        setSamplerController(
-            LoopController().apply {
-                loops = 1
-            }
-        )
-        body()
-    }
-}
 
 fun RequestPatternBuilder.withRequestBody(
     httpImplementation: String,