Increasing test coverage for vid.mso

[vid.git] / vid-app-common / src / test / java / org / onap / vid / mso / RestObjectTest.java

diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/RestObjectTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/RestObjectTest.java
index c7504bc..8030833 100644 (file)
--- a/vid-app-common/src/test/java/org/onap/vid/mso/RestObjectTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/mso/RestObjectTest.java
@@ -20,79 +20,75 @@
 
 package org.onap.vid.mso;
 
-import org.junit.Test;
+import org.hamcrest.MatcherAssert;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Test;
 
-public class RestObjectTest {
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding;
+import static org.assertj.core.api.Assertions.assertThat;
 
-    private RestObject createTestSubject() {
-        return new RestObject();
-    }
+public class RestObjectTest {
 
-    @Test
-    public void testSet() throws Exception {
-        RestObject testSubject;
+    private RestObject restObject;
 
-        // default test
-        testSubject = createTestSubject();
-        testSubject.set(null);
+    @BeforeSuite
+    private void setUp() {
+        restObject = new RestObject();
     }
 
     @Test
-    public void testGet() throws Exception {
-        RestObject testSubject;
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.get();
+    public void shouldHaveValidGettersAndSetters(){
+        MatcherAssert.assertThat(RestObject.class, hasValidGettersAndSettersExcluding("t"));
     }
 
     @Test
-    public void testSetStatusCode() throws Exception {
-        RestObject testSubject;
-        int v = 0;
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setStatusCode(v);
-    }
+    public void shouldHaveValidGetterAndSetterForBody() {
+        //  given
+        String testString = "set/get_testString";
 
-    @Test
-    public void testGetStatusCode() throws Exception {
-        RestObject testSubject;
-        int result;
+        //  when
+        restObject.set(testString);
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getStatusCode();
+        //  then
+        assertThat(testString).isSameAs(restObject.get());
     }
 
     @Test
-    public void testGetRaw() throws Exception {
-        RestObject testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getRaw();
+    public void shouldProperlyCopyRestObject() {
+        //  given
+        MsoResponseWrapper testResponseWraper = new MsoResponseWrapper();
+        String rawTestString = "rawTestString";
+        int statusCode = 404;
+
+        RestObject restObjectToCopyFrom = new RestObject<>();
+        restObjectToCopyFrom.set(testResponseWraper);
+        restObjectToCopyFrom.setRaw(rawTestString);
+        restObjectToCopyFrom.setStatusCode(statusCode);
+
+        //  when
+        restObject.copyFrom(restObjectToCopyFrom);
+
+        //  then
+        assertThat(restObject).isEqualToComparingFieldByField(restObjectToCopyFrom);
     }
 
     @Test
-    public void testSetRaw() throws Exception {
-        RestObject testSubject;
-        String rawT = "";
+    public void shouldProperlyConvertRestObjectToString() {
+        //  given
+        String testString = "testString";
+        String rawTestString = "rawTestString";
+        int statusCode = 202;
 
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setRaw(rawT);
-    }
+        restObject.set(testString);
+        restObject.setRaw(rawTestString);
+        restObject.setStatusCode(statusCode);
 
-    @Test
-    public void testToString() throws Exception {
-        RestObject testSubject;
-        String result;
+        String properString = "RestObject{t=testString, rawT=rawTestString, statusCode=202}";
+
+        //  when
+        String toStringResponse = restObject.toString();
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.toString();
+        //  then
+        assertThat(toStringResponse).isEqualTo(properString);
     }
 }