Merge "Remove Sonar issues"

[nonrtric.git] / policy-agent / src / test / java / org / oransc / policyagent / tasks / RicSynchronizationTaskTest.java

diff --git a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java
index c8ebe27..6667029 100644 (file)
--- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java
@@ -65,7 +65,7 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 @ExtendWith(MockitoExtension.class)
-public class RicSynchronizationTaskTest {
+class RicSynchronizationTaskTest {
     private static final String POLICY_TYPE_1_NAME = "type1";
     private static final PolicyType POLICY_TYPE_1 = ImmutablePolicyType.builder() //
         .name(POLICY_TYPE_1_NAME) //
@@ -80,9 +80,9 @@ public class RicSynchronizationTaskTest {
         .controllerName("controllerName") //
         .build());
 
-    private static Policy createPolicy(boolean isTransient) {
+    private static Policy createPolicy(String policyId, boolean isTransient) {
         return ImmutablePolicy.builder() //
-            .id("policyId1") //
+            .id(policyId) //
             .json("") //
             .ownerServiceName("service") //
             .ric(RIC_1) //
@@ -92,7 +92,7 @@ public class RicSynchronizationTaskTest {
             .build();
     }
 
-    private static final Policy POLICY_1 = createPolicy(false);
+    private static final Policy POLICY_1 = createPolicy("policyId1", false);
 
     private static final String SERVICE_1_NAME = "service1";
     private static final String SERVICE_1_CALLBACK_URL = "callbackUrl";
@@ -109,7 +109,7 @@ public class RicSynchronizationTaskTest {
     private Services services;
 
     @BeforeEach
-    public void init() {
+    void init() {
         policyTypes = new PolicyTypes();
         policies = new Policies();
         services = new Services();
@@ -118,7 +118,7 @@ public class RicSynchronizationTaskTest {
     }
 
     @Test
-    public void ricAlreadySynchronizing_thenNoSynchronization() {
+    void ricAlreadySynchronizing_thenNoSynchronization() {
         RIC_1.setState(RicState.SYNCHRONIZING);
         RIC_1.addSupportedPolicyType(POLICY_TYPE_1);
 
@@ -135,11 +135,11 @@ public class RicSynchronizationTaskTest {
         assertThat(policyTypes.size()).isEqualTo(1);
         assertThat(policies.size()).isEqualTo(1);
         assertThat(RIC_1.getState()).isEqualTo(RicState.SYNCHRONIZING);
-        assertThat(RIC_1.getSupportedPolicyTypeNames().size()).isEqualTo(1);
+        assertThat(RIC_1.getSupportedPolicyTypeNames()).hasSize(1);
     }
 
     @Test
-    public void ricIdlePolicyTypeInRepo_thenSynchronizationWithReuseOfTypeFromRepoAndCorrectServiceNotified() {
+    void ricIdlePolicyTypeInRepo_thenSynchronizationWithReuseOfTypeFromRepoAndCorrectServiceNotified() {
         RIC_1.setState(RicState.AVAILABLE);
 
         policyTypes.put(POLICY_TYPE_1);
@@ -170,12 +170,12 @@ public class RicSynchronizationTaskTest {
         verifyNoMoreInteractions(restClientMock);
 
         assertThat(policyTypes.size()).isEqualTo(1);
-        assertThat(policies.size()).isEqualTo(0);
+        assertThat(policies.size()).isZero();
         assertThat(RIC_1.getState()).isEqualTo(RicState.AVAILABLE);
     }
 
     @Test
-    public void ricIdlePolicyTypeNotInRepo_thenSynchronizationWithTypeFromRic() throws Exception {
+    void ricIdlePolicyTypeNotInRepo_thenSynchronizationWithTypeFromRic() throws Exception {
         RIC_1.setState(RicState.AVAILABLE);
 
         setUpCreationOfA1Client();
@@ -193,15 +193,15 @@ public class RicSynchronizationTaskTest {
 
         assertThat(policyTypes.size()).isEqualTo(1);
         assertThat(policyTypes.getType(POLICY_TYPE_1_NAME).schema()).isEqualTo(typeSchema);
-        assertThat(policies.size()).isEqualTo(0);
+        assertThat(policies.size()).isZero();
         assertThat(RIC_1.getState()).isEqualTo(RicState.AVAILABLE);
     }
 
     @Test
-    public void ricIdleAndHavePolicies_thenSynchronizationWithRecreationOfPolicies() {
+    void ricIdleAndHavePolicies_thenSynchronizationWithRecreationOfPolicies() {
         RIC_1.setState(RicState.AVAILABLE);
 
-        Policy transientPolicy = createPolicy(true);
+        Policy transientPolicy = createPolicy("transientPolicyId", true);
 
         policies.put(transientPolicy);
         policies.put(POLICY_1);
@@ -221,13 +221,13 @@ public class RicSynchronizationTaskTest {
         verify(a1ClientMock).putPolicy(POLICY_1);
         verifyNoMoreInteractions(a1ClientMock);
 
-        assertThat(policyTypes.size()).isEqualTo(0);
+        assertThat(policyTypes.size()).isZero();
         assertThat(policies.size()).isEqualTo(1); // The transient policy shall be deleted
         assertThat(RIC_1.getState()).isEqualTo(RicState.AVAILABLE);
     }
 
     @Test
-    public void ricIdleAndErrorDeletingPoliciesFirstTime_thenSynchronizationWithDeletionOfPolicies() {
+    void ricIdleAndErrorDeletingPoliciesFirstTime_thenSynchronizationWithDeletionOfPolicies() {
         RIC_1.setState(RicState.AVAILABLE);
 
         policies.put(POLICY_1);
@@ -247,13 +247,13 @@ public class RicSynchronizationTaskTest {
         verify(a1ClientMock, times(2)).deleteAllPolicies();
         verifyNoMoreInteractions(a1ClientMock);
 
-        assertThat(policyTypes.size()).isEqualTo(0);
-        assertThat(policies.size()).isEqualTo(0);
+        assertThat(policyTypes.size()).isZero();
+        assertThat(policies.size()).isZero();
         assertThat(RIC_1.getState()).isEqualTo(RicState.AVAILABLE);
     }
 
     @Test
-    public void ricIdleAndErrorDeletingPoliciesAllTheTime_thenSynchronizationWithFailedRecovery() {
+    void ricIdleAndErrorDeletingPoliciesAllTheTime_thenSynchronizationWithFailedRecovery() {
         RIC_1.setState(RicState.AVAILABLE);
 
         policies.put(POLICY_1);
@@ -278,13 +278,13 @@ public class RicSynchronizationTaskTest {
         verify(a1ClientMock, times(2)).deleteAllPolicies();
         verifyNoMoreInteractions(a1ClientMock);
 
-        assertThat(policyTypes.size()).isEqualTo(0);
-        assertThat(policies.size()).isEqualTo(0);
+        assertThat(policyTypes.size()).isZero();
+        assertThat(policies.size()).isZero();
         assertThat(RIC_1.getState()).isEqualTo(RicState.UNAVAILABLE);
     }
 
     @Test
-    public void ricIdlePolicyTypeInRepo_thenSynchronizationWithErrorOnServiceNotificationErrorLogged() {
+    void ricIdlePolicyTypeInRepo_thenSynchronizationWithErrorOnServiceNotificationErrorLogged() {
         RIC_1.setState(RicState.AVAILABLE);
 
         policyTypes.put(POLICY_TYPE_1);
@@ -308,7 +308,8 @@ public class RicSynchronizationTaskTest {
 
         ILoggingEvent loggingEvent = logAppender.list.get(0);
         assertThat(loggingEvent.getLevel()).isEqualTo(WARN);
-        verifyCorrectLogMessage(0, logAppender, "Service notification failed for service: " + SERVICE_1_NAME);
+        verifyCorrectLogMessage(0, logAppender,
+            "Service notification failed for service: " + SERVICE_1_NAME + ". Cause: " + originalErrorMessage);
     }
 
     private void setUpCreationOfA1Client() {
@@ -333,6 +334,6 @@ public class RicSynchronizationTaskTest {
     private void verifyCorrectLogMessage(int messageIndex, ListAppender<ILoggingEvent> logAppender,
         String expectedMessage) {
         ILoggingEvent loggingEvent = logAppender.list.get(messageIndex);
-        assertThat(loggingEvent.toString().contains(expectedMessage)).isTrue();
+        assertThat(loggingEvent.getFormattedMessage()).isEqualTo(expectedMessage);
     }
 }