aboutsummaryrefslogtreecommitdiffstats
path: root/a1-policy-management/src/test
diff options
context:
space:
mode:
authorraviteja.karumuri <raviteja.karumuri@est.tech>2024-09-02 10:46:34 +0100
committerRAVITEJA KARUMURI <raviteja.karumuri@est.tech>2024-09-04 12:38:34 +0000
commitacfaa81c9975f6c67b6b7043aa598e31ba4b1f12 (patch)
treec764bfb7c997bd8cc0d8aec9b169020b0b8a6695 /a1-policy-management/src/test
parentbfc1bfe8e02f6e89b6bc8b2a22f40d24d6f94666 (diff)
Improve tests/issues found in Sonar report - A1 Oslo/NewDelhi/Montreal/London-Part 4-master
Issue-ID: CCSDK-4037 Change-Id: I8baa1d36ca50c7264f6aebcc176370f90bf06c80 Signed-off-by: Raviteja Karumuri <raviteja.karumuri@est.tech>
Diffstat (limited to 'a1-policy-management/src/test')
-rw-r--r--a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java9
-rw-r--r--a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ConcurrencyTestRunnable.java7
-rw-r--r--a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/ConfigurationControllerV3Test.java2
-rw-r--r--a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/PolicyControllerV3Test.java2
-rw-r--r--a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/RicRepositoryControllerV3Test.java4
-rw-r--r--a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/ServiceControllerV3Test.java8
-rw-r--r--a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/service/v3/PolicyServiceTest.java87
7 files changed, 45 insertions, 74 deletions
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java
index 3a7bc799..5ed8642a 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java
@@ -231,7 +231,7 @@ class ApplicationTest {
@Test
@DisplayName("test ZZ Actuator")
- void testZZActuator() throws Exception {
+ void testZZActuator() {
// The test must be run last, hence the "ZZ" in the name. All succeeding tests
// will fail.
AsyncRestClient client = restClient(baseUrl(), false);
@@ -479,12 +479,8 @@ class ApplicationTest {
private String putPolicyBody(String serviceName, String ricId, String policyTypeName, String policyInstanceId,
boolean isTransient, String statusNotificationUri) throws JsonProcessingException {
- PolicyInfo policyInfo = new PolicyInfo();
- policyInfo.setPolicyId(policyInstanceId);
- policyInfo.setPolicytypeId(policyTypeName);
- policyInfo.setRicId(ricId);
+ PolicyInfo policyInfo = new PolicyInfo(ricId, policyInstanceId, jsonString(), policyTypeName);
policyInfo.setServiceId(serviceName);
- policyInfo.setPolicyData(jsonString());
policyInfo.setTransient(isTransient);
policyInfo.setStatusNotificationUri(statusNotificationUri);
return objectMapper.writeValueAsString(policyInfo);
@@ -722,7 +718,6 @@ class ApplicationTest {
Policy policy = addPolicy("id", "typeName", "service1", "ric1");
{
String response = restClient().get(url).block();
- PolicyInfo policyInfo = objectMapper.readValue(response, PolicyInfo.class);
String expectedResponse = "{\"ric_id\":\"ric1\",\"service_id\":\"service1\",\"policy_id\":\"id\",\"policy_data\":{\"servingCellNrcgi\":\"1\"},\"status_notification_uri\":\"/policy-status?id=XXX\",\"policytype_id\":\"typeName\",\"transient\":false}";
assertEquals(objectMapper.readTree(expectedResponse), objectMapper.readTree(response));
}
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ConcurrencyTestRunnable.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ConcurrencyTestRunnable.java
index a42d034a..3c7051d5 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ConcurrencyTestRunnable.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ConcurrencyTestRunnable.java
@@ -43,7 +43,6 @@ import org.onap.ccsdk.oran.a1policymanagementservice.utils.MockA1Client;
import org.onap.ccsdk.oran.a1policymanagementservice.utils.MockA1ClientFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
/**
@@ -157,12 +156,8 @@ class ConcurrencyTestRunnable implements Runnable {
private String putPolicyBody(String serviceName, String ricId, String policyTypeName, String policyInstanceId,
boolean isTransient) throws JsonProcessingException {
- PolicyInfo policyInfo = new PolicyInfo();
- policyInfo.setPolicyId(policyInstanceId);
- policyInfo.setPolicytypeId(policyTypeName);
- policyInfo.setRicId(ricId);
+ PolicyInfo policyInfo = new PolicyInfo(ricId, policyInstanceId, policyData(), policyTypeName);
policyInfo.setServiceId(serviceName);
- policyInfo.setPolicyData(policyData());
policyInfo.setStatusNotificationUri("/status");
policyInfo.setTransient(isTransient);
return objectMapper.writeValueAsString(policyInfo);
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/ConfigurationControllerV3Test.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/ConfigurationControllerV3Test.java
index 40990f62..1f0ea5d0 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/ConfigurationControllerV3Test.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/ConfigurationControllerV3Test.java
@@ -120,7 +120,7 @@ class ConfigurationControllerV3Test {
}
@Test
- public void testHealthCheck() {
+ void testHealthCheck() {
Mono<ResponseEntity<String>> responseHealthCheckMono = testHelper.restClientV3().getForEntity("/status");
testHelper.testSuccessResponse(responseHealthCheckMono, HttpStatus.OK, responseBody -> responseBody.contains("status"));
}
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/PolicyControllerV3Test.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/PolicyControllerV3Test.java
index 211a9a39..14604542 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/PolicyControllerV3Test.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/PolicyControllerV3Test.java
@@ -230,7 +230,7 @@ class PolicyControllerV3Test {
}
@Test
- public void testGetPolicyTypesNoRicFound() throws Exception{
+ void testGetPolicyTypesNoRicFound() throws Exception{
String policyTypeName = "type1_1.2.3";
String nonRtRicId = "ricOne";
testHelper.addPolicyType(policyTypeName, nonRtRicId);
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/RicRepositoryControllerV3Test.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/RicRepositoryControllerV3Test.java
index 5f97df0e..63b61665 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/RicRepositoryControllerV3Test.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/RicRepositoryControllerV3Test.java
@@ -103,7 +103,7 @@ class RicRepositoryControllerV3Test {
}
@Test
- public void testGetRic() throws IOException {
+ void testGetRic() throws IOException {
testHelper.addPolicyType("1", "ricAdded");
Mono<ResponseEntity<String>> responseEntityMono = testHelper.restClientV3().getForEntity("/rics/ric?ricId=ricAdded");
testHelper.testSuccessResponse(responseEntityMono, HttpStatus.OK, responseBody -> responseBody
@@ -111,7 +111,7 @@ class RicRepositoryControllerV3Test {
}
@Test
- public void testGetRics() throws IOException {
+ void testGetRics() throws IOException {
testHelper.addPolicyType("1", "ricAddedOne");
testHelper.addPolicyType("2", "ricAddedTwo");
Mono<ResponseEntity<String>> responseEntityMono = testHelper.restClientV3().getForEntity("/rics");
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/ServiceControllerV3Test.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/ServiceControllerV3Test.java
index bfc0b683..426cf6ed 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/ServiceControllerV3Test.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v3/ServiceControllerV3Test.java
@@ -109,7 +109,7 @@ class ServiceControllerV3Test {
}
@Test
- public void testPutService() {
+ void testPutService() {
ServiceRegistrationInfo serviceRegistrationInfo = new ServiceRegistrationInfo("serviceId");
serviceRegistrationInfo.callbackUrl("http://callback.com/").keepAliveIntervalSeconds(10L);
Mono<ResponseEntity<String>> responseEntityMono = testHelper.restClientV3()
@@ -118,7 +118,7 @@ class ServiceControllerV3Test {
}
@Test
- public void testGetService() {
+ void testGetService() {
services.put(new Service("newServiceId", Duration.ofSeconds(10L), "http://callback.com/"));
Mono<ResponseEntity<String>> responseEntityMono = testHelper.restClientV3().getForEntity("/services");
testHelper.testSuccessResponse(responseEntityMono, HttpStatus.OK, responseBoy -> responseBoy
@@ -126,14 +126,14 @@ class ServiceControllerV3Test {
}
@Test
- public void testDeleteService() {
+ void testDeleteService() {
services.put(new Service("newServiceId", Duration.ofSeconds(10L), "http://callback.com/"));
Mono<ResponseEntity<String>> responseEntityMono = testHelper.restClientV3().deleteForEntity("/services/newServiceId");
testHelper.testSuccessResponse(responseEntityMono, HttpStatus.NO_CONTENT, responseBody -> services.size() == 0);
}
@Test
- public void testKeepAliveService() {
+ void testKeepAliveService() {
services.put(new Service("newServiceId", Duration.ofSeconds(10L), "http://callback.com/"));
Mono<ResponseEntity<String>> responseEntityMono = testHelper.restClientV3().putForEntity("/services/newServiceId/keepalive", "");
testHelper.testSuccessResponse(responseEntityMono, HttpStatus.OK, responseBody -> services.size() == 1);
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/service/v3/PolicyServiceTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/service/v3/PolicyServiceTest.java
index 7b550e3a..2e483338 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/service/v3/PolicyServiceTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/service/v3/PolicyServiceTest.java
@@ -23,6 +23,8 @@ package org.onap.ccsdk.oran.a1policymanagementservice.service.v3;
import com.google.gson.Gson;
import com.google.gson.JsonParser;
import org.junit.jupiter.api.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
import org.mockito.Mockito;
import org.onap.ccsdk.oran.a1policymanagementservice.config.TestConfig;
import org.onap.ccsdk.oran.a1policymanagementservice.exceptions.EntityNotFoundException;
@@ -70,7 +72,7 @@ import static org.mockito.Mockito.when;
@TestPropertySource(properties = { //
"app.vardata-directory=/tmp/pmstestv3", //
})
-public class PolicyServiceTest {
+class PolicyServiceTest {
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -114,7 +116,7 @@ public class PolicyServiceTest {
}
@Test
- public void testPolicyAlreadyCreatedTrue() throws Exception{
+ void testPolicyAlreadyCreatedTrue() throws Exception{
String policyTypeName = "uri_type_123";
String nonRtRicId = "Ric_347";
@@ -130,7 +132,7 @@ public class PolicyServiceTest {
}
@Test
- public void testPolicyNotAuthorizedFail() throws IOException {
+ void testPolicyNotAuthorizedFail() throws IOException {
String policyTypeName = "uri_type_123";
String nonRtRicId = "Ric_347";
@@ -144,7 +146,7 @@ public class PolicyServiceTest {
}
@Test
- public void testDeletePolicySuccess() throws Exception {
+ void testDeletePolicySuccess() throws Exception {
String policyTypeName = "uri_type_123";
String nonRtRicId = "Ric_347";
@@ -161,14 +163,14 @@ public class PolicyServiceTest {
}
@Test
- public void testDeletePolicyThrowsException() throws Exception {
+ void testDeletePolicyThrowsException() {
ServerWebExchange serverWebExchange = Mockito.mock(DefaultServerWebExchange.class);
assertThrows(EntityNotFoundException.class, () -> policyService.deletePolicyService("dummyPolicyID", serverWebExchange));
}
@Test
- public void testPutPolicy() throws Exception {
+ void testPutPolicy() throws Exception {
String policyTypeName = "uri_type_123";
String nonRtRicId = "Ric_347";
@@ -199,79 +201,58 @@ public class PolicyServiceTest {
});
}
- @Test
- public void testGetPolicyTypes() throws Exception {
+ @ParameterizedTest
+ @CsvSource({
+ ", , ",
+ ", uri_type, ",
+ "Ric_347, uri_type,"
+ })
+ @DisplayName("testGetPolicyTypes & testGetPolicyTypesMatchedTypeName & testGetPolicyTypesMatchedTypeNameWithRic")
+ void testGetPolicyTypes(String nearRtRicID, String typeName, String compatibleWithVersion) throws Exception {
String policyTypeName = "uri_type_123";
String nonRtRicId = "Ric_347";
testHelper.addPolicyType(policyTypeName, nonRtRicId);
- ServerWebExchange serverWebExchange = Mockito.mock(DefaultServerWebExchange.class);
when(helper.toPolicyTypeInfoCollection(any(), any())).thenCallRealMethod();
- Mono<ResponseEntity<Flux<PolicyTypeInformation>>> responseEntityMono = policyService.getPolicyTypesService(null, null,null, serverWebExchange);
+ Mono<ResponseEntity<Flux<PolicyTypeInformation>>> responseEntityMono =
+ policyService.getPolicyTypesService(nearRtRicID, typeName, compatibleWithVersion);
testHelper.testSuccessResponse(responseEntityMono, HttpStatus.OK, responseBody -> responseBody.toStream().count() == 1);
}
@Test
- public void testGetPolicyTypesEmpty() throws Exception {
- ServerWebExchange serverWebExchange = Mockito.mock(DefaultServerWebExchange.class);
+ void testGetPolicyTypesEmpty() throws Exception {
when(helper.toPolicyTypeInfoCollection(any(), any())).thenCallRealMethod();
- Mono<ResponseEntity<Flux<PolicyTypeInformation>>> responseEntityMono = policyService.getPolicyTypesService(null, null, null, serverWebExchange);
- testHelper.testSuccessResponse(responseEntityMono, HttpStatus.OK, responseBody -> responseBody.toStream().count() == 0);
+ Mono<ResponseEntity<Flux<PolicyTypeInformation>>> responseEntityMono = policyService.getPolicyTypesService(null, null, null);
+ testHelper.testSuccessResponse(responseEntityMono, HttpStatus.OK, responseBody -> responseBody.toStream().findAny().isEmpty());
}
@Test
- public void testGetPolicyTypesNoRic() {
- ServerWebExchange serverWebExchange = Mockito.mock(DefaultServerWebExchange.class);
- assertThrows(EntityNotFoundException.class, () -> policyService.getPolicyTypesService("NoRic", "","", serverWebExchange));
+ void testGetPolicyTypesNoRic() {
+ assertThrows(EntityNotFoundException.class, () -> policyService.getPolicyTypesService("NoRic", "",""));
}
@Test
- public void testGetPolicyTypesNoMatchedTypeName() throws Exception {
+ void testGetPolicyTypesNoMatchedTypeName() throws Exception {
String policyTypeName = "uri_type_123";
String nonRtRicId = "Ric_347";
testHelper.addPolicyType(policyTypeName, nonRtRicId);
when(helper.toPolicyTypeInfoCollection(any(), any())).thenCallRealMethod();
- ServerWebExchange serverWebExchange = Mockito.mock(DefaultServerWebExchange.class);
- Mono<ResponseEntity<Flux<PolicyTypeInformation>>> responseEntityMono = policyService.getPolicyTypesService("", "noTypeName", null, serverWebExchange);
+ Mono<ResponseEntity<Flux<PolicyTypeInformation>>> responseEntityMono = policyService.getPolicyTypesService("", "noTypeName", null);
testHelper.testSuccessResponse(responseEntityMono, HttpStatus.OK, responseBody -> responseBody.toStream().findAny().isEmpty());
}
@Test
- public void testGetPolicyTypesNoMatchedTypeNameWithRic() throws Exception {
+ void testGetPolicyTypesNoMatchedTypeNameWithRic() throws Exception {
String policyTypeName = "uri_type_123";
String nonRtRicId = "Ric_347";
testHelper.addPolicyType(policyTypeName, nonRtRicId);
when(helper.toPolicyTypeInfoCollection(any(), any())).thenCallRealMethod();
- ServerWebExchange serverWebExchange = Mockito.mock(DefaultServerWebExchange.class);
- Mono<ResponseEntity<Flux<PolicyTypeInformation>>> responseEntityMono = policyService.getPolicyTypesService("Ric_347", "noTypeName", null, serverWebExchange);
+ Mono<ResponseEntity<Flux<PolicyTypeInformation>>> responseEntityMono = policyService.getPolicyTypesService("Ric_347", "noTypeName", null);
testHelper.testSuccessResponse(responseEntityMono, HttpStatus.OK, responseBody -> responseBody.toStream().findAny().isEmpty());
}
@Test
- public void testGetPolicyTypesMatchedTypeName() throws Exception {
- String policyTypeName = "uri_type_123";
- String nonRtRicId = "Ric_347";
- testHelper.addPolicyType(policyTypeName, nonRtRicId);
- when(helper.toPolicyTypeInfoCollection(any(), any())).thenCallRealMethod();
- ServerWebExchange serverWebExchange = Mockito.mock(DefaultServerWebExchange.class);
- Mono<ResponseEntity<Flux<PolicyTypeInformation>>> responseEntityMono = policyService.getPolicyTypesService(null, "uri_type", null, serverWebExchange);
- testHelper.testSuccessResponse(responseEntityMono, HttpStatus.OK, responseBody -> responseBody.toStream().count() == 1);
- }
-
- @Test
- public void testGetPolicyTypesMatchedTypeNameWithRic() throws Exception {
- String policyTypeName = "uri_type_123";
- String nonRtRicId = "Ric_347";
- testHelper.addPolicyType(policyTypeName, nonRtRicId);
- ServerWebExchange serverWebExchange = Mockito.mock(DefaultServerWebExchange.class);
- when(helper.toPolicyTypeInfoCollection(any(), any())).thenCallRealMethod();
- Mono<ResponseEntity<Flux<PolicyTypeInformation>>> responseEntityMono = policyService
- .getPolicyTypesService("Ric_347", "uri_type", null, serverWebExchange);
- testHelper.testSuccessResponse(responseEntityMono, HttpStatus.OK, responseBody -> responseBody.toStream().count() == 1);
- }
-
- @Test
- public void testGetPolicyIds() throws Exception {
+ void testGetPolicyIds() throws Exception {
String policyTypeName = "uri_type_123";
String nonRtRicId = "Ric_347";
testHelper.addPolicyType(policyTypeName, nonRtRicId);
@@ -289,7 +270,7 @@ public class PolicyServiceTest {
}
@Test
- public void testGetPolicyIdsNoRic() throws Exception {
+ void testGetPolicyIdsNoRic() throws Exception {
testHelper.addPolicyType("uri_type_123", "Ric_347");
ServerWebExchange serverWebExchange = Mockito.mock(DefaultServerWebExchange.class);
EntityNotFoundException exception = assertThrows(EntityNotFoundException.class, () -> policyService
@@ -298,7 +279,7 @@ public class PolicyServiceTest {
}
@Test
- public void testGetPolicyIdsNoPolicyType() {
+ void testGetPolicyIdsNoPolicyType() {
ServerWebExchange serverWebExchange = Mockito.mock(DefaultServerWebExchange.class);
EntityNotFoundException exception = assertThrows(EntityNotFoundException.class, () -> policyService
.getPolicyIdsService("noPolicyType", "noRic", "", "", serverWebExchange));
@@ -306,7 +287,7 @@ public class PolicyServiceTest {
}
@Test
- public void testGetPolicyService() throws Exception {
+ void testGetPolicyService() throws Exception {
String policyTypeName = "uri_type_123";
String nonRtRicId = "Ric_347";
testHelper.addPolicyType(policyTypeName, nonRtRicId);
@@ -323,7 +304,7 @@ public class PolicyServiceTest {
}
@Test
- public void testGetPolicyServiceNoPolicy() throws Exception {
+ void testGetPolicyServiceNoPolicy() {
ServerWebExchange serverWebExchange = Mockito.mock(DefaultServerWebExchange.class);
EntityNotFoundException exception = assertThrows(EntityNotFoundException.class, () -> policyService
.getPolicyService("NoPolicy", serverWebExchange));
@@ -331,7 +312,7 @@ public class PolicyServiceTest {
}
@Test
- public void testGetPolicyTypeService() throws Exception {
+ void testGetPolicyTypeService() throws Exception {
String policyTypeName = "uri_type_123";
String nonRtRicId = "Ric_347";
PolicyType addedPolicyType = testHelper.addPolicyType(policyTypeName, nonRtRicId);
@@ -344,7 +325,7 @@ public class PolicyServiceTest {
}
@Test
- public void testGetPolicyTypeServiceNoPolicyType() {
+ void testGetPolicyTypeServiceNoPolicyType() {
EntityNotFoundException exception = assertThrows(EntityNotFoundException.class, () -> policyService
.getPolicyTypeDefinitionService("NoPolicyType"));
assertEquals("PolicyType not found with ID: NoPolicyType", exception.getMessage());