X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2FApplicationTest.java;h=cffd1c45a1068552bec5205dadae50c4805a5a7b;hb=2310d1c6a458bd12b2d1ff805f1bd12dcd536cfa;hp=09662575caded0fd5ee8c31137e4c00960eb08f3;hpb=6d503afd38bdf9823bda3dfe3d307adaeb6f7eee;p=nonrtric.git

diff --git a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
index 09662575..cffd1c45 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
@@ -46,7 +46,9 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.oransc.policyagent.clients.AsyncRestClient;
 import org.oransc.policyagent.configuration.ApplicationConfig;
 import org.oransc.policyagent.configuration.ImmutableRicConfig;
+import org.oransc.policyagent.configuration.ImmutableWebClientConfig;
 import org.oransc.policyagent.configuration.RicConfig;
+import org.oransc.policyagent.configuration.WebClientConfig;
 import org.oransc.policyagent.controllers.PolicyInfo;
 import org.oransc.policyagent.controllers.ServiceRegistrationInfo;
 import org.oransc.policyagent.controllers.ServiceStatus;
@@ -88,7 +90,7 @@ import reactor.util.annotation.Nullable;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-public class ApplicationTest {
+class ApplicationTest {
     private static final Logger logger = LoggerFactory.getLogger(ApplicationTest.class);
 
     @Autowired
@@ -181,7 +183,7 @@ public class ApplicationTest {
     private int port;
 
     @BeforeEach
-    public void reset() {
+    void reset() {
         rics.clear();
         policies.clear();
         policyTypes.clear();
@@ -190,7 +192,7 @@ public class ApplicationTest {
     }
 
     @AfterEach
-    public void verifyNoRicLocks() {
+    void verifyNoRicLocks() {
         for (Ric ric : this.rics.getRics()) {
             ric.getLock().lockBlocking(LockType.EXCLUSIVE);
             ric.getLock().unlockBlocking();
@@ -200,7 +202,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testGetRics() throws Exception {
+    void testGetRics() throws Exception {
         addRic("ric1");
         this.addPolicyType("type1", "ric1");
         String url = "/rics?policyType=type1";
@@ -211,7 +213,9 @@ public class ApplicationTest {
         addRic("ric2");
         this.addPolicyType("", "ric2");
         url = "/rics?policyType=";
-        rsp = restClient().get(url).block();
+
+        // This tests also validation of trusted certs restClient(true)
+        rsp = restClient(true).get(url).block();
         assertThat(rsp).contains("ric2");
         assertThat(rsp).doesNotContain("ric1");
         assertThat(rsp).contains("AVAILABLE");
@@ -227,7 +231,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testSynchronization() throws Exception {
+    void testSynchronization() throws Exception {
         // Two polictypes will be put in the NearRT RICs
         PolicyTypes nearRtRicPolicyTypes = new PolicyTypes();
         nearRtRicPolicyTypes.put(createPolicyType("typeName"));
@@ -263,7 +267,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testGetRicForManagedElement_thenReturnCorrectRic() throws Exception {
+    void testGetRicForManagedElement_thenReturnCorrectRic() throws Exception {
         String ricName = "ric1";
         String managedElementId = "kista_1";
         addRic(ricName, managedElementId);
@@ -297,7 +301,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testPutPolicy() throws Exception {
+    void testPutPolicy() throws Exception {
         String serviceName = "service1";
         String ricName = "ric1";
         String policyTypeName = "type1";
@@ -354,7 +358,7 @@ public class ApplicationTest {
      *
      * @throws ServiceException
      */
-    public void testErrorFromRIC() throws ServiceException {
+    void testErrorFromRIC() throws ServiceException {
         putService("service1");
         addPolicyType("type1", "ric1");
 
@@ -388,7 +392,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testPutTypelessPolicy() throws Exception {
+    void testPutTypelessPolicy() throws Exception {
         putService("service1");
         addPolicyType("", "ric1");
         String url = putPolicyUrl("service1", "ric1", "", "id1");
@@ -403,7 +407,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testRefuseToUpdatePolicy() throws Exception {
+    void testRefuseToUpdatePolicy() throws Exception {
         // Test that only the json can be changed for a already created policy
         // In this case service is attempted to be changed
         this.addRic("ric1");
@@ -417,7 +421,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testGetPolicy() throws Exception {
+    void testGetPolicy() throws Exception {
         String url = "/policy?id=id";
         Policy policy = addPolicy("id", "typeName", "service1", "ric1");
         {
@@ -431,7 +435,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testDeletePolicy() throws Exception {
+    void testDeletePolicy() throws Exception {
         addPolicy("id", "typeName", "service1", "ric1");
         assertThat(policies.size()).isEqualTo(1);
 
@@ -446,7 +450,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testGetPolicySchemas() throws Exception {
+    void testGetPolicySchemas() throws Exception {
         addPolicyType("type1", "ric1");
         addPolicyType("type2", "ric2");
 
@@ -470,7 +474,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testGetPolicySchema() throws Exception {
+    void testGetPolicySchema() throws Exception {
         addPolicyType("type1", "ric1");
         addPolicyType("type2", "ric2");
 
@@ -486,7 +490,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testGetPolicyTypes() throws Exception {
+    void testGetPolicyTypes() throws Exception {
         addPolicyType("type1", "ric1");
         addPolicyType("type2", "ric2");
 
@@ -504,7 +508,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testGetPolicies() throws Exception {
+    void testGetPolicies() throws Exception {
         addPolicy("id1", "type1", "service1");
 
         String url = "/policies";
@@ -520,7 +524,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testGetPoliciesFilter() throws Exception {
+    void testGetPoliciesFilter() throws Exception {
         addPolicy("id1", "type1", "service1");
         addPolicy("id2", "type1", "service2");
         addPolicy("id3", "type2", "service1");
@@ -549,7 +553,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testGetPolicyIdsFilter() throws Exception {
+    void testGetPolicyIdsFilter() throws Exception {
         addPolicy("id1", "type1", "service1", "ric1");
         addPolicy("id2", "type1", "service2", "ric1");
         addPolicy("id3", "type2", "service1", "ric1");
@@ -575,7 +579,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testPutAndGetService() throws Exception {
+    void testPutAndGetService() throws Exception {
         // PUT
         putService("name", 0, HttpStatus.CREATED);
         putService("name", 0, HttpStatus.OK);
@@ -621,7 +625,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testServiceSupervision() throws Exception {
+    void testServiceSupervision() throws Exception {
         putService("service1", 1, HttpStatus.CREATED);
         addPolicyType("type1", "ric1");
 
@@ -638,7 +642,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testGetPolicyStatus() throws Exception {
+    void testGetPolicyStatus() throws Exception {
         addPolicy("id", "typeName", "service1", "ric1");
         assertThat(policies.size()).isEqualTo(1);
 
@@ -703,7 +707,7 @@ public class ApplicationTest {
     }
 
     @Test
-    public void testConcurrency() throws Exception {
+    void testConcurrency() throws Exception {
         final Instant startTime = Instant.now();
         List<Thread> threads = new ArrayList<>();
         a1ClientFactory.setResponseDelay(Duration.ofMillis(1));
@@ -725,8 +729,19 @@ public class ApplicationTest {
         logger.info("Concurrency test took " + Duration.between(startTime, Instant.now()));
     }
 
+    private AsyncRestClient restClient(boolean useTrustValidation) {
+        WebClientConfig config = this.applicationConfig.getWebClientConfig();
+        config = ImmutableWebClientConfig.builder() //
+            .isTrustStoreUsed(useTrustValidation) //
+            .trustStore(config.trustStore()) //
+            .trustStorePassword(config.trustStorePassword()) //
+            .build();
+
+        return new AsyncRestClient(baseUrl(), config);
+    }
+
     private AsyncRestClient restClient() {
-        return new AsyncRestClient(baseUrl(), this.applicationConfig.getWebClientConfig());
+        return restClient(false);
     }
 
     private void testErrorCode(Mono<?> request, HttpStatus expStatus) {