Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added queryparam 'ric' for get_types REST API
[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
83ee760
..
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
@@
-21,6
+21,7
@@
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.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import com.google.gson.Gson;
import static org.junit.jupiter.api.Assertions.assertFalse;
import com.google.gson.Gson;
@@
-132,7
+133,6
@@
public class ApplicationTest {
url = baseUrl() + "/rics?policyType=ANR";
rsp = this.restTemplate.getForObject(url, String.class);
url = baseUrl() + "/rics?policyType=ANR";
rsp = this.restTemplate.getForObject(url, String.class);
- // TODO this should test that the correct types are retrieved from the RIC
assertThat(rsp).isEqualTo("[]");
}
assertThat(rsp).isEqualTo("[]");
}
@@
-151,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");
@@
-166,18
+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() //
- .name(
n
ame) //
+ .name(
policyTypeN
ame) //
.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;
@@
-189,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;
@@
-235,23
+239,28
@@
public class ApplicationTest {
return null;
}
return gson.fromJson(json, new TypeToken<T>() {}.getType());
return null;
}
return gson.fromJson(json, new TypeToken<T>() {}.getType());
+
}
@Test
public void testGetPolicyTypes() throws Exception {
reset();
}
@Test
public void testGetPolicyTypes() throws Exception {
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 url = baseUrl() + "/policy_types";
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