(camel) branch main updated: (chores) camel-jetty: minor test cleanups (#17012)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new f222731f0cd (chores) camel-jetty: minor test cleanups (#17012)
f222731f0cd is described below

commit f222731f0cddc2396c756479c30f9aaf8b931193
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Sun Feb 2 10:22:42 2025 +0100

    (chores) camel-jetty: minor test cleanups (#17012)
    
    * (chores) camel-jetty: removed unused code
    
    Signed-off-by: Otavio R. Piske <angusyo...@gmail.com>
    
    * (chores) camel-jetty: removed Jetty 8 logic in tests
    
    Signed-off-by: Otavio R. Piske <angusyo...@gmail.com>
    
    ---------
    
    Signed-off-by: Otavio R. Piske <angusyo...@gmail.com>
---
 .../apache/camel/component/jetty/BaseJettyTest.java | 21 ---------------------
 .../jetty/HttpProducerSendEmptyHeaderTest.java      |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git 
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
 
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
index 59d17ba9e27..4f9f9b562e4 100644
--- 
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
+++ 
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
@@ -17,40 +17,25 @@
 package org.apache.camel.component.jetty;
 
 import java.util.Properties;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.CamelContext;
 import org.apache.camel.http.common.HttpHeaderFilterStrategy;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit5.CamelTestSupport;
-import org.eclipse.jetty.server.Server;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 public abstract class BaseJettyTest extends CamelTestSupport {
 
     public static final String SSL_SYSPROPS = "SslSystemProperties";
 
-    static final CopyOnWriteArrayList<String> runningTests = new 
CopyOnWriteArrayList<>();
-
     @RegisterExtension
     protected AvailablePortFinder.Port port1 = AvailablePortFinder.find();
 
     @RegisterExtension
     protected AvailablePortFinder.Port port2 = AvailablePortFinder.find();
 
-    @BeforeEach
-    void addRunningTest() {
-        runningTests.add(getClass().getName());
-    }
-
-    @AfterEach
-    void remRunningTest() {
-        runningTests.remove(getClass().getName());
-    }
-
     // Due to CAMEL-21122 ports are never released. So, force them to be 
released.
     @AfterEach
     void cleanupPorts() {
@@ -95,10 +80,4 @@ public abstract class BaseJettyTest extends CamelTestSupport 
{
         filterStrat.setAllowNullValues(true);
         jetty.setHeaderFilterStrategy(filterStrat);
     }
-
-    protected boolean isJetty8() {
-        String majorVersion = Server.getVersion().split("\\.")[0];
-        return "8".equals(majorVersion);
-    }
-
 }
diff --git 
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSendEmptyHeaderTest.java
 
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSendEmptyHeaderTest.java
index 2bc2378f92b..44b0fde053f 100644
--- 
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSendEmptyHeaderTest.java
+++ 
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerSendEmptyHeaderTest.java
@@ -33,7 +33,7 @@ public class HttpProducerSendEmptyHeaderTest extends 
BaseJettyTest {
         mock.expectedMessageCount(1);
 
         // Jetty 8 treats an empty header as "" while Jetty 9 treats it as null
-        String expectedValue = isJetty8() ? "" : null;
+        String expectedValue = null;
         mock.expectedHeaderReceived("foo", expectedValue);
 
         template.sendBodyAndHeader("http://localhost:{{port}}/myapp/mytest";, 
"Hello World", "foo", "");