unit tests

Author: alai8

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsServerConfig.java

@@ -210,7 +210,7 @@ public boolean isLocalAdminProtocolChannelSecure() {
       for (NetworkAccessPoint nap : networkAccessPoints) {
         if (nap.isAdminProtocol()) {
           adminProtocolPortFound = true;
-          adminProtocolPortSecure = false;
+          adminProtocolPortSecure = true;
           break;
         }
       }

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

@@ -360,6 +360,16 @@ public void whenPodCreated_readinessProbeHasDefinedTuning() {
         hasExpectedTuning(READINESS_INITIAL_DELAY, READINESS_TIMEOUT, READINESS_PERIOD));
   }
 
+  @Test
+  public void whenPodCreatedWithAdminPortEnabled_readinessProbeHasReadinessCommand() {
+    final Integer ADMIN_PORT = 9002;
+    domainTopology.getServerConfig(serverName).setAdminPort(ADMIN_PORT);
+    V1HTTPGetAction getAction = getCreatedPodSpecContainer().getReadinessProbe().getHttpGet();
+    assertThat(getAction.getPath(), equalTo("/weblogic/ready"));
+    assertThat(getAction.getPort().getIntValue(), equalTo(ADMIN_PORT));
+    assertThat(getAction.getScheme(), equalTo("HTTPS"));
+  }
+
   @Test
   public void whenPodCreatedWithDomainV2Settings_livenessProbeHasConfiguredTuning() {
     configureServer()

operator/src/test/java/oracle/kubernetes/operator/wlsconfig/WlsDynamicServerConfigTest.java

@@ -4,6 +4,8 @@
 
 package oracle.kubernetes.operator.wlsconfig;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
@@ -84,4 +86,17 @@ public void testCreateWithCalculatedDefaultPorts() {
     assertEquals(new Integer(9102), networkAccessPoint1.getListenPort());
     assertNull(networkAccessPoint1.getPublicPort());
   }
+
+  @Test
+  public void verifyAdminPortIsSetOnServerConfigs() {
+    final int ADMIN_PORT = 9002;
+    List<NetworkAccessPoint> networkAccessPointList = new ArrayList<>();
+    WlsServerConfig template =
+        new WlsServerConfig("template1", null, null, null, null, 9002, networkAccessPointList);
+
+    WlsServerConfig wlsServerConfig =
+        WlsDynamicServerConfig.create("server1", 2, "cluster1", "domain1", true, template);
+
+    assertThat(wlsServerConfig.getAdminPort(), is(ADMIN_PORT));
+  }
 }

operator/src/test/java/oracle/kubernetes/operator/wlsconfig/WlsServerConfigTest.java

@@ -0,0 +1,86 @@
+// Copyright 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.wlsconfig;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class WlsServerConfigTest {
+
+  static final int LISTEN_PORT = 8001;
+  static final int SSL_LISTEN_PORT = 8002;
+  static final int ADMIN_PORT = 9002;
+  static final int NAP_ADMIN_PORT = 8082;
+  static final int NAP_NON_ADMIN_PORT = 8081;
+
+  @Test
+  public void verify_getLocalAdminProtocolChannelPort_returnsListenPort() {
+    WlsServerConfig wlsServerConfig = createConfigWithOnlyListenPort();
+    assertThat(wlsServerConfig.getLocalAdminProtocolChannelPort(), is(LISTEN_PORT));
+    assertThat(wlsServerConfig.isLocalAdminProtocolChannelSecure(), is(false));
+  }
+
+  @Test
+  public void verify_getLocalAdminProtocolChannelPort_returnsSslListenPort() {
+    WlsServerConfig wlsServerConfig = createConfigWithListenPortAndSslListenPort();
+    assertThat(wlsServerConfig.getLocalAdminProtocolChannelPort(), is(SSL_LISTEN_PORT));
+    assertThat(wlsServerConfig.isLocalAdminProtocolChannelSecure(), is(true));
+  }
+
+  @Test
+  public void verify_getLocalAdminProtocolChannelPort_returnsAdminPort() {
+    WlsServerConfig wlsServerConfig = createConfigWithAllListenPorts();
+    assertThat(wlsServerConfig.getLocalAdminProtocolChannelPort(), is(ADMIN_PORT));
+    assertThat(wlsServerConfig.isLocalAdminProtocolChannelSecure(), is(true));
+  }
+
+  @Test
+  public void verify_getLocalAdminProtocolChannelPort_withAdminNAP_returnsNapAdminPort() {
+    WlsServerConfig wlsServerConfig = createConfigWithAdminNAP();
+    assertThat(wlsServerConfig.getLocalAdminProtocolChannelPort(), is(NAP_ADMIN_PORT));
+    assertThat(wlsServerConfig.isLocalAdminProtocolChannelSecure(), is(true));
+  }
+
+  @Test
+  public void verify_getLocalAdminProtocolChannelPort_withNonAdminNAP_returnsAdminPort() {
+    WlsServerConfig wlsServerConfig = createConfigWithNonAdminNAP();
+    assertThat(wlsServerConfig.getLocalAdminProtocolChannelPort(), is(ADMIN_PORT));
+    assertThat(wlsServerConfig.isLocalAdminProtocolChannelSecure(), is(true));
+  }
+
+  WlsServerConfig createConfigWithOnlyListenPort() {
+    WlsServerConfig wlsServerConfig = new WlsServerConfig();
+    wlsServerConfig.setListenPort(LISTEN_PORT);
+    return wlsServerConfig;
+  }
+
+  WlsServerConfig createConfigWithListenPortAndSslListenPort() {
+    WlsServerConfig wlsServerConfig = createConfigWithOnlyListenPort();
+    wlsServerConfig.setSslListenPort(SSL_LISTEN_PORT);
+    return wlsServerConfig;
+  }
+
+  WlsServerConfig createConfigWithAllListenPorts() {
+    WlsServerConfig wlsServerConfig = createConfigWithListenPortAndSslListenPort();
+    wlsServerConfig.setAdminPort(ADMIN_PORT);
+    return wlsServerConfig;
+  }
+
+  WlsServerConfig createConfigWithAdminNAP() {
+    WlsServerConfig wlsServerConfig = createConfigWithAllListenPorts();
+    wlsServerConfig.addNetworkAccessPoint(
+        new NetworkAccessPoint("admin-channel", "admin", NAP_ADMIN_PORT, null));
+    return wlsServerConfig;
+  }
+
+  WlsServerConfig createConfigWithNonAdminNAP() {
+    WlsServerConfig wlsServerConfig = createConfigWithAllListenPorts();
+    wlsServerConfig.addNetworkAccessPoint(
+        new NetworkAccessPoint("non-admin-channel", "t3", NAP_NON_ADMIN_PORT, null));
+    return wlsServerConfig;
+  }
+}