(tomcat) 16/18: Don't record test as skipped if it can never pass

[markt]

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

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 34bbcc9fa8a3b755e716a70a580ab4dd19e2d8fd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 3 19:41:52 2024 +0000

    Don't record test as skipped if it can never pass
---
 test/org/apache/tomcat/util/net/TestCustomSsl.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java 
b/test/org/apache/tomcat/util/net/TestCustomSsl.java
index cf8a86dfd4..b95997cc11 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
@@ -19,7 +19,6 @@ package org.apache.tomcat.util.net;
 import java.io.File;
 
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
@@ -46,8 +45,10 @@ public class TestCustomSsl extends TomcatBaseTest {
         Tomcat tomcat = getTomcatInstance();
         Connector connector = tomcat.getConnector();
 
-        Assume.assumeFalse("This test is only for JSSE based SSL connectors",
-                connector.getProtocolHandlerClassName().contains("Apr"));
+        // This test is only for JSSE based SSL connectors
+        if (connector.getProtocolHandlerClassName().contains("Apr")) {
+            return;
+        }
 
         SSLHostConfig sslHostConfig = new SSLHostConfig();
         SSLHostConfigCertificate certificate = new 
SSLHostConfigCertificate(sslHostConfig, Type.UNDEFINED);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org