Merge pull request #112 from russgold/filter-unit-tests

Enable the unit tests that are currently working, independent of platforms

Author: rjeberhard

pom.xml

@@ -82,35 +82,6 @@
                         <exclude>**/*Test.java</exclude>
                     </includes>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>default-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </execution>
-                    <!--
-                    <execution>
-                      <id>kubernetes-config</id>
-                      <phase>test</phase>
-                      <goals>
-                          <goal>test</goal>
-                      </goals>
-                      <configuration>
-                          <argLine>${surefireArgLine} -Xms512m -Xmx1500m</argLine>
-                          <environmentVariables>
-                              <KUBECONFIG>
-                                  ${project.basedir}/your.kube.config
-                              </KUBECONFIG>
-                          </environmentVariables>
-                      </configuration>
-                  </execution>
-                  -->
-                </executions>
             </plugin>
 
             <plugin>

src/test/java/oracle/kubernetes/custom/TestDomainListWatcher.java

@@ -14,8 +14,8 @@
 import oracle.kubernetes.operator.helpers.ClientHelper;
 import oracle.kubernetes.operator.helpers.ClientHolder;
 import oracle.kubernetes.operator.watcher.WatchingEventDestination;
-
 import org.junit.After;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -48,13 +48,13 @@ public class TestDomainListWatcher implements WatchingEventDestination<Domain> {
   @Before
   public void beforeTest() {
     // Create the Domain definition if it doesn't exist.
-    createWeblogicCRD();
+    if (isKubernetesAvailable()) createWeblogicCRD();
   }
 
   @After
   public void afterTest() {
     // If the domain definition was done here then get rid of it.
-    deleteWeblogicCRD();
+    if (isKubernetesAvailable()) deleteWeblogicCRD();
   }
 
   /**
@@ -63,7 +63,7 @@ public void afterTest() {
    */
   @Test
   public void testDomainListWatcher() {
-
+    Assume.assumeTrue(isKubernetesAvailable());
     AtomicBoolean isStopping = new AtomicBoolean(false);
     DomainWatcher dlw = DomainWatcher.create("default", "", this, isStopping);
 
@@ -105,6 +105,10 @@ public void testDomainListWatcher() {
     fail("Not all watch events were received for created objects");
   }
 
+  private boolean isKubernetesAvailable() { // assume it is available when running on Linux
+    return System.getProperty("os.name").toLowerCase().contains("nix");
+  }
+
   // This override intercepts all watch events whioch would have
   // normally sent to the operator for processing.
   @Override

src/test/java/oracle/kubernetes/operator/HealthCheckHelperTest.java

@@ -12,6 +12,7 @@
 import oracle.kubernetes.operator.logging.LoggingFactory;
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -37,6 +38,9 @@ public class HealthCheckHelperTest {
 
   @Before
   public void setUp() throws Exception {
+    LOGGER.getUnderlyingLogger().addHandler(hdlr);
+
+    if (!isKubernetesAvailable()) return;
 
     ClientHolder client = ClientHelper.getInstance().take();
     try {
@@ -45,7 +49,6 @@ public void setUp() throws Exception {
       defaultHealthCheckHelper = new HealthCheckHelper(client, "default", Collections.singleton("default"));
       unitHealthCheckHelper = new HealthCheckHelper(client, UNIT_NAMESPACE, Collections.singleton(UNIT_NAMESPACE));
 
-      LOGGER.getUnderlyingLogger().addHandler(hdlr);
     } finally {
       ClientHelper.getInstance().recycle(client);
     }
@@ -60,6 +63,7 @@ public void tearDown() throws Exception {
   }
 
   @Test
+  @Ignore
   public void testDefaultNamespace() throws Exception {
 
     defaultHealthCheckHelper.performSecurityChecks("default");
@@ -93,6 +97,7 @@ public void testUnitTestNamespace() throws Exception {
 
   @Test
   public void testAccountNoPrivs() throws Exception {
+    Assume.assumeTrue(isKubernetesAvailable());
     unitHealthCheckHelper.performSecurityChecks("unit-test-svc-account-no-privs");
     hdlr.flush();
     String logOutput = bos.toString();
@@ -102,6 +107,10 @@ public void testAccountNoPrivs() throws Exception {
     bos.reset();
   }
 
+  private boolean isKubernetesAvailable() { // assume it is available whenever running on linux
+    return System.getProperty("os.name").toLowerCase().contains("nix");
+  }
+
   // Create a named namespace
   private V1Namespace createNamespace(ClientHolder client, String name) throws Exception {
 

src/test/java/oracle/kubernetes/operator/SecretHelperTest.java

@@ -15,12 +15,13 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-
+@Ignore
 public class SecretHelperTest {
 
   private final static String SECRET_NAME = "wls-admin-server-credentials";

src/test/java/oracle/kubernetes/operator/ServiceHelperTest.java

@@ -21,11 +21,13 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
 import java.util.Map;
 
+@Ignore
 public class ServiceHelperTest {
 
   // These test will use the "tests" namespace.

src/test/java/oracle/kubernetes/operator/WatchTest.java

@@ -10,6 +10,7 @@
 import oracle.kubernetes.operator.domain.model.oracle.kubernetes.weblogic.domain.v1.Domain;
 import oracle.kubernetes.operator.helpers.ClientHelper;
 import oracle.kubernetes.operator.helpers.ClientHolder;
+import org.junit.Assume;
 import org.junit.Test;
 
 import javax.annotation.concurrent.NotThreadSafe;
@@ -21,6 +22,7 @@ public class WatchTest {
 
   @Test
   public void testNamespaceWatch() {
+    Assume.assumeTrue(System.getProperty("os.name").toLowerCase().contains("nix"));
 
     ClientHolder client = ClientHelper.getInstance().take();
     try {
@@ -57,6 +59,7 @@ public void testNamespaceWatch() {
 
   @Test
   public void testCustomResourceWatch() {
+    Assume.assumeTrue(System.getProperty("os.name").toLowerCase().contains("nix"));
 
     ClientHolder client = ClientHelper.getInstance().take();
     try {

src/test/java/oracle/kubernetes/operator/helpers/IngressHelperTest.java

@@ -30,6 +30,7 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
@@ -39,6 +40,7 @@
 /**
  * To test Ingress Helper
  */
+@Ignore
 public class IngressHelperTest {
   private final String namespace = "weblogic-operator";
   private final String domainUID = "domianIngressHelperTest";