Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix startup
[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
d8ff2e1
..
beef586
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,13
+17,13
@@
* limitations under the License.
* ========================LICENSE_END===================================
*/
* limitations under the License.
* ========================LICENSE_END===================================
*/
+
package org.oransc.policyagent;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertFalse;
import java.net.URL;
package org.oransc.policyagent;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertFalse;
import java.net.URL;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.oransc.policyagent.configuration.ApplicationConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.oransc.policyagent.configuration.ApplicationConfig;
@@
-34,6
+34,7
@@
import org.oransc.policyagent.repository.Policies;
import org.oransc.policyagent.repository.Policy;
import org.oransc.policyagent.repository.PolicyType;
import org.oransc.policyagent.repository.PolicyTypes;
import org.oransc.policyagent.repository.Policy;
import org.oransc.policyagent.repository.PolicyType;
import org.oransc.policyagent.repository.PolicyTypes;
+import org.oransc.policyagent.repository.Rics;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@
-50,15
+51,10
@@
import org.springframework.web.client.RestTemplate;
public class ApplicationTest {
@Autowired
public class ApplicationTest {
@Autowired
- private Policies policies;
-
- @Autowired
- private PolicyTypes policyTypes;
-
- @Autowired
- ApplicationConfig appConfig;
+ private Beans beans;
static class MockApplicationConfig extends ApplicationConfig {
static class MockApplicationConfig extends ApplicationConfig {
+ @Override
public void initialize() {
URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json");
loadConfigurationFromFile(url.getFile());
public void initialize() {
URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json");
loadConfigurationFromFile(url.getFile());
@@
-68,17
+64,22
@@
public class ApplicationTest {
@TestConfiguration
static class Beans {
@Bean
@TestConfiguration
static class Beans {
@Bean
- Policies getPolicies() {
+ public Rics getRics() {
+ return new Rics();
+ }
+
+ @Bean
+ public Policies getPolicies() {
return new Policies();
}
@Bean
return new Policies();
}
@Bean
- PolicyTypes getPolicyTypes() {
+
public
PolicyTypes getPolicyTypes() {
return new PolicyTypes();
}
@Bean
return new PolicyTypes();
}
@Bean
- ApplicationConfig getApplicationConfig() {
+
public
ApplicationConfig getApplicationConfig() {
return new MockApplicationConfig();
}
}
return new MockApplicationConfig();
}
}
@@
-111,7
+112,8
@@
public class ApplicationTest {
addPolicyType("type1");
this.restTemplate.put(url, json);
addPolicyType("type1");
this.restTemplate.put(url, json);
- Policy policy = this.policies.get("instance1");
+
+ Policy policy = beans.getPolicies().get("instance1");
assertThat(policy).isNotNull();
assertThat(policy.id()).isEqualTo("instance1");
assertThat(policy).isNotNull();
assertThat(policy.id()).isEqualTo("instance1");
@@
-124,7
+126,7
@@
public class ApplicationTest {
.name(name) //
.build();
.name(name) //
.build();
-
policyTypes
.put(type);
+
beans.getPolicyTypes()
.put(type);
return type;
}
return type;
}
@@
-132,10
+134,10
@@
public class ApplicationTest {
Policy p = ImmutablePolicy.builder().id(id) //
.json("{}") //
.ownerServiceName(service) //
Policy p = ImmutablePolicy.builder().id(id) //
.json("{}") //
.ownerServiceName(service) //
- .ric(
appConfig
.getRic("ric1")) //
+ .ric(
beans.getRics()
.getRic("ric1")) //
.type(addPolicyType(typeName)) //
.build();
.type(addPolicyType(typeName)) //
.build();
-
this.policies
.put(p);
+
beans.getPolicies()
.put(p);
return p;
}
return p;
}
@@
-148,7
+150,7
@@
public class ApplicationTest {
assertThat(rsp).isEqualTo(policy.json());
}
{
assertThat(rsp).isEqualTo(policy.json());
}
{
-
this.policies
.remove(policy);
+
beans.getPolicies()
.remove(policy);
ResponseEntity<String> rsp = this.restTemplate.getForEntity(url, String.class);
assertThat(rsp.getStatusCodeValue()).isEqualTo(HttpStatus.NO_CONTENT.value());
}
ResponseEntity<String> rsp = this.restTemplate.getForEntity(url, String.class);
assertThat(rsp.getStatusCodeValue()).isEqualTo(HttpStatus.NO_CONTENT.value());
}
@@
-168,11
+170,11
@@
public class ApplicationTest {
@Test
public void getPoliciesFilter() throws Exception {
@Test
public void getPoliciesFilter() throws Exception {
- String url = "http://localhost:" + port + "/policies?type=type1";
addPolicy("id1", "type1", "service1");
addPolicy("id2", "type1", "service2");
addPolicy("id3", "type2", "service1");
addPolicy("id1", "type1", "service1");
addPolicy("id2", "type1", "service2");
addPolicy("id3", "type2", "service1");
+ String url = "http://localhost:" + port + "/policies?type=type1";
String rsp = this.restTemplate.getForObject(url, String.class);
System.out.println(rsp);
assertThat(rsp).contains("id1");
String rsp = this.restTemplate.getForObject(url, String.class);
System.out.println(rsp);
assertThat(rsp).contains("id1");