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
The following commit(s) were added to refs/heads/master by this push:
new 5f2e86ddd0 test: replace TestTransactionController.TestSampleListener
with CollectSamplesListener
5f2e86ddd0 is described below
commit 5f2e86ddd05537e0025476c27445cbc5854a6e0d
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Sat Jun 24 14:40:09 2023 +0300
test: replace TestTransactionController.TestSampleListener with
CollectSamplesListener
---
.../jmeter/control/TestTransactionController.java | 34 +++-------------------
.../OpenModelThreadGroupConfigElementJavaTest.java | 6 ++--
.../OpenModelThreadGroupConfigElementTest.kt | 4 +--
3 files changed, 9 insertions(+), 35 deletions(-)
diff --git
a/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
b/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
index 96d35f4565..eb8c52f763 100644
---
a/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
+++
b/src/components/src/test/java/org/apache/jmeter/control/TestTransactionController.java
@@ -17,16 +17,10 @@
package org.apache.jmeter.control;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.jmeter.assertions.ResponseAssertion;
import org.apache.jmeter.junit.JMeterTestCase;
-import org.apache.jmeter.reporters.ResultCollector;
import org.apache.jmeter.sampler.DebugSampler;
-import org.apache.jmeter.samplers.SampleEvent;
-import org.apache.jmeter.samplers.SampleListener;
+import org.apache.jmeter.test.samplers.CollectSamplesListener;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.JMeterThread;
import org.apache.jmeter.threads.JMeterVariables;
@@ -44,7 +38,7 @@ public class TestTransactionController extends JMeterTestCase
{
public void testIssue57958() throws Exception {
JMeterContextService.getContext().setVariables(new JMeterVariables());
- TestSampleListener listener = new TestSampleListener();
+ CollectSamplesListener listener = new CollectSamplesListener();
TransactionController transactionController = new
TransactionController();
transactionController.setGenerateParentSample(true);
@@ -81,29 +75,9 @@ public class TestTransactionController extends
JMeterTestCase {
thread.setOnErrorStopThread(true);
thread.run();
- Assertions.assertEquals(1, listener.events.size(),
+ Assertions.assertEquals(1, listener.getEvents().size(),
"Must one transaction samples with parent debug sample");
Assertions.assertEquals("Number of samples in transaction : 1, number
of failing samples : 1",
- listener.events.get(0).getResult().getResponseMessage());
- }
-
- public static class TestSampleListener extends ResultCollector implements
SampleListener {
- private static final long serialVersionUID = -1373192220822942714L;
- public List<SampleEvent> events = Collections.synchronizedList(new
ArrayList<>());
-
- @Override
- public void sampleOccurred(SampleEvent e) {
- events.add(e);
- }
-
- @Override
- public void sampleStarted(SampleEvent e) {
- events.add(e);
- }
-
- @Override
- public void sampleStopped(SampleEvent e) {
- events.add(e);
- }
+ listener.getEvents().get(0).getResult().getResponseMessage());
}
}
diff --git
a/src/components/src/test/java/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementJavaTest.java
b/src/components/src/test/java/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementJavaTest.java
index 83c0e60193..955082cfca 100644
---
a/src/components/src/test/java/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementJavaTest.java
+++
b/src/components/src/test/java/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementJavaTest.java
@@ -25,12 +25,12 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
-import org.apache.jmeter.control.TestTransactionController;
import org.apache.jmeter.engine.JMeterEngineException;
import org.apache.jmeter.engine.StandardJMeterEngine;
import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.modifiers.CounterConfig;
import org.apache.jmeter.sampler.DebugSampler;
+import org.apache.jmeter.test.samplers.CollectSamplesListener;
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.test.JMeterSerialTest;
@@ -46,7 +46,7 @@ class OpenModelThreadGroupConfigElementJavaTest extends
JMeterTestCase implement
// @RepeatedTest(value = 10)
void ensure_thread_group_initializes_counter_only_once_for_each_thread()
throws JMeterEngineException, ExecutionException,
InterruptedException, TimeoutException {
- TestTransactionController.TestSampleListener listener = new
TestTransactionController.TestSampleListener();
+ CollectSamplesListener listener = new CollectSamplesListener();
HashTree tree = testTree(b -> {
b.add(TestPlan.class, tp -> {
@@ -76,7 +76,7 @@ class OpenModelThreadGroupConfigElementJavaTest extends
JMeterTestCase implement
// There's no guarantee that threads execute exactly in order, so we
sort
// the labels to avoid test failure in case the thread execute out of
order.
- List<String> actual = listener.events.stream()
+ List<String> actual = listener.getEvents().stream()
.map(e -> e.getResult().getSampleLabel())
.sorted()
.collect(Collectors.toList());
diff --git
a/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
b/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
index 69537283f0..cedf89d2e0 100644
---
a/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
+++
b/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt
@@ -17,11 +17,11 @@
package org.apache.jmeter.threads.openmodel
-import org.apache.jmeter.control.TestTransactionController
import org.apache.jmeter.engine.StandardJMeterEngine
import org.apache.jmeter.junit.JMeterTestCase
import org.apache.jmeter.modifiers.CounterConfig
import org.apache.jmeter.sampler.DebugSampler
+import org.apache.jmeter.test.samplers.CollectSamplesListener
import org.apache.jmeter.testelement.TestPlan
import org.apache.jmeter.treebuilder.dsl.testTree
import org.apache.jorphan.test.JMeterSerialTest
@@ -37,7 +37,7 @@ class OpenModelThreadGroupConfigElementTest :
JMeterTestCase(), JMeterSerialTest
// Un-comment if you want try running the test multiple times locally:
// @RepeatedTest(value = 10)
fun `ensure thread group initializes counter only once for each thread`() {
- val listener = TestTransactionController.TestSampleListener()
+ val listener = CollectSamplesListener()
val tree = testTree {
TestPlan::class {
