Merge "Controller Blueprints Microservice"

3 files changed, 20 insertions, 7 deletions

diff --git a/ms/controllerblueprints/application/src/test/java/org/onap/ccsdk/apps/controllerblueprints/ControllerBluprintsApplicationTest.java b/ms/controllerblueprints/application/src/test/java/org/onap/ccsdk/apps/controllerblueprints/ControllerBluprintsApplicationTest.java
index 95639bd3..26b943b6 100644
--- a/ms/controllerblueprints/application/src/test/java/org/onap/ccsdk/apps/controllerblueprints/ControllerBluprintsApplicationTest.java
+++ b/ms/controllerblueprints/application/src/test/java/org/onap/ccsdk/apps/controllerblueprints/ControllerBluprintsApplicationTest.java
@@ -16,17 +16,18 @@
 

 package org.onap.ccsdk.apps.controllerblueprints;

 

+import org.junit.Assert;

 import org.junit.Before;

 import org.junit.Test;

 import org.junit.runner.RunWith;

+import org.onap.ccsdk.apps.controllerblueprints.service.domain.ConfigModel;

 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

 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.boot.test.web.client.TestRestTemplate;

-import org.springframework.http.HttpStatus;

-import org.springframework.http.ResponseEntity;

+import org.springframework.http.*;

 import org.springframework.test.context.junit4.SpringRunner;

 

 import static org.assertj.core.api.Assertions.assertThat;

@@ -46,8 +47,21 @@ public class ControllerBluprintsApplicationTest {
 

     @Test

     public void testConfigModel() {

-        ResponseEntity<String> entity = this.restTemplate

-                .getForEntity("/api/v1/config-model/1", String.class);

+        HttpHeaders headers = new HttpHeaders();

+        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);

+        ResponseEntity<ConfigModel> entity = this.restTemplate

+                .exchange("/api/v1/config-model/1", HttpMethod.GET, new HttpEntity<>(headers),ConfigModel.class);

         assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);

+        Assert.assertNotNull("failed to get response Config model",entity.getBody());

+    }

+

+    @Test

+    public void testConfigModelFailure() {

+        HttpHeaders headers = new HttpHeaders();

+        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);

+        ResponseEntity<ConfigModel> entity = this.restTemplate

+                .exchange("/api/v1/config-model-not-found/1", HttpMethod.GET, new HttpEntity<>(headers),ConfigModel.class);

+        assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);

+        Assert.assertNotNull("failed to get response Config model",entity.getBody());

     }

 }

diff --git a/ms/controllerblueprints/application/src/test/resources/application.properties b/ms/controllerblueprints/application/src/test/resources/application.properties
index 55ffeaf1..a147034f 100644
--- a/ms/controllerblueprints/application/src/test/resources/application.properties
+++ b/ms/controllerblueprints/application/src/test/resources/application.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and

 # limitations under the License.

 #

-

+spring.jackson.default-property-inclusion=non_null

 #Load Blueprints

 # blueprints.load.initial-data may be overridden by ENV variables

 blueprints.load.initial-data=true

diff --git a/ms/controllerblueprints/application/src/test/resources/logback.xml b/ms/controllerblueprints/application/src/test/resources/logback.xml
index b9b97dc8..53388bc9 100644
--- a/ms/controllerblueprints/application/src/test/resources/logback.xml
+++ b/ms/controllerblueprints/application/src/test/resources/logback.xml
@@ -24,8 +24,7 @@
     </appender>

 

 

-    <logger name="org.springframework" level="info"/>

-    <logger name="org.springframework.web" level="debug"/>

+    <logger name="org.springframework" level="warn"/>

     <logger name="org.hibernate" level="info"/>

     <logger name="org.onap.ccsdk.apps.controllerblueprints" level="info"/>