X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2FApplicationTest.java;h=66c87421f659bb21fd0c3f0684b2cd9000831761;hb=48ae0f39d9d03cc1ec976762e6f7400447ace0a4;hp=d856c8a58dc6b34e3cbfef9649f8e543e34df012;hpb=3483a78c55f1830dd0aa28f789ddf817ea1358c0;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 d856c8a5..66c87421 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -201,7 +201,7 @@ class ApplicationTest { for (Ric ric : this.rics.getRics()) { ric.getLock().lockBlocking(LockType.EXCLUSIVE); ric.getLock().unlockBlocking(); - assertThat(ric.getLock().getLockCounter()).isEqualTo(0); + assertThat(ric.getLock().getLockCounter()).isZero(); assertThat(ric.getState()).isEqualTo(Ric.RicState.AVAILABLE); } } @@ -221,14 +221,14 @@ class ApplicationTest { // 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"); + assertThat(rsp).contains("ric2") // + .doesNotContain("ric1") // + .contains("AVAILABLE"); // All RICs rsp = restClient().get("/rics").block(); - assertThat(rsp).contains("ric2"); - assertThat(rsp).contains("ric1"); + assertThat(rsp).contains("ric2") // + .contains("ric1"); // Non existing policy type url = "/rics?policyType=XXXX"; @@ -267,8 +267,8 @@ class ApplicationTest { assertThat(ricPolicy.json()).isEqualTo(policy.json()); // Both types should be in the agent storage after the synch - assertThat(ric1.getSupportedPolicyTypes().size()).isEqualTo(2); - assertThat(ric2.getSupportedPolicyTypes().size()).isEqualTo(2); + assertThat(ric1.getSupportedPolicyTypes()).hasSize(2); + assertThat(ric2.getSupportedPolicyTypes()).hasSize(2); } @Test @@ -327,17 +327,17 @@ class ApplicationTest { assertThat(policy.id()).isEqualTo(policyInstanceId); assertThat(policy.ownerServiceName()).isEqualTo(serviceName); assertThat(policy.ric().name()).isEqualTo("ric1"); - assertThat(policy.isTransient()).isEqualTo(true); + assertThat(policy.isTransient()).isTrue(); // Put a non transient policy url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId); restClient().put(url, policyBody).block(); policy = policies.getPolicy(policyInstanceId); - assertThat(policy.isTransient()).isEqualTo(false); + assertThat(policy.isTransient()).isFalse(); url = "/policies"; String rsp = restClient().get(url).block(); - assertThat(rsp).contains(policyInstanceId).as("Response contains policy instance ID."); + assertThat(rsp).as("Response contains policy instance ID.").contains(policyInstanceId); url = "/policy?id=" + policyInstanceId; rsp = restClient().get(url).block(); @@ -348,6 +348,7 @@ class ApplicationTest { testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND); url = putPolicyUrl(serviceName, ricName, policyTypeName + "XX", policyInstanceId); + addPolicyType(policyTypeName + "XX", "otherRic"); testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND); url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId); @@ -358,12 +359,11 @@ class ApplicationTest { @Test /** - * Test that HttpStatus and body from failing REST call to A1 is passed on to - * the caller. + * Test that HttpStatus and body from failing REST call to A1 is passed on to the caller. * * @throws ServiceException */ - void testErrorFromRIC() throws ServiceException { + void testErrorFromRic() throws ServiceException { putService("service1"); addPolicyType("type1", "ric1"); @@ -405,7 +405,7 @@ class ApplicationTest { String rsp = restClient().get("/policies").block(); List info = parseList(rsp, PolicyInfo.class); - assertThat(info.size()).isEqualTo(1); + assertThat(info).hasSize(1); PolicyInfo policyInfo = info.get(0); assertThat(policyInfo.id).isEqualTo("id1"); assertThat(policyInfo.type).isEmpty(); @@ -448,7 +448,7 @@ class ApplicationTest { ResponseEntity entity = restClient().deleteForEntity(url).block(); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); - assertThat(policies.size()).isEqualTo(0); + assertThat(policies.size()).isZero(); // Delete a non existing policy testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND); @@ -461,17 +461,17 @@ class ApplicationTest { String url = "/policy_schemas"; String rsp = this.restClient().get(url).block(); - assertThat(rsp).contains("type1"); - assertThat(rsp).contains("[{\"title\":\"type2\"}"); + assertThat(rsp).contains("type1") // + .contains("[{\"title\":\"type2\"}"); List info = parseSchemas(rsp); - assertThat(info.size()).isEqualTo(2); + assertThat(info).hasSize(2); url = "/policy_schemas?ric=ric1"; rsp = restClient().get(url).block(); assertThat(rsp).contains("type1"); info = parseSchemas(rsp); - assertThat(info.size()).isEqualTo(1); + assertThat(info).hasSize(1); // Get schema for non existing RIC url = "/policy_schemas?ric=ric1XXX"; @@ -486,8 +486,8 @@ class ApplicationTest { String url = "/policy_schema?id=type1"; String rsp = restClient().get(url).block(); logger.info(rsp); - assertThat(rsp).contains("type1"); - assertThat(rsp).contains("title"); + assertThat(rsp).contains("type1") // + .contains("title"); // Get non existing schema url = "/policy_schema?id=type1XX"; @@ -520,7 +520,7 @@ class ApplicationTest { String rsp = restClient().get(url).block(); logger.info(rsp); List info = parseList(rsp, PolicyInfo.class); - assertThat(info).size().isEqualTo(1); + assertThat(info).hasSize(1); PolicyInfo policyInfo = info.get(0); assert (policyInfo.validate()); assertThat(policyInfo.id).isEqualTo("id1"); @@ -537,16 +537,16 @@ class ApplicationTest { String url = "/policies?type=type1"; String rsp = restClient().get(url).block(); logger.info(rsp); - assertThat(rsp).contains("id1"); - assertThat(rsp).contains("id2"); - assertThat(rsp.contains("id3")).isFalse(); + assertThat(rsp).contains("id1") // + .contains("id2") // + .doesNotContain("id3"); url = "/policies?type=type1&service=service2"; rsp = restClient().get(url).block(); logger.info(rsp); - assertThat(rsp.contains("id1")).isFalse(); - assertThat(rsp).contains("id2"); - assertThat(rsp.contains("id3")).isFalse(); + assertThat(rsp).doesNotContain("id1") // + .contains("id2") // + .doesNotContain("id3"); // Test get policies for non existing type url = "/policies?type=type1XXX"; @@ -566,9 +566,9 @@ class ApplicationTest { String url = "/policy_ids?type=type1"; String rsp = restClient().get(url).block(); logger.info(rsp); - assertThat(rsp).contains("id1"); - assertThat(rsp).contains("id2"); - assertThat(rsp.contains("id3")).isFalse(); + assertThat(rsp).contains("id1") // + .contains("id2") // + .doesNotContain("id3"); url = "/policy_ids?type=type1&service=service1&ric=ric1"; rsp = restClient().get(url).block(); @@ -594,15 +594,15 @@ class ApplicationTest { String url = "/services?name=name"; String rsp = restClient().get(url).block(); List info = parseList(rsp, ServiceStatus.class); - assertThat(info.size()).isEqualTo(1); + assertThat(info).hasSize(1); ServiceStatus status = info.iterator().next(); - assertThat(status.keepAliveIntervalSeconds).isEqualTo(0); + assertThat(status.keepAliveIntervalSeconds).isZero(); assertThat(status.serviceName).isEqualTo(serviceName); // GET (all) url = "/services"; rsp = restClient().get(url).block(); - assertThat(rsp).contains(serviceName).as("Response contains service name"); + assertThat(rsp).as("Response contains service name").contains(serviceName); logger.info(rsp); // Keep alive @@ -614,7 +614,7 @@ class ApplicationTest { assertThat(services.size()).isEqualTo(1); url = "/services?name=name"; restClient().delete(url).block(); - assertThat(services.size()).isEqualTo(0); + assertThat(services.size()).isZero(); // Keep alive, no registered service testErrorCode(restClient().put("/services/keepalive?name=name", ""), HttpStatus.NOT_FOUND); @@ -643,8 +643,8 @@ class ApplicationTest { assertThat(services.size()).isEqualTo(1); // Timeout after ~1 second - await().untilAsserted(() -> assertThat(policies.size()).isEqualTo(0)); - assertThat(services.size()).isEqualTo(0); + await().untilAsserted(() -> assertThat(policies.size()).isZero()); + assertThat(services.size()).isZero(); } @Test @@ -731,13 +731,17 @@ class ApplicationTest { for (Thread t : threads) { t.join(); } - assertThat(policies.size()).isEqualTo(0); + assertThat(policies.size()).isZero(); logger.info("Concurrency test took " + Duration.between(startTime, Instant.now())); } private AsyncRestClient restClient(boolean useTrustValidation) { WebClientConfig config = this.applicationConfig.getWebClientConfig(); config = ImmutableWebClientConfig.builder() // + .keyStoreType(config.keyStoreType()) // + .keyStorePassword(config.keyStorePassword()) // + .keyStore(config.keyStore()) // + .keyPassword(config.keyPassword()) // .isTrustStoreUsed(useTrustValidation) // .trustStore(config.trustStore()) // .trustStorePassword(config.trustStorePassword()) //