X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fconfiguration%2FApplicationConfigParserTest.java;h=79eb07a6d140f03ad7da559e28fd1d61124090f9;hb=bfdd5bb6f922b2ffbf87251e607de3ae73782984;hp=8346cf8bb2941f0fcdd2e82cd3e0041a947dd537;hpb=95b2c7b1314696cbd2aebcdfb2e87291790cedfd;p=nonrtric.git

diff --git a/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java b/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java
index 8346cf8b..79eb07a6 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 Nordix Foundation
+ * Copyright (C) 2020 Nordix Foundation
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@ import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.Map;
 import java.util.Properties;
 
 import org.junit.jupiter.api.Test;
@@ -51,12 +52,12 @@ public class ApplicationConfigParserTest {
     ApplicationConfigParser parserUnderTest = new ApplicationConfigParser();
 
     @Test
-    public void whenCorrectDmaapConfig() throws Exception {
+    public void whenCorrectConfig() throws Exception {
         JsonObject jsonRootObject = getJsonRootObject();
 
-        parserUnderTest.parse(jsonRootObject);
+        ApplicationConfigParser.ConfigParserResult result = parserUnderTest.parse(jsonRootObject);
 
-        Properties actualPublisherConfig = parserUnderTest.getDmaapPublisherConfig();
+        Properties actualPublisherConfig = result.dmaapPublisherConfig();
         assertAll("publisherConfig",
             () -> assertEquals("localhost:6845/events", actualPublisherConfig.get("ServiceName"), "Wrong ServiceName"),
             () -> assertEquals("A1-POLICY-AGENT-WRITE", actualPublisherConfig.get("topic"), "Wrong topic"),
@@ -67,10 +68,10 @@ public class ApplicationConfigParserTest {
             () -> assertEquals("admin", actualPublisherConfig.get("password"), "Wrong password"),
             () -> assertEquals(ProtocolTypeConstants.HTTPNOAUTH.toString(), actualPublisherConfig.get("TransportType"),
                 "Wrong TransportType"),
-            () -> assertEquals(15000, actualPublisherConfig.get("timeout"), "Wrong timeout"),
-            () -> assertEquals(100, actualPublisherConfig.get("limit"), "Wrong limit"));
+            () -> assertEquals("15000", actualPublisherConfig.get("timeout"), "Wrong timeout"),
+            () -> assertEquals("100", actualPublisherConfig.get("limit"), "Wrong limit"));
 
-        Properties actualConsumerConfig = parserUnderTest.getDmaapConsumerConfig();
+        Properties actualConsumerConfig = result.dmaapConsumerConfig();
         assertAll("consumerConfig",
             () -> assertEquals("localhost:6845/events", actualConsumerConfig.get("ServiceName"), "Wrong ServiceName"),
             () -> assertEquals("A1-POLICY-AGENT-READ", actualConsumerConfig.get("topic"), "Wrong topic"),
@@ -83,8 +84,18 @@ public class ApplicationConfigParserTest {
             () -> assertEquals("policy-agent", actualConsumerConfig.get("id"), "Wrong id"),
             () -> assertEquals(ProtocolTypeConstants.HTTPNOAUTH.toString(), actualConsumerConfig.get("TransportType"),
                 "Wrong TransportType"),
-            () -> assertEquals(15000, actualConsumerConfig.get("timeout"), "Wrong timeout"),
-            () -> assertEquals(100, actualConsumerConfig.get("limit"), "Wrong limit"));
+            () -> assertEquals("15000", actualConsumerConfig.get("timeout"), "Wrong timeout"),
+            () -> assertEquals("100", actualConsumerConfig.get("limit"), "Wrong limit"));
+
+        Map<String, ControllerConfig> controllers = result.controllerConfigs();
+        assertEquals(1, controllers.size(), "size");
+        ImmutableControllerConfig expectedControllerConfig = ImmutableControllerConfig.builder() //
+            .baseUrl("http://localhost:8083/") //
+            .name("controller1") //
+            .userName("user") //
+            .password("password") //
+            .build(); //
+        assertEquals(expectedControllerConfig, controllers.get("controller1"), "controller contents");
     }
 
     private JsonObject getJsonRootObject() throws JsonIOException, JsonSyntaxException, IOException {
@@ -121,7 +132,8 @@ public class ApplicationConfigParserTest {
         private JsonObject fake_info_object;
 
         public String toString() {
-            return String.format("[dmaap_publisher=%s, fake_info_object=%s]", dmaap_publisher.toString(), fake_info_object.toString());
+            return String.format("[dmaap_publisher=%s, fake_info_object=%s]", dmaap_publisher.toString(),
+                fake_info_object.toString());
         }
     }
 
@@ -147,7 +159,8 @@ public class ApplicationConfigParserTest {
         private JsonObject fake_info_object;
 
         public String toString() {
-            return String.format("[dmaap_subscriber=%s, fake_info_object=%s]", dmaap_subscriber.toString(), fake_info_object.toString());
+            return String.format("[dmaap_subscriber=%s, fake_info_object=%s]", dmaap_subscriber.toString(),
+                fake_info_object.toString());
         }
     }
 
@@ -188,7 +201,7 @@ public class ApplicationConfigParserTest {
         JsonObject jsonRootObject = getJsonRootObject();
         JsonObject json = jsonRootObject.getAsJsonObject("config");
         json.remove("ric");
-        final String message = "Could not find member: ric in: " + json;
+        final String message = "Could not find member: 'ric' in: " + json;
 
         Exception actualException = assertThrows(ServiceException.class, () -> parserUnderTest.parse(jsonRootObject));
 
@@ -227,8 +240,8 @@ public class ApplicationConfigParserTest {
             "Wrong error message when the streams publishes' URL has incorrect syntax");
     }
 
-    public JsonObject getDmaapInfo(JsonObject jsonRootObject, String streamsPublishesOrSubscribes, String dmaapPublisherOrSubscriber)
-        throws Exception {
+    public JsonObject getDmaapInfo(JsonObject jsonRootObject, String streamsPublishesOrSubscribes,
+        String dmaapPublisherOrSubscriber) throws Exception {
         return jsonRootObject.getAsJsonObject("config").getAsJsonObject(streamsPublishesOrSubscribes)
             .getAsJsonObject(dmaapPublisherOrSubscriber).getAsJsonObject("dmaap_info");
     }