diff options
Diffstat (limited to 'sparkybe-onap-application')
| -rw-r--r-- | sparkybe-onap-application/config/spring-beans/oxm-reader-bean.xml | 6 | ||||
| -rw-r--r-- | sparkybe-onap-application/src/test/java/org/onap/aai/sparky/aggregatevnf/AggregateSummaryProcessorTest.java | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sparkybe-onap-application/config/spring-beans/oxm-reader-bean.xml b/sparkybe-onap-application/config/spring-beans/oxm-reader-bean.xml index 74a291c..799e2f5 100644 --- a/sparkybe-onap-application/config/spring-beans/oxm-reader-bean.xml +++ b/sparkybe-onap-application/config/spring-beans/oxm-reader-bean.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans" +<beans profile="test" xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd @@ -34,7 +34,7 @@ </bean> <bean id="schemaLocationsBean" class="org.onap.aai.setup.SchemaLocationsBean"> - <!-- When running with AJSC these properties must be injected directly. + <!-- When running with AJSC these properties must be injected directly. The reason for this is unknown. --> <property name="nodeDirectory" value="${nodeDir}" /> <property name="edgeDirectory" value="${edgeDir}" /> @@ -59,4 +59,4 @@ <constructor-arg ref="schemaVersions" /> </bean> -</beans>
\ No newline at end of file +</beans> diff --git a/sparkybe-onap-application/src/test/java/org/onap/aai/sparky/aggregatevnf/AggregateSummaryProcessorTest.java b/sparkybe-onap-application/src/test/java/org/onap/aai/sparky/aggregatevnf/AggregateSummaryProcessorTest.java index f6a88aa..7c325b3 100644 --- a/sparkybe-onap-application/src/test/java/org/onap/aai/sparky/aggregatevnf/AggregateSummaryProcessorTest.java +++ b/sparkybe-onap-application/src/test/java/org/onap/aai/sparky/aggregatevnf/AggregateSummaryProcessorTest.java @@ -56,7 +56,7 @@ import org.springframework.web.client.RestClientException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -@ActiveProfiles({"oxm-default","oxm-schema-dev", "camel","fe-dev"}) +@ActiveProfiles({"test","oxm-default","oxm-schema-dev", "camel","fe-dev"}) @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class AggregateSummaryProcessorTest { @@ -65,7 +65,7 @@ public class AggregateSummaryProcessorTest { @MockBean SearchServiceAdapter searchServiceAdapter; @Mock OperationResult operationResult; - + @Autowired private TestRestTemplate restTemplate; @@ -83,13 +83,13 @@ public class AggregateSummaryProcessorTest { Map<String,String> params = new HashMap<String,String>(); AggregationFilter filter = new AggregationFilter("1","someOrchestrationStatus"); FilterAggregationRequest request = new FilterAggregationRequest(Arrays.asList(filter)); - + ResponseEntity<AggregationsResponse> response = restTemplate.postForEntity("/rest/search/filterAggregation", objectMapper.writeValueAsString(request), AggregationsResponse.class); AggregationsResponse aggregationsResponse = response.getBody(); assertEquals(1L, aggregationsResponse.getTotal()); BucketResponse bucket = aggregationsResponse.getAggregations().get("someAggregation").get(0); assertEquals("someKey", bucket.getKey()); assertEquals(0, bucket.getDocCount()); - + } } |