Increasing test coverage for vid.mso.rest

Change-Id: I48a5827875f9d0023f183cff58b0aaed0e28910b
Issue-ID: VID-387
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>

1 files changed, 45 insertions, 79 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/rest/RequestTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/rest/RequestTest.java
index 1f8898e2a..0b5e288d7 100644
--- a/vid-app-common/src/test/java/org/onap/vid/mso/rest/RequestTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/mso/rest/RequestTest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,102 +20,68 @@
 
 package org.onap.vid.mso.rest;
 
-import org.junit.Test;
 
-public class RequestTest {
-
-    private Request createTestSubject() {
-        return new Request();
-    }
-
-    @Test
-    public void testGetInstanceIds() throws Exception {
-        Request testSubject;
-        InstanceIds result;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getInstanceIds();
-    }
-
-    @Test
-    public void testSetInstanceIds() throws Exception {
-        Request testSubject;
-        InstanceIds instanceIds = null;
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setInstanceIds(instanceIds);
-    }
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanEqualsExcluding;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
-    @Test
-    public void testGetRequestDetails() throws Exception {
-        Request testSubject;
-        RequestDetails result;
+public class RequestTest {
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getRequestDetails();
-    }
 
-    @Test
-    public void testSetRequestDetails() throws Exception {
-        Request testSubject;
-        RequestDetails requestDetails = null;
+    private Request request;
 
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setRequestDetails(requestDetails);
-    }
+    private String propertyName = "testProperty";
+    private String additionalProperty = "testAdditionalProperty";
 
-    @Test
-    public void testGetRequestStatus() throws Exception {
-        Request testSubject;
-        RequestStatus result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getRequestStatus();
+    @BeforeMethod
+    public void setUp() {
+        request = new Request();
     }
 
     @Test
-    public void testSetRequestStatus() throws Exception {
-        Request testSubject;
-        RequestStatus requestStatus = null;
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setRequestStatus(requestStatus);
+    public void shouldHaveProperSettersAndGetters() {
+        assertThat(Request.class, hasValidGettersAndSettersExcluding("additionalProperties"));
     }
 
     @Test
-    public void testToString() throws Exception {
-        Request testSubject;
-        String result;
+    public void shouldHaveProperGetterAndSetterForAdditionalProperties() {
+        //	when
+        request.setAdditionalProperty(propertyName,additionalProperty);
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.toString();
+        //	then
+        assertThat( request.getAdditionalProperties().get(propertyName) ).isEqualTo(additionalProperty);
     }
 
     @Test
-    public void testEquals() throws Exception {
-        Request testSubject;
-        Object other = null;
-        boolean result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.equals(other);
+    public void shouldProperlyConvertRelatedInstanceObjectToString() {
+        //	given
+        request.setFinishTime("100");
+        request.setRequestId("testRequest");
+        request.setAdditionalProperty(propertyName,additionalProperty);
+
+        //	when
+        String response = request.toString();
+
+        //	then
+        assertThat(response).contains(
+                "[instanceIds=<null>," +
+                        "requestDetails=<null>," +
+                        "requestStatus=<null>," +
+                        "finishTime="+100+"," +
+                        "requestId=testRequest," +
+                        "requestScope=<null>," +
+                        "requestType=<null>," +
+                        "startTime=<null>," +
+                        "additionalProperties={"+propertyName+"="+additionalProperty+"}]"
+        );
     }
 
     @Test
-    public void testHashCode() throws Exception {
-        Request testSubject;
-        int result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.hashCode();
+    public void shouldProperlyCheckIfObjectsAreEqual() {
+        assertThat(Request.class, hasValidBeanEqualsExcluding("additionalProperties"));
     }
 }