test: use @DisabledIfSystemProperty to skip ingress tests

Author: jsenko

operator/controller/src/test/java/io/apicurio/registry/operator/it/IngressManager.java

@@ -26,6 +26,9 @@ public class IngressManager {
     public IngressManager(KubernetesClient k8sClient, String namespace) {
         this.k8sClient = k8sClient;
         this.namespace = namespace;
+        if (isSkipIngress()) {
+            log.warn("Ingress testing is skipped. This is not recommended.");
+        }
     }
 
     public String getIngressHost(String prefix) {
@@ -41,16 +44,8 @@ private static Optional<String> getBaseIngressHost() {
         return ConfigProvider.getConfig().getOptionalValue(INGRESS_HOST_PROP, String.class);
     }
 
-    public boolean isIngressSupported() {
-        if (isSkipIngress()) {
-            log.warn("Ingress testing is skipped. This is not recommended.");
-            return false;
-        }
-        return true;
-    }
-
     public RequestSpecification startHttpRequest(String ingressName) {
-        if (!isIngressSupported()) {
+        if (isSkipIngress()) {
             throw new OperatorException("Ingress tests are not supported.");
         }
 

operator/controller/src/test/java/io/apicurio/registry/operator/it/SmokeITTest.java

@@ -5,6 +5,7 @@
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.quarkus.test.junit.QuarkusTest;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -109,43 +110,42 @@ void testService() {
     }
 
     @Test
+    @DisabledIfSystemProperty(named = INGRESS_SKIP_PROP, matches = "true")
     void testIngress() {
-        if (ingressManager.isIngressSupported()) {
-            // spotless:off
-            var registry = new ApicurioRegistry3();
-            var meta = new ObjectMeta();
-            meta.setName("demo");
-            meta.setNamespace(namespace);
-            registry.setMetadata(meta);
-            registry.setSpec(ApicurioRegistry3Spec.builder()
-                    .appHost(ingressManager.getIngressHost("demo-app"))
-                    .uiHost(ingressManager.getIngressHost("demo-ui"))
-                    .build());
-            // spotless:on
-
-            // Act
-            client.resources(ApicurioRegistry3.class).inNamespace(namespace).create(registry);
-
-            // Wait for Ingresses
-            await().ignoreExceptions().until(() -> {
-                assertThat(client.network().v1().ingresses().inNamespace(namespace)
-                        .withName("demo-app-ingress").get()).isNotNull();
-                assertThat(client.network().v1().ingresses().inNamespace(namespace)
-                        .withName("demo-ui-ingress").get()).isNotNull();
-                return true;
-            });
-
-            await().ignoreExceptions().until(() -> {
-                ingressManager.startHttpRequest("demo-app-ingress").basePath("/apis/registry/v3/system/info")
-                        .get().then().statusCode(200);
-                return true;
-            });
-
-            await().ignoreExceptions().until(() -> {
-                ingressManager.startHttpRequest("demo-ui-ingress").basePath("/config.js").get().then()
-                        .statusCode(200);
-                return true;
-            });
-        }
+        // spotless:off
+        var registry = new ApicurioRegistry3();
+        var meta = new ObjectMeta();
+        meta.setName("demo");
+        meta.setNamespace(namespace);
+        registry.setMetadata(meta);
+        registry.setSpec(ApicurioRegistry3Spec.builder()
+                .appHost(ingressManager.getIngressHost("demo-app"))
+                .uiHost(ingressManager.getIngressHost("demo-ui"))
+                .build());
+        // spotless:on
+
+        // Act
+        client.resources(ApicurioRegistry3.class).inNamespace(namespace).create(registry);
+
+        // Wait for Ingresses
+        await().ignoreExceptions().until(() -> {
+            assertThat(client.network().v1().ingresses().inNamespace(namespace).withName("demo-app-ingress")
+                    .get()).isNotNull();
+            assertThat(client.network().v1().ingresses().inNamespace(namespace).withName("demo-ui-ingress")
+                    .get()).isNotNull();
+            return true;
+        });
+
+        await().ignoreExceptions().until(() -> {
+            ingressManager.startHttpRequest("demo-app-ingress").basePath("/apis/registry/v3/system/info")
+                    .get().then().statusCode(200);
+            return true;
+        });
+
+        await().ignoreExceptions().until(() -> {
+            ingressManager.startHttpRequest("demo-ui-ingress").basePath("/config.js").get().then()
+                    .statusCode(200);
+            return true;
+        });
     }
 }