Increasing test coverage for vid.mso.model

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

1 files changed, 17 insertions, 27 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/model/OperationalEnvironmentDeactivateInfoTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/model/OperationalEnvironmentDeactivateInfoTest.java
index 22310d2e2..72fb9d6dc 100644
--- a/vid-app-common/src/test/java/org/onap/vid/mso/model/OperationalEnvironmentDeactivateInfoTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/mso/model/OperationalEnvironmentDeactivateInfoTest.java
@@ -20,41 +20,31 @@
 
 package org.onap.vid.mso.model;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 public class OperationalEnvironmentDeactivateInfoTest {
 
-    private OperationalEnvironmentDeactivateInfo createTestSubject() {
-        return new OperationalEnvironmentDeactivateInfo("", "");
-    }
-
     @Test
-    public void testGetUserId() throws Exception {
-        OperationalEnvironmentDeactivateInfo testSubject;
-        String result;
+    public void shouldProperlyCreateOperationalEnvironmentActivateInfoWithParameters() {
+        //  given
+        String userId = "testUserId";
+        String operationalEnvironmentId = "testOperationalEnvironmentId";
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getUserId();
-    }
 
-    @Test
-    public void testGetOperationalEnvironmentId() throws Exception {
-        OperationalEnvironmentDeactivateInfo testSubject;
-        String result;
+        //  when
+        OperationalEnvironmentDeactivateInfo operationalEnvironmentDeactivateInfo =
+                new OperationalEnvironmentDeactivateInfo(userId, operationalEnvironmentId);
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getOperationalEnvironmentId();
-    }
 
-    @Test
-    public void testToString() throws Exception {
-        OperationalEnvironmentDeactivateInfo testSubject;
-        String result;
+        //  then
+        assertThat(operationalEnvironmentDeactivateInfo.getUserId()).isEqualTo(userId);
+        assertThat(operationalEnvironmentDeactivateInfo.getOperationalEnvironmentId()).isEqualTo(operationalEnvironmentId);
+
+        assertThat(operationalEnvironmentDeactivateInfo.toString()).isEqualToIgnoringWhitespace(
+                "OperationalEnvironmentDeactivateInfo{operationalEnvironmentId="+operationalEnvironmentId+"," +
+                        " userId="+userId+"}"
+        );
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.toString();
     }
 }