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=d78155d4481160ff9d64582ffe2f0cd97218ea8e;hb=f694dec2ff16069e6bb5c9de845278f44e8c9591;hp=365d418a5560bbf9e412ed4a4a9cff0cc171160f;hpb=b47a7130c10bef2bf812366ca971e4eaa938b152;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 365d418a..d78155d4 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
@@ -29,7 +29,6 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 
 import java.net.URL;
-import java.util.Collection;
 import java.util.List;
 import java.util.Vector;
 
@@ -52,6 +51,7 @@ import org.oransc.policyagent.repository.PolicyType;
 import org.oransc.policyagent.repository.PolicyTypes;
 import org.oransc.policyagent.repository.Ric;
 import org.oransc.policyagent.repository.Rics;
+import org.oransc.policyagent.utils.MockA1Client;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -63,7 +63,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.web.client.RestTemplate;
-import reactor.core.publisher.Mono;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@@ -86,52 +85,9 @@ public class ApplicationTest {
 
     public static class MockApplicationConfig extends ApplicationConfig {
         @Override
-        public void initialize() {
+        protected String getLocalConfigurationFilePath() {
             URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json");
-            loadConfigurationFromFile(url.getFile());
-        }
-    }
-
-    static class A1ClientMock implements A1Client {
-        private final Policies policies;
-        private final PolicyTypes policyTypes;
-
-        A1ClientMock(Policies policies, PolicyTypes policyTypes) {
-            this.policies = policies;
-            this.policyTypes = policyTypes;
-        }
-
-        @Override
-        public Mono<Collection<String>> getPolicyTypeIdentities(String nearRtRicUrl) {
-            Vector<String> result = new Vector<>();
-            for (PolicyType p : this.policyTypes.getAll()) {
-                result.add(p.name());
-            }
-            return Mono.just(result);
-        }
-
-        @Override
-        public Mono<String> getPolicyType(String nearRtRicUrl, String policyTypeId) {
-            try {
-                return Mono.just(this.policies.get(policyTypeId).json());
-            } catch (Exception e) {
-                return Mono.error(e);
-            }
-        }
-
-        @Override
-        public Mono<String> putPolicy(String nearRtRicUrl, String policyId, String policyString) {
-            return Mono.just("OK");
-        }
-
-        @Override
-        public Mono<String> deletePolicy(String nearRtRicUrl, String policyId) {
-            return Mono.just("OK");
-        }
-
-        @Override
-        public Mono<Collection<String>> getPolicyIdentities(String nearRtRicUrl) {
-            return Mono.empty(); // problem is that a recovery will start
+            return url.getFile();
         }
     }
 
@@ -151,7 +107,7 @@ public class ApplicationTest {
 
         @Bean
         A1Client getA1Client() {
-            return new A1ClientMock(this.policies, this.policyTypes);
+            return new MockA1Client(this.policyTypes);
         }
 
         @Bean
@@ -212,7 +168,7 @@ public class ApplicationTest {
         String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1";
         String json = "{}";
         addPolicyType("type1", "ric1");
-        this.rics.getRic("ric1").setState(Ric.RicState.ACTIVE);
+        this.rics.getRic("ric1").setState(Ric.RicState.IDLE);
 
         this.restTemplate.put(url, json);
 
@@ -293,7 +249,7 @@ public class ApplicationTest {
         reset();
         String url = baseUrl() + "/policy?instance=id";
         Policy policy = addPolicy("id", "typeName", "service1", "ric1");
-        policy.ric().setState(Ric.RicState.ACTIVE);
+        policy.ric().setState(Ric.RicState.IDLE);
         assertThat(policies.size()).isEqualTo(1);
 
         this.restTemplate.delete(url);
@@ -397,6 +353,7 @@ public class ApplicationTest {
         ServiceRegistrationInfo service = ImmutableServiceRegistrationInfo.builder() //
             .keepAliveInterval(1) //
             .name(name) //
+            .callbackUrl("callbackUrl") //
             .build();
         String json = gson.toJson(service);
         return json;