(tomcat-tck) 01/02: Add some plumbing to support the tests that require HTTPS

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-tck.git

commit 566b45843ed474dd035308379a5bcdc7c038ddec
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Mar 20 09:53:43 2024 +0000

    Add some plumbing to support the tests that require HTTPS
---
 .../tomcat/tck/servlet/TomcatServletTckConfiguration.java   |  4 ++++
 servlet-tck/src/test/resources/arquillian.xml               | 13 +++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git 
a/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
 
b/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
index 4b043da..2b46a62 100644
--- 
a/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
+++ 
b/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
@@ -83,6 +83,10 @@ public class TomcatServletTckConfiguration implements 
LoadableExtension {
                                "configureUpgradeProtocol", 
UpgradeProtocol.class);
                    m.setAccessible(true);
                    m.invoke(httpProtocol, http2Protocol);
+
+                   if 
("https".equals(System.getProperty("arquillian.launch"))) {
+                       // Need to enabled HTTPS
+                   }
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
diff --git a/servlet-tck/src/test/resources/arquillian.xml 
b/servlet-tck/src/test/resources/arquillian.xml
index a0554f4..2f7f5d4 100644
--- a/servlet-tck/src/test/resources/arquillian.xml
+++ b/servlet-tck/src/test/resources/arquillian.xml
@@ -1,5 +1,14 @@
-<arquillian>
-  <container qualifier="tomcat" default="true">
+<?xml version="1.0"?>
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+    xmlns="http://jboss.org/schema/arquillian";
+    xsi:schemaLocation="http://jboss.org/schema/arquillian 
http://www.jboss.org/schema/arquillian/arquillian_1_0.xsd";>
+    
+  <container qualifier="http" default="true">
+    <configuration>
+      <property name="bindHttpPort">0</property>
+    </configuration>
+  </container>
+  <container qualifier="https">
     <configuration>
       <property name="bindHttpPort">0</property>
     </configuration>


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