Merge "Version Up & Removed unncessary properties"

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

diff --git a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSupervisionTest.java b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSupervisionTest.java
index 3f8dd06..5ac4cb0 100644 (file)
--- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSupervisionTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSupervisionTest.java
@@ -56,7 +56,7 @@ import org.oransc.policyagent.repository.Rics;
 import reactor.core.publisher.Mono;
 
 @ExtendWith(MockitoExtension.class)
-public class RicSupervisionTest {
+class RicSupervisionTest {
     private static final String POLICY_TYPE_1_NAME = "type1";
     private static final PolicyType POLICY_TYPE_1 = ImmutablePolicyType.builder() //
         .name(POLICY_TYPE_1_NAME) //
@@ -78,6 +78,7 @@ public class RicSupervisionTest {
         .ric(RIC_1) //
         .type(POLICY_TYPE_1) //
         .lastModified("now") //
+        .isTransient(false) //
         .build();
 
     private static final Policy POLICY_2 = ImmutablePolicy.builder() //
@@ -87,6 +88,7 @@ public class RicSupervisionTest {
         .ric(RIC_1) //
         .type(POLICY_TYPE_1) //
         .lastModified("now") //
+        .isTransient(false) //
         .build();
 
     @Mock
@@ -103,17 +105,16 @@ public class RicSupervisionTest {
     private Rics rics = new Rics();
 
     @BeforeEach
-    public void init() {
-        doReturn(Mono.just(a1ClientMock)).when(a1ClientFactory).createA1Client(any(Ric.class));
+    void init() {
         types.clear();
         policies.clear();
         rics.clear();
-        RIC_1.setState(RicState.UNDEFINED);
+        RIC_1.setState(RicState.UNAVAILABLE);
         RIC_1.clearSupportedPolicyTypes();
     }
 
     @AfterEach
-    public void verifyNoRicLocks() {
+    void verifyNoRicLocks() {
         for (Ric ric : this.rics.getRics()) {
             ric.getLock().lockBlocking(LockType.EXCLUSIVE);
             ric.getLock().unlockBlocking();
@@ -122,8 +123,9 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicIdleAndNoChangedPoliciesOrPolicyTypes_thenNoSynchronization() {
-        RIC_1.setState(RicState.IDLE);
+    void whenRicIdleAndNoChangedPoliciesOrPolicyTypes_thenNoSynchronization() {
+        doReturn(Mono.just(a1ClientMock)).when(a1ClientFactory).createA1Client(any(Ric.class));
+        RIC_1.setState(RicState.AVAILABLE);
         RIC_1.addSupportedPolicyType(POLICY_TYPE_1);
         rics.put(RIC_1);
 
@@ -143,8 +145,9 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicUndefined_thenSynchronization() {
-        RIC_1.setState(RicState.UNDEFINED);
+    void whenRicUndefined_thenSynchronization() {
+        doReturn(Mono.just(a1ClientMock)).when(a1ClientFactory).createA1Client(any(Ric.class));
+        RIC_1.setState(RicState.UNAVAILABLE);
         rics.put(RIC_1);
 
         RicSupervision supervisorUnderTest = spy(new RicSupervision(rics, policies, a1ClientFactory, types, null));
@@ -160,7 +163,8 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicSynchronizing_thenNoSynchronization() {
+    void whenRicSynchronizing_thenNoSynchronization() {
+        doReturn(Mono.just(a1ClientMock)).when(a1ClientFactory).createA1Client(any(Ric.class));
         RIC_1.setState(RicState.SYNCHRONIZING);
         rics.put(RIC_1);
 
@@ -173,8 +177,9 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicIdleAndErrorGettingPolicyIdentities_thenNoSynchronization() {
-        RIC_1.setState(RicState.IDLE);
+    void whenRicIdleAndErrorGettingPolicyIdentities_thenNoSynchronization() {
+        doReturn(Mono.just(a1ClientMock)).when(a1ClientFactory).createA1Client(any(Ric.class));
+        RIC_1.setState(RicState.AVAILABLE);
         RIC_1.addSupportedPolicyType(POLICY_TYPE_1);
         rics.put(RIC_1);
 
@@ -185,11 +190,13 @@ public class RicSupervisionTest {
 
         verify(supervisorUnderTest).checkAllRics();
         verifyNoMoreInteractions(supervisorUnderTest);
+        assertThat(RIC_1.getState()).isEqualTo(RicState.UNAVAILABLE);
     }
 
     @Test
-    public void whenRicIdleAndNotSameAmountOfPolicies_thenSynchronization() {
-        RIC_1.setState(RicState.IDLE);
+    void whenRicIdleAndNotSameAmountOfPolicies_thenSynchronization() {
+        doReturn(Mono.just(a1ClientMock)).when(a1ClientFactory).createA1Client(any(Ric.class));
+        RIC_1.setState(RicState.AVAILABLE);
         rics.put(RIC_1);
 
         policies.put(POLICY_1);
@@ -210,8 +217,9 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicIdleAndSameAmountOfPoliciesButNotSamePolicies_thenSynchronization() {
-        RIC_1.setState(RicState.IDLE);
+    void whenRicIdleAndSameAmountOfPoliciesButNotSamePolicies_thenSynchronization() {
+        doReturn(Mono.just(a1ClientMock)).when(a1ClientFactory).createA1Client(any(Ric.class));
+        RIC_1.setState(RicState.AVAILABLE);
         rics.put(RIC_1);
 
         policies.put(POLICY_1);
@@ -232,8 +240,9 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicIdleAndErrorGettingPolicyTypes_thenNoSynchronization() {
-        RIC_1.setState(RicState.IDLE);
+    void whenRicIdleAndErrorGettingPolicyTypes_thenNoSynchronization() {
+        doReturn(Mono.just(a1ClientMock)).when(a1ClientFactory).createA1Client(any(Ric.class));
+        RIC_1.setState(RicState.AVAILABLE);
         RIC_1.addSupportedPolicyType(POLICY_TYPE_1);
         rics.put(RIC_1);
 
@@ -248,8 +257,9 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicIdleAndNotSameAmountOfPolicyTypes_thenSynchronization() {
-        RIC_1.setState(RicState.IDLE);
+    void whenRicIdleAndNotSameAmountOfPolicyTypes_thenSynchronization() {
+        doReturn(Mono.just(a1ClientMock)).when(a1ClientFactory).createA1Client(any(Ric.class));
+        RIC_1.setState(RicState.AVAILABLE);
         RIC_1.addSupportedPolicyType(POLICY_TYPE_1);
         rics.put(RIC_1);
 
@@ -271,13 +281,14 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicIdleAndSameAmountOfPolicyTypesButNotSameTypes_thenSynchronization() {
+    void whenRicIdleAndSameAmountOfPolicyTypesButNotSameTypes_thenSynchronization() {
+        doReturn(Mono.just(a1ClientMock)).when(a1ClientFactory).createA1Client(any(Ric.class));
         PolicyType policyType2 = ImmutablePolicyType.builder() //
             .name("policyType2") //
             .schema("") //
             .build();
 
-        RIC_1.setState(RicState.IDLE);
+        RIC_1.setState(RicState.AVAILABLE);
         RIC_1.addSupportedPolicyType(POLICY_TYPE_1);
         RIC_1.addSupportedPolicyType(policyType2);
         rics.put(RIC_1);