Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add unit test for A1 client"
[nonrtric.git]
/
policy-agent
/
src
/
test
/
java
/
org
/
oransc
/
policyagent
/
ApplicationTest.java
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
df26ba4
..
0d00daa
100644
(file)
--- a/
policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
+++ b/
policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
@@
-17,10
+17,12
@@
* limitations under the License.
* ========================LICENSE_END===================================
*/
* limitations under the License.
* ========================LICENSE_END===================================
*/
+
package org.oransc.policyagent;
import static org.assertj.core.api.Assertions.assertThat;
package org.oransc.policyagent;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@
-30,9
+32,8
@@
import java.net.URL;
import java.util.List;
import java.util.Vector;
import java.util.List;
import java.util.Vector;
-import org.junit.Test;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.oransc.policyagent.configuration.ApplicationConfig;
import org.oransc.policyagent.configuration.ImmutableRicConfig;
import org.oransc.policyagent.configuration.RicConfig;
import org.oransc.policyagent.configuration.ApplicationConfig;
import org.oransc.policyagent.configuration.ImmutableRicConfig;
import org.oransc.policyagent.configuration.RicConfig;
@@
-55,15
+56,18
@@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.context.annotation.Bean;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit
4.SpringRunner
;
+import org.springframework.test.context.junit
.jupiter.SpringExtension
;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.client.RestTemplate;
-@
RunWith(SpringRunner
.class)
+@
ExtendWith(SpringExtension
.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class ApplicationTest {
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class ApplicationTest {
+ @Autowired
+ ApplicationContext context;
@Autowired
private Rics rics;
@Autowired
private Rics rics;
@@
-87,7
+91,7
@@
public class ApplicationTest {
}
/**
}
/**
- *
overrides the BeanFactory
+ *
Overrides the BeanFactory.
*/
@TestConfiguration
static class TestBeanFactory {
*/
@TestConfiguration
static class TestBeanFactory {
@@
-96,6
+100,16
@@
public class ApplicationTest {
public ApplicationConfig getApplicationConfig() {
return new MockApplicationConfig();
}
public ApplicationConfig getApplicationConfig() {
return new MockApplicationConfig();
}
+
+ @Bean
+ public Rics getRics() {
+ Rics rics = new Rics();
+ rics.put(new Ric(ImmutableRicConfig.builder().name("kista_1").baseUrl("kista_url")
+ .managedElementIds(new Vector<>()).build()));
+ rics.put(new Ric(ImmutableRicConfig.builder().name("ric1").baseUrl("ric_url")
+ .managedElementIds(new Vector<>()).build()));
+ return rics;
+ }
}
@LocalServerPort
}
@LocalServerPort
@@
-103,8
+117,7
@@
public class ApplicationTest {
private final RestTemplate restTemplate = new RestTemplate();
private final RestTemplate restTemplate = new RestTemplate();
- @BeforeEach
- public void reset() {
+ private void reset() {
rics.clear();
policies.clear();
policyTypes.clear();
rics.clear();
policies.clear();
policyTypes.clear();
@@
-115,7
+128,12
@@
public class ApplicationTest {
public void testGetRics() throws Exception {
String url = baseUrl() + "/rics";
String rsp = this.restTemplate.getForObject(url, String.class);
public void testGetRics() throws Exception {
String url = baseUrl() + "/rics";
String rsp = this.restTemplate.getForObject(url, String.class);
+ System.out.println(rsp);
assertThat(rsp).contains("kista_1");
assertThat(rsp).contains("kista_1");
+
+ url = baseUrl() + "/rics?policyType=ANR";
+ rsp = this.restTemplate.getForObject(url, String.class);
+ assertThat(rsp).isEqualTo("[]");
}
@Test
}
@Test
@@
-133,11
+151,11
@@
public class ApplicationTest {
String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1";
String json = "{}";
String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1";
String json = "{}";
- addPolicyType("type1");
+ addPolicyType("type1"
, "ric1"
);
this.restTemplate.put(url, json);
this.restTemplate.put(url, json);
- Policy policy = policies.get("instance1");
+ Policy policy = policies.get
Policy
("instance1");
assertThat(policy).isNotNull();
assertThat(policy.id()).isEqualTo("instance1");
assertThat(policy).isNotNull();
assertThat(policy.id()).isEqualTo("instance1");
@@
-148,19
+166,22
@@
public class ApplicationTest {
System.out.println(rsp);
}
System.out.println(rsp);
}
- private PolicyType addPolicyType(String
n
ame) {
+ private PolicyType addPolicyType(String
policyTypeName, String ricN
ame) {
PolicyType type = ImmutablePolicyType.builder() //
PolicyType type = ImmutablePolicyType.builder() //
- .jsonSchema("") //
- .name(name) //
+ .name(policyTypeName) //
.build();
policyTypes.put(type);
.build();
policyTypes.put(type);
+ addRic(ricName).addSupportedPolicyType(type);
return type;
}
return type;
}
- private Ric addRic(String name) {
+ private Ric addRic(String ricName) {
+ if (rics.get(ricName) != null) {
+ return rics.get(ricName);
+ }
Vector<String> mes = new Vector<>();
Vector<String> mes = new Vector<>();
- RicConfig conf = ImmutableRicConfig.builder().name(
n
ame).baseUrl("baseUrl").managedElementIds(mes).build();
+ RicConfig conf = ImmutableRicConfig.builder().name(
ricN
ame).baseUrl("baseUrl").managedElementIds(mes).build();
Ric ric = new Ric(conf);
this.rics.put(ric);
return ric;
Ric ric = new Ric(conf);
this.rics.put(ric);
return ric;
@@
-172,7
+193,7
@@
public class ApplicationTest {
.json("{}") //
.ownerServiceName(service) //
.ric(rics.getRic(ric)) //
.json("{}") //
.ownerServiceName(service) //
.ric(rics.getRic(ric)) //
- .type(addPolicyType(typeName)) //
+ .type(addPolicyType(typeName
, ric
)) //
.lastModified("lastModified").build();
policies.put(p);
return p;
.lastModified("lastModified").build();
policies.put(p);
return p;
@@
-213,28
+234,33
@@
public class ApplicationTest {
assertThat(policies.size()).isEqualTo(0);
}
assertThat(policies.size()).isEqualTo(0);
}
- p
ublic
static <T> List<T> parseList(String json, Class<T> clazz) {
+ p
rivate
static <T> List<T> parseList(String json, Class<T> clazz) {
if (null == json) {
return null;
}
return gson.fromJson(json, new TypeToken<T>() {}.getType());
if (null == json) {
return null;
}
return gson.fromJson(json, new TypeToken<T>() {}.getType());
+
}
@Test
public void testGetPolicyTypes() throws Exception {
}
@Test
public void testGetPolicyTypes() throws Exception {
- String url = baseUrl() + "/policy_types";
reset();
reset();
- addPolicy
("id1", "type1", "service
1");
- addPolicy
("id2", "type2", "service
2");
+ addPolicy
Type("type1", "ric
1");
+ addPolicy
Type("type2", "ric
2");
+ String url = baseUrl() + "/policy_types";
String rsp = this.restTemplate.getForObject(url, String.class);
String rsp = this.restTemplate.getForObject(url, String.class);
- System.out.println(rsp);
assertThat(rsp).contains("type1");
assertThat(rsp).contains("type2");
List<PolicyTypeInfo> info = parseList(rsp, PolicyTypeInfo.class);
assertThat(rsp).contains("type1");
assertThat(rsp).contains("type2");
List<PolicyTypeInfo> info = parseList(rsp, PolicyTypeInfo.class);
-
System.out.println(
info.size());
+
assertEquals(2,
info.size());
+ url = baseUrl() + "/policy_types?ric=ric1";
+ rsp = this.restTemplate.getForObject(url, String.class);
+ assertThat(rsp).contains("type1");
+ info = parseList(rsp, PolicyTypeInfo.class);
+ assertEquals(1, info.size());
}
@Test
}
@Test