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=a8cab60c9a7fee084ec1748d35df8a09b79611b4;hb=d9df6244e4ba89b71cba364f156ca529c3703faa;hp=a8fc6e15b600f1438bc15293b6b5cf856b52bddf;hpb=8319eeb737417730a41234f8acc73530fcfb9e71;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 a8fc6e15..a8cab60c 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -90,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 @@ -183,7 +183,7 @@ public class ApplicationTest { private int port; @BeforeEach - public void reset() { + void reset() { rics.clear(); policies.clear(); policyTypes.clear(); @@ -192,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(); @@ -202,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"; @@ -231,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")); @@ -267,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); @@ -301,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"; @@ -332,7 +332,7 @@ public class ApplicationTest { url = "/policies"; String rsp = restClient().get(url).block(); - assertThat(rsp.contains(policyInstanceId)).isTrue(); + assertThat(rsp.contains(policyInstanceId)).as("Response contains policy instance ID.").isTrue(); url = "/policy?id=" + policyInstanceId; rsp = restClient().get(url).block(); @@ -358,7 +358,7 @@ public class ApplicationTest { * * @throws ServiceException */ - public void testErrorFromRIC() throws ServiceException { + void testErrorFromRIC() throws ServiceException { putService("service1"); addPolicyType("type1", "ric1"); @@ -392,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"); @@ -400,14 +400,14 @@ public class ApplicationTest { String rsp = restClient().get("/policies").block(); List info = parseList(rsp, PolicyInfo.class); - assertThat(info).size().isEqualTo(1); + assertThat(info.size()).isEqualTo(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).isEqualTo(""); } @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"); @@ -421,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"); { @@ -435,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); @@ -450,7 +450,7 @@ public class ApplicationTest { } @Test - public void testGetPolicySchemas() throws Exception { + void testGetPolicySchemas() throws Exception { addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); @@ -474,7 +474,7 @@ public class ApplicationTest { } @Test - public void testGetPolicySchema() throws Exception { + void testGetPolicySchema() throws Exception { addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); @@ -490,7 +490,7 @@ public class ApplicationTest { } @Test - public void testGetPolicyTypes() throws Exception { + void testGetPolicyTypes() throws Exception { addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); @@ -508,7 +508,7 @@ public class ApplicationTest { } @Test - public void testGetPolicies() throws Exception { + void testGetPolicies() throws Exception { addPolicy("id1", "type1", "service1"); String url = "/policies"; @@ -524,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"); @@ -553,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"); @@ -579,10 +579,11 @@ public class ApplicationTest { } @Test - public void testPutAndGetService() throws Exception { + 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"; @@ -591,12 +592,12 @@ public class ApplicationTest { assertThat(info.size()).isEqualTo(1); ServiceStatus status = info.iterator().next(); assertThat(status.keepAliveIntervalSeconds).isEqualTo(0); - assertThat(status.serviceName).isEqualTo("name"); + assertThat(status.serviceName).isEqualTo(serviceName); // GET (all) url = "/services"; rsp = restClient().get(url).block(); - assertThat(rsp.contains("name")).isTrue(); + assertThat(rsp.contains(serviceName)).as("Response contains service name").isTrue(); logger.info(rsp); // Keep alive @@ -610,22 +611,22 @@ public class ApplicationTest { restClient().delete(url).block(); assertThat(services.size()).isEqualTo(0); - // 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); } @Test - public void testServiceSupervision() throws Exception { + void testServiceSupervision() throws Exception { putService("service1", 1, HttpStatus.CREATED); addPolicyType("type1", "ric1"); @@ -642,13 +643,13 @@ public class ApplicationTest { } @Test - public void testGetPolicyStatus() throws Exception { + void testGetPolicyStatus() throws Exception { addPolicy("id", "typeName", "service1", "ric1"); assertThat(policies.size()).isEqualTo(1); 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 +658,7 @@ public 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 +667,8 @@ public 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 { @@ -707,7 +708,7 @@ public class ApplicationTest { } @Test - public void testConcurrency() throws Exception { + void testConcurrency() throws Exception { final Instant startTime = Instant.now(); List threads = new ArrayList<>(); a1ClientFactory.setResponseDelay(Duration.ofMillis(1)); @@ -716,11 +717,11 @@ public class ApplicationTest { addPolicyType("type2", "ric"); for (int i = 0; i < 10; ++i) { - Thread t = + Thread thread = new Thread(new ConcurrencyTestRunnable(baseUrl(), supervision, a1ClientFactory, rics, policyTypes), "TestThread_" + i); - t.start(); - threads.add(t); + thread.start(); + threads.add(thread); } for (Thread t : threads) { t.join(); @@ -755,11 +756,11 @@ public 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 +810,8 @@ public 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; }