From 03359a5641dfb26f93d630a1b1232c0ffc6ec51c Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Tue, 19 Mar 2019 12:26:20 +0200
Subject: Task.java to Task.kt, and test it

Also move setRandomStrings() to TestUtils.setStringsInStringProperties()

Issue-ID: VID-403
Change-Id: I0216d16983699f1b91c23d167472e36bcae10ce1
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../vid/job/command/InstanceGroupCommandTest.java  | 31 ++++++++--------------
 1 file changed, 11 insertions(+), 20 deletions(-)

(limited to 'vid-app-common/src/test/java/org/onap/vid/job')

diff --git a/vid-app-common/src/test/java/org/onap/vid/job/command/InstanceGroupCommandTest.java b/vid-app-common/src/test/java/org/onap/vid/job/command/InstanceGroupCommandTest.java
index 47ec44ca7..b4a5c64f5 100644
--- a/vid-app-common/src/test/java/org/onap/vid/job/command/InstanceGroupCommandTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/job/command/InstanceGroupCommandTest.java
@@ -20,8 +20,14 @@
 
 package org.onap.vid.job.command;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.only;
+import static org.mockito.Mockito.same;
+import static org.mockito.Mockito.verify;
+
 import com.google.common.collect.ImmutableMap;
-import org.apache.commons.beanutils.BeanUtils;
+import java.util.Optional;
 import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -32,19 +38,11 @@ import org.onap.vid.model.serviceInstantiation.InstanceGroup;
 import org.onap.vid.mso.RestMsoImplementation;
 import org.onap.vid.mso.model.ModelInfo;
 import org.onap.vid.services.AsyncInstantiationBusinessLogic;
+import org.onap.vid.testUtils.TestUtils;
 import org.springframework.http.HttpMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.util.Optional;
-import java.util.Set;
-
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toMap;
-import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
 public class InstanceGroupCommandTest {
 
     @Mock(answer = Answers.RETURNS_MOCKS)
@@ -73,7 +71,7 @@ public class InstanceGroupCommandTest {
 
     @Test
     public void createMyself_callsMso() {
-        final ModelInfo serviceModelInfo = setRandomStrings(new ModelInfo());
+        final ModelInfo serviceModelInfo = setStrings(new ModelInfo());
         final String serviceInstanceId = "service-instance-id";
         final String userId = "ff3223";
 
@@ -92,14 +90,7 @@ public class InstanceGroupCommandTest {
 
     }
 
-    private ModelInfo setRandomStrings(ModelInfo object) {
-        try {
-            Set<String> fields = BeanUtils.describe(object).keySet();
-            BeanUtils.populate(object,
-                    fields.stream().collect(toMap(identity(), s -> randomAlphanumeric(4))));
-            return object;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+    private ModelInfo setStrings(ModelInfo object) {
+        return TestUtils.setStringsInStringProperties(object);
     }
 }
-- 
cgit 1.2.3-korg