Remove main classpath from systemTest source set.

hivemq · Mar 2, 2023 · 6560df9 · 6560df9
1 parent 40594df
commit 6560df9
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 15 deletions.
diff --git a/src/systemTest/java/com/hivemq/cli/commands/cli/CipherSuitesTlsST.java b/src/systemTest/java/com/hivemq/cli/commands/cli/CipherSuitesTlsST.java
@@ -43,7 +43,7 @@ public class CipherSuitesTlsST {
     @SuppressWarnings("JUnitMalformedDeclaration")
     private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
             .withTlsConfiguration(TlsConfiguration.builder()
-                    .withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
+                    .withTlsVersions(TlsVersion.supportedAsList())
                     .withCipherSuites(CipherSuite.getAllAsString())
                     .withTlsEnabled(true)
                     .build())

diff --git a/src/systemTest/java/com/hivemq/cli/commands/cli/publish/PublishConnectMTlsST.java b/src/systemTest/java/com/hivemq/cli/commands/cli/publish/PublishConnectMTlsST.java
@@ -43,7 +43,7 @@ class PublishConnectMTlsST {
     @SuppressWarnings("JUnitMalformedDeclaration")
     private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
             .withTlsConfiguration(TlsConfiguration.builder()
-                    .withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
+                    .withTlsVersions(TlsVersion.supportedAsList())
                     .withClientAuthentication(true)
                     .withTlsEnabled(true)
                     .build())

diff --git a/src/systemTest/java/com/hivemq/cli/commands/cli/publish/PublishConnectTlsST.java b/src/systemTest/java/com/hivemq/cli/commands/cli/publish/PublishConnectTlsST.java
@@ -49,7 +49,7 @@ class PublishConnectTlsST {
     @SuppressWarnings("JUnitMalformedDeclaration")
     private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
             .withTlsConfiguration(TlsConfiguration.builder()
-                    .withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
+                    .withTlsVersions(TlsVersion.supportedAsList())
                     .withCipherSuites(CipherSuite.getAllAsString())
                     .withTlsEnabled(true)
                     .build())

diff --git a/src/systemTest/java/com/hivemq/cli/commands/cli/subscribe/SubscribeConnectMTlsST.java b/src/systemTest/java/com/hivemq/cli/commands/cli/subscribe/SubscribeConnectMTlsST.java
@@ -46,7 +46,7 @@ class SubscribeConnectMTlsST {
     private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
             .withTlsConfiguration(TlsConfiguration.builder()
                     .withTlsEnabled(true)
-                    .withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
+                    .withTlsVersions(TlsVersion.supportedAsList())
                     .withClientAuthentication(true)
                     .build())
             .build();

diff --git a/src/systemTest/java/com/hivemq/cli/commands/cli/subscribe/SubscribeConnectTlsST.java b/src/systemTest/java/com/hivemq/cli/commands/cli/subscribe/SubscribeConnectTlsST.java
@@ -51,7 +51,7 @@ class SubscribeConnectTlsST {
     private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
             .withTlsConfiguration(TlsConfiguration.builder()
                     .withTlsEnabled(true)
-                    .withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
+                    .withTlsVersions(TlsVersion.supportedAsList())
                     .build())
             .build();
 

diff --git a/src/systemTest/java/com/hivemq/cli/commands/cli/test_broker/TestBrokerConnectMTlsST.java b/src/systemTest/java/com/hivemq/cli/commands/cli/test_broker/TestBrokerConnectMTlsST.java
@@ -41,7 +41,7 @@ class TestBrokerConnectMTlsST {
     private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
             .withTlsConfiguration(TlsConfiguration.builder()
                     .withTlsEnabled(true)
-                    .withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
+                    .withTlsVersions(TlsVersion.supportedAsList())
                     .withClientAuthentication(true)
                     .build())
             .build();

diff --git a/src/systemTest/java/com/hivemq/cli/commands/cli/test_broker/TestBrokerConnectTlsST.java b/src/systemTest/java/com/hivemq/cli/commands/cli/test_broker/TestBrokerConnectTlsST.java
@@ -46,7 +46,7 @@ class TestBrokerConnectTlsST {
     private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
             .withTlsConfiguration(TlsConfiguration.builder()
                     .withTlsEnabled(true)
-                    .withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
+                    .withTlsVersions(TlsVersion.supportedAsList())
                     .build())
             .build();
 

diff --git a/src/systemTest/java/com/hivemq/cli/commands/shell/connect/ShellConnectMTlsST.java b/src/systemTest/java/com/hivemq/cli/commands/shell/connect/ShellConnectMTlsST.java
@@ -40,7 +40,7 @@ class ShellConnectMTlsST {
     private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
             .withTlsConfiguration(TlsConfiguration.builder()
                     .withTlsEnabled(true)
-                    .withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
+                    .withTlsVersions(TlsVersion.supportedAsList())
                     .build())
             .build();
 

diff --git a/src/systemTest/java/com/hivemq/cli/commands/shell/connect/ShellConnectTlsST.java b/src/systemTest/java/com/hivemq/cli/commands/shell/connect/ShellConnectTlsST.java
@@ -41,7 +41,7 @@ class ShellConnectTlsST {
     private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
             .withTlsConfiguration(TlsConfiguration.builder()
                     .withTlsEnabled(true)
-                    .withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
+                    .withTlsVersions(TlsVersion.supportedAsList())
                     .build())
             .build();
 

diff --git a/src/systemTest/java/com/hivemq/cli/utils/broker/HiveMQExtension.java b/src/systemTest/java/com/hivemq/cli/utils/broker/HiveMQExtension.java
@@ -254,8 +254,8 @@ private int generatePort() throws IOException {
         final String websocketsConfig = setupWebsockets();
         //@formatter:off
         return "<hivemq>\n" + "    " +
-                "   <listeners>\n" + "        " +
-                "       <tcp-listener>\n" +
+                "    <listeners>\n" + "        " +
+                "        <tcp-listener>\n" +
                 "            <port>" + port + "</port>\n" +
                 "            <bind-address>" + BIND_ADDRESS + "</bind-address>\n" +
                 "        </tcp-listener>\n" +

diff --git a/src/systemTest/java/com/hivemq/cli/utils/broker/TlsVersion.java b/src/systemTest/java/com/hivemq/cli/utils/broker/TlsVersion.java
@@ -18,12 +18,16 @@
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public enum TlsVersion {
-    TLS_1_3("TLSv1.3"),
-    TLS_1_2("TLSv1.2");
-    //TLS_1_1("TLSv1.1"),
+    //SSL_3_0("SSLv3"),
     //TLS_1_0("TLSv1"),
-    //SSL_3_0("SSLv3");
+    //TLS_1_1("TLSv1.1"),
+    TLS_1_2("TLSv1.2"),
+    TLS_1_3("TLSv1.3");
 
     private final @NotNull String tlsString;
 
@@ -35,4 +39,8 @@ public enum TlsVersion {
     TlsVersion(final @NotNull String asString) {
         tlsString = asString;
     }
+
+    public static @NotNull List<TlsVersion> supportedAsList() {
+        return Arrays.stream(TlsVersion.values()).collect(Collectors.toList());
+    }
 }