Refactor Integration tests to not depend on Arquillian

Author: LEDfan

pom.xml

@@ -289,29 +289,6 @@
 			<version>2.11.2</version>
 		</dependency>
 
-
-		<!-- Deps for tests -->
-		<dependency>
-			<groupId>org.arquillian.cube</groupId>
-			<artifactId>arquillian-cube-bom</artifactId>
-			<version>${version.arquillian_cube}</version>
-			<scope>import</scope>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.arquillian.cube</groupId>
-  			<artifactId>arquillian-cube-kubernetes-starter</artifactId>
-  			<version>${version.arquillian_cube}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.arquillian.cube</groupId>
-			<artifactId>arquillian-cube-requirement</artifactId>
-			<version>${version.arquillian_cube}</version>
-			<scope>test</scope>
-		</dependency>
-
-
                 <!-- Recursive dependencies which are upgraded for security -->
                 <dependency>
                     <groupId>commons-collections</groupId>

src/test/java/eu/openanalytics/containerproxy/test/helpers/KubernetesTestBase.java

@@ -0,0 +1,89 @@
+/**
+ * ContainerProxy
+ *
+ * Copyright (C) 2016-2020 Open Analytics
+ *
+ * ===========================================================================
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Apache License as published by
+ * The Apache Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * Apache License for more details.
+ *
+ * You should have received a copy of the Apache License
+ * along with this program.  If not, see <http://www.apache.org/licenses/>
+ */
+package eu.openanalytics.containerproxy.test.helpers;
+
+import io.fabric8.kubernetes.api.model.Namespace;
+import io.fabric8.kubernetes.api.model.NamespaceBuilder;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+
+import java.util.Arrays;
+import java.util.List;
+
+public abstract class KubernetesTestBase {
+
+    public static interface TestBody {
+        public void run(NamespacedKubernetesClient client, String namespace, String overriddenNamespace) throws InterruptedException;
+    }
+
+    public static final String namespace = "itest";
+    public static final String overriddenNamespace = "itest-overridden";
+    private final List<String> managedNamespaces = Arrays.asList(namespace, overriddenNamespace);
+
+    static protected final DefaultKubernetesClient client = new DefaultKubernetesClient();
+
+    protected void setup(TestBody test) {
+        Runtime.getRuntime().addShutdownHook(new Thread(this::deleteNamespaces));
+
+        deleteNamespaces();
+        createNamespaces();
+
+        try {
+            Thread.sleep(1000); // wait for namespaces and tokens to become ready
+
+            NamespacedKubernetesClient namespacedKubernetesClient = client.inNamespace(namespace);
+
+            test.run(namespacedKubernetesClient, namespace, overriddenNamespace);
+        } catch (InterruptedException e) {
+        } finally {
+            deleteNamespaces();
+        }
+    }
+
+    private void deleteNamespaces() {
+        try {
+            for (String namespace : managedNamespaces) {
+                Namespace ns = client.namespaces().withName(namespace).get();
+                if (ns == null) {
+                    continue;
+                }
+
+                client.namespaces().delete(ns);
+
+                while (client.namespaces().withName(namespace).get() != null) {
+                    Thread.sleep(1000);
+                }
+            }
+        } catch (InterruptedException e) {
+        }
+    }
+
+    private void createNamespaces() {
+        for (String namespace : managedNamespaces) {
+            client.namespaces().create(new NamespaceBuilder()
+                    .withNewMetadata()
+                    .withName(namespace)
+                    .endMetadata()
+                    .build());
+        }
+    }
+
+}

src/test/java/eu/openanalytics/containerproxy/test/proxy/PropertyOverrideContextInitializer.java

@@ -30,6 +30,6 @@ public class PropertyOverrideContextInitializer
 	@Override
 	public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
 		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(configurableApplicationContext,
-				"proxy.kubernetes.namespace=" + TestIntegrationOnKube.session.getNamespace());
+				"proxy.kubernetes.namespace=" + TestIntegrationOnKube.namespace);
 	}
 }