[jmeter] 04/16: Make error prone happier by using static inner class

[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

commit a91c28d82bbf8631c9051830bb5e78336da9266f
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Mon Apr 18 16:33:26 2022 +0200

    Make error prone happier by using static inner class
    
    While we are here, switch to junit5 methods.
---
 .../org/apache/jmeter/control/TestTransactionController.java | 12 +++++++-----
 .../jmeter/samplers/TestDataStrippingSampleSender.java       |  2 +-
 2 files changed, 8 insertions(+), 6 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 f9bcb6f9fc..ac54f06479 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,8 +17,6 @@
 
 package org.apache.jmeter.control;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,6 +33,7 @@ import org.apache.jmeter.threads.ListenerNotifier;
 import org.apache.jmeter.threads.TestCompiler;
 import org.apache.jmeter.threads.ThreadGroup;
 import org.apache.jorphan.collections.ListedHashTree;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 
@@ -81,11 +80,14 @@ public class TestTransactionController extends JMeterTestCase {
         thread.setOnErrorStopThread(true);
         thread.run();
 
-        assertEquals("Must one transaction samples with parent debug sample", 1, listener.events.size());
-        assertEquals("Number of samples in transaction : 1, number of failing samples : 1", listener.events.get(0).getResult().getResponseMessage());
+        Assertions.assertEquals(1, listener.events.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 class TestSampleListener extends ResultCollector implements SampleListener {
+    public static class TestSampleListener extends ResultCollector implements SampleListener {
+        private static final long serialVersionUID = -1373192220822942714L;
         public List<SampleEvent> events = new ArrayList<>();
 
         @Override
diff --git a/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java b/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java
index cac17a5d78..a2168564ef 100644
--- a/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java
+++ b/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java
@@ -92,7 +92,7 @@ class TestDataStrippingSampleSender extends JMeterTestCase implements JMeterSeri
         return result;
     }
 
-    private class SimpleSender implements SampleSender {
+    private static class SimpleSender implements SampleSender {
 
         private SampleResult result;