Upgrade client API versions to R3 latest

[portal/ric-dashboard.git] / webapp-backend / src / test / java / org / oransc / ric / portal / dashboard / controller / CaasIngressControllerTest.java

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/CaasIngressControllerTest.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/CaasIngressControllerTest.java
index 40ee7f6..b91c44c 100644 (file)
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/CaasIngressControllerTest.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/CaasIngressControllerTest.java
@@ -22,8 +22,11 @@ package org.oransc.ric.portal.dashboard.controller;
 import java.lang.invoke.MethodHandles;
 import java.net.URI;
 
+import org.junit.Assert;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.oransc.ric.portal.dashboard.DashboardConstants;
+import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,27 +35,41 @@ public class CaasIngressControllerTest extends AbstractControllerTest {
        private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
        @Test
-       public void auxTest() {
-               final String nsAux = "ricaux";
-               URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, CaasIngressController.PODS_METHOD,
-                               CaasIngressController.PP_CLUSTER, CaasIngressController.CLUSTER_AUX, CaasIngressController.PP_NAMESPACE,
-                               nsAux);
+       public void pltTest() {
+               final String nsPlt = "ricplt";
+               URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+                               RICInstanceMockConfiguration.INSTANCE_KEY_1, CaasIngressController.PODS_METHOD,
+                               CaasIngressController.PP_CLUSTER, CaasIngressController.CLUSTER_PLT, CaasIngressController.PP_NAMESPACE,
+                               nsPlt);
                logger.info("Invoking {}", uri);
                String s = testRestTemplateStandardRole().getForObject(uri, String.class);
                Assertions.assertFalse(s.isEmpty());
-               Assertions.assertTrue(s.contains(nsAux));
+               Assertions.assertTrue(s.contains(nsPlt));
        }
 
        @Test
-       public void pltTest() {
+       public void unknownClusterTest() {
                final String nsPlt = "ricplt";
-               URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, CaasIngressController.PODS_METHOD,
+               URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+                               RICInstanceMockConfiguration.INSTANCE_KEY_1, CaasIngressController.PODS_METHOD,
+                               CaasIngressController.PP_CLUSTER, "cluster", CaasIngressController.PP_NAMESPACE, nsPlt);
+               logger.info("Invoking {}", uri);
+               String s = testRestTemplateStandardRole().getForObject(uri, String.class);
+               Assert.assertNull(s);
+       }
+
+       // Unknown namespace triggers a controller exception
+       @Test
+       public void bogusNsTest() {
+               final String ns = "unknown";
+               URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+                               RICInstanceMockConfiguration.INSTANCE_KEY_1, CaasIngressController.PODS_METHOD,
                                CaasIngressController.PP_CLUSTER, CaasIngressController.CLUSTER_PLT, CaasIngressController.PP_NAMESPACE,
-                               nsPlt);
+                               ns);
                logger.info("Invoking {}", uri);
                String s = testRestTemplateStandardRole().getForObject(uri, String.class);
                Assertions.assertFalse(s.isEmpty());
-               Assertions.assertTrue(s.contains(nsPlt));
+               Assertions.assertTrue(s.contains("RIC Dashboard Error"));
        }
 
 }