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=4de5c71ffcf9151ca81183033abdaf93ee89b68e;hb=6a39814272307d0207222c9229b0d765ac062bf0;hp=cffd1c45a1068552bec5205dadae50c4805a5a7b;hpb=6116e98837066075013c5ee22b39a2df4ff604ea;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 cffd1c45..4de5c71f 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -81,6 +81,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.web.reactive.function.client.WebClientResponseException; @@ -90,6 +91,10 @@ import reactor.util.annotation.Nullable; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +@TestPropertySource( + properties = { // + "server.ssl.key-store=./config/keystore.jks", // + "app.webclient.trust-store=./config/truststore.jks"}) class ApplicationTest { private static final Logger logger = LoggerFactory.getLogger(ApplicationTest.class); @@ -196,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); } } @@ -216,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"; @@ -262,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 @@ -322,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)).isTrue(); + assertThat(rsp).as("Response contains policy instance ID.").contains(policyInstanceId); url = "/policy?id=" + policyInstanceId; rsp = restClient().get(url).block(); @@ -343,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,7 +364,7 @@ class ApplicationTest { * * @throws ServiceException */ - void testErrorFromRIC() throws ServiceException { + void testErrorFromRic() throws ServiceException { putService("service1"); addPolicyType("type1", "ric1"); @@ -400,10 +406,10 @@ 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.equals("id1")).isTrue(); - assertThat(policyInfo.type.equals("")).isTrue(); + assertThat(policyInfo.id).isEqualTo("id1"); + assertThat(policyInfo.type).isEmpty(); } @Test @@ -443,7 +449,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); @@ -456,17 +462,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"; @@ -481,8 +487,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"; @@ -515,7 +521,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"); @@ -532,16 +538,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"; @@ -561,9 +567,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(); @@ -581,22 +587,23 @@ class ApplicationTest { @Test void testPutAndGetService() throws Exception { // PUT - putService("name", 0, HttpStatus.CREATED); - putService("name", 0, HttpStatus.OK); + String serviceName = "name"; + putService(serviceName, 0, HttpStatus.CREATED); + putService(serviceName, 0, HttpStatus.OK); // GET one service 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.serviceName).isEqualTo("name"); + assertThat(status.keepAliveIntervalSeconds).isZero(); + assertThat(status.serviceName).isEqualTo(serviceName); // GET (all) url = "/services"; rsp = restClient().get(url).block(); - assertThat(rsp.contains("name")).isTrue(); + assertThat(rsp).as("Response contains service name").contains(serviceName); logger.info(rsp); // Keep alive @@ -608,19 +615,19 @@ 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 registerred service + // Keep alive, no registered service testErrorCode(restClient().put("/services/keepalive?name=name", ""), HttpStatus.NOT_FOUND); // PUT servive with bad payload testErrorCode(restClient().put("/service", "crap"), HttpStatus.BAD_REQUEST); testErrorCode(restClient().put("/service", "{}"), HttpStatus.BAD_REQUEST); - testErrorCode(restClient().put("/service", createServiceJson("name", -123)), HttpStatus.BAD_REQUEST); - testErrorCode(restClient().put("/service", createServiceJson("name", 0, "missing.portandprotocol.com")), + testErrorCode(restClient().put("/service", createServiceJson(serviceName, -123)), HttpStatus.BAD_REQUEST); + testErrorCode(restClient().put("/service", createServiceJson(serviceName, 0, "missing.portandprotocol.com")), HttpStatus.BAD_REQUEST); - // GET non existing servive + // GET non existing service testErrorCode(restClient().get("/services?name=XXX"), HttpStatus.NOT_FOUND); } @@ -637,8 +644,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 @@ -648,7 +655,7 @@ class ApplicationTest { String url = "/policy_status?id=id"; String rsp = restClient().get(url).block(); - assertThat(rsp.equals("OK")).isTrue(); + assertThat(rsp).isEqualTo("OK"); // GET non existing policy status url = "/policy_status?id=XXX"; @@ -657,7 +664,7 @@ class ApplicationTest { private Policy addPolicy(String id, String typeName, String service, String ric) throws ServiceException { addRic(ric); - Policy p = ImmutablePolicy.builder() // + Policy policy = ImmutablePolicy.builder() // .id(id) // .json(jsonString()) // .ownerServiceName(service) // @@ -666,8 +673,8 @@ class ApplicationTest { .lastModified("lastModified") // .isTransient(false) // .build(); - policies.put(p); - return p; + policies.put(policy); + return policy; } private Policy addPolicy(String id, String typeName, String service) throws ServiceException { @@ -714,24 +721,34 @@ class ApplicationTest { addRic("ric"); addPolicyType("type1", "ric"); addPolicyType("type2", "ric"); + List tests = new ArrayList<>(); for (int i = 0; i < 10; ++i) { - Thread t = - new Thread(new ConcurrencyTestRunnable(baseUrl(), supervision, a1ClientFactory, rics, policyTypes), - "TestThread_" + i); - t.start(); - threads.add(t); + ConcurrencyTestRunnable test = + new ConcurrencyTestRunnable(restClient(), supervision, a1ClientFactory, rics, policyTypes); + Thread thread = new Thread(test, "TestThread_" + i); + thread.start(); + threads.add(thread); + tests.add(test); } for (Thread t : threads) { t.join(); } - assertThat(policies.size()).isEqualTo(0); + for (ConcurrencyTestRunnable test : tests) { + assertThat(test.isFailed()).isFalse(); + } + + 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()) // @@ -755,11 +772,11 @@ class ApplicationTest { .verify(); } - private boolean checkWebClientError(Throwable t, HttpStatus expStatus, String responseContains) { - assertTrue(t instanceof WebClientResponseException); - WebClientResponseException e = (WebClientResponseException) t; - assertThat(e.getStatusCode()).isEqualTo(expStatus); - assertThat(e.getResponseBodyAsString()).contains(responseContains); + private boolean checkWebClientError(Throwable throwable, HttpStatus expStatus, String responseContains) { + assertTrue(throwable instanceof WebClientResponseException); + WebClientResponseException responseException = (WebClientResponseException) throwable; + assertThat(responseException.getStatusCode()).isEqualTo(expStatus); + assertThat(responseException.getResponseBodyAsString()).contains(responseContains); return true; } @@ -809,8 +826,8 @@ class ApplicationTest { List result = new ArrayList<>(); JsonArray jsonArr = JsonParser.parseString(jsonString).getAsJsonArray(); for (JsonElement jsonElement : jsonArr) { - T o = gson.fromJson(jsonElement.toString(), clazz); - result.add(o); + T json = gson.fromJson(jsonElement.toString(), clazz); + result.add(json); } return result; }