MID-8842 upgrade, removing most of the System out/err usages, wip

Evolveum · Jun 20, 2023 · b5b2dec · b5b2dec
1 parent b3c177f
commit b5b2dec
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 44 deletions.
diff --git a/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/NinjaContextTest.java b/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/NinjaContextTest.java
@@ -6,14 +6,14 @@
  */
 package com.evolveum.midpoint.ninja;
 
-import com.beust.jcommander.JCommander;
-
-import com.evolveum.midpoint.ninja.impl.NinjaApplicationContextLevel;
+import java.util.List;
 
+import com.beust.jcommander.JCommander;
 import org.testng.annotations.Test;
 
-import com.evolveum.midpoint.ninja.impl.NinjaContext;
 import com.evolveum.midpoint.ninja.action.ConnectionOptions;
+import com.evolveum.midpoint.ninja.impl.NinjaApplicationContextLevel;
+import com.evolveum.midpoint.ninja.impl.NinjaContext;
 import com.evolveum.midpoint.ninja.util.NinjaUtils;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.repo.api.RepositoryService;
@@ -22,8 +22,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
-import java.util.List;
-
 /**
  * Created by Viliam Repan (lazyman).
  */
@@ -37,7 +35,7 @@ public void setupRepositoryViaMidpointHome() throws Exception {
 
         ConnectionOptions options = NinjaUtils.getOptions(jc.getObjects(), ConnectionOptions.class);
 
-        try (NinjaContext ctx = new NinjaContext(List.of(options), NinjaApplicationContextLevel.FULL_REPOSITORY)) {
+        try (NinjaContext ctx = new NinjaContext(System.out, System.err, List.of(options), NinjaApplicationContextLevel.FULL_REPOSITORY)) {
             RepositoryService service = ctx.getRepository();
 
             OperationResult result = new OperationResult("get user");

diff --git a/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/NinjaTestUtils.java b/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/NinjaTestUtils.java
@@ -0,0 +1,18 @@
+package com.evolveum.midpoint.ninja;
+
+import com.evolveum.midpoint.ninja.action.Action;
+import com.evolveum.midpoint.ninja.impl.NinjaContext;
+
+import java.util.List;
+
+public class NinjaTestUtils {
+
+    public static <O, R, A extends Action<O, R>> R runAction(Class<A> actionClass, O actionOptions, List<Object> options) throws Exception {
+        A action = actionClass.getConstructor().newInstance();
+        try (NinjaContext context = new NinjaContext(System.out, System.err, options, action.getApplicationContextLevel(options))) {
+            action.init(context, actionOptions);
+
+            return action.execute();
+        }
+    }
+}
diff --git a/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/TestMain.java b/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/TestMain.java
@@ -6,8 +6,6 @@
  */
 package com.evolveum.midpoint.ninja;
 
-import org.apache.commons.lang3.StringUtils;
-
 /**
  * Created by Viliam Repan (lazyman).
  */

diff --git a/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/upgrade/BaseUpgradeTest.java b/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/upgrade/BaseUpgradeTest.java
@@ -34,8 +34,7 @@
 import com.evolveum.midpoint.test.util.AbstractSpringTest;
 import com.evolveum.midpoint.test.util.InfraTestMixin;
 
-public abstract class BaseUpgradeTest extends AbstractSpringTest
-        implements InfraTestMixin {
+public abstract class BaseUpgradeTest extends AbstractSpringTest implements InfraTestMixin {
 
     public static final String NINJA_TESTS_USER = "ninja_upgrade_tests";
 
@@ -149,7 +148,7 @@ protected void recreateSchema(@NotNull File scriptsDirectory) throws Exception {
 
         RunSqlAction action = new RunSqlAction();
 
-        try (NinjaContext context = new NinjaContext(options, action.getApplicationContextLevel(options))) {
+        try (NinjaContext context = new NinjaContext(System.out, System.err, options, action.getApplicationContextLevel(options))) {
             action.init(context, runSqlOptions);
 
             action.execute();

diff --git a/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/upgrade/CreateDatabaseTest.java b/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/upgrade/CreateDatabaseTest.java
@@ -4,11 +4,12 @@
 import java.sql.SQLException;
 import java.util.List;
 
+import com.evolveum.midpoint.ninja.NinjaTestUtils;
+
 import com.zaxxer.hikari.HikariDataSource;
 import org.assertj.core.api.Assertions;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
@@ -17,7 +18,6 @@
 import com.evolveum.midpoint.ninja.action.ConnectionOptions;
 import com.evolveum.midpoint.ninja.action.RunSqlAction;
 import com.evolveum.midpoint.ninja.action.RunSqlOptions;
-import com.evolveum.midpoint.ninja.impl.NinjaContext;
 
 @ContextConfiguration(locations = "classpath:ctx-ninja-no-repository-test.xml")
 @DirtiesContext
@@ -67,12 +67,7 @@ public void test100CreateUserAndDatabase() throws Exception {
 
         List<Object> options = List.of(baseOptions, connectionOptions, runSqlOptions);
 
-        RunSqlAction action = new RunSqlAction();
-        try (NinjaContext context = new NinjaContext(options, action.getApplicationContextLevel(options))) {
-            action.init(context, runSqlOptions);
-
-            action.execute();
-        }
+        NinjaTestUtils.runAction(RunSqlAction.class, runSqlOptions, options);
 
         Assertions.assertThat(FAKE_MIDPOINT_HOME.exists()).isFalse();
 
@@ -104,12 +99,7 @@ public void test200CreateSchema() throws Exception {
 
         List<Object> options = List.of(baseOptions, connectionOptions, runSqlOptions);
 
-        RunSqlAction action = new RunSqlAction();
-        try (NinjaContext context = new NinjaContext(options, action.getApplicationContextLevel(options))) {
-            action.init(context, runSqlOptions);
-
-            action.execute();
-        }
+        NinjaTestUtils.runAction(RunSqlAction.class, runSqlOptions, options);
 
         Assertions.assertThat(FAKE_MIDPOINT_HOME.exists()).isFalse();
 

diff --git a/.../ninja/src/test/java/com/evolveum/midpoint/ninja/upgrade/UpgradeFromFeatureToLtsTest.java b/.../ninja/src/test/java/com/evolveum/midpoint/ninja/upgrade/UpgradeFromFeatureToLtsTest.java
@@ -1,11 +1,11 @@
 package com.evolveum.midpoint.ninja.upgrade;
 
+import java.io.File;
+
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.testng.annotations.Listeners;
 
-import java.io.File;
-
 @ContextConfiguration(locations = "classpath:ctx-ninja-no-repository-test.xml")
 @DirtiesContext
 @Listeners({ com.evolveum.midpoint.tools.testng.AlphabeticalMethodInterceptor.class })

diff --git a/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/upgrade/UpgradeTest.java b/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/upgrade/UpgradeTest.java
@@ -3,14 +3,15 @@
 import java.io.File;
 import java.util.List;
 
+import com.evolveum.midpoint.ninja.NinjaTestUtils;
+
 import org.assertj.core.api.Assertions;
 import org.testng.annotations.Test;
 
 import com.evolveum.midpoint.ninja.action.BaseOptions;
 import com.evolveum.midpoint.ninja.action.ConnectionOptions;
 import com.evolveum.midpoint.ninja.action.RunSqlAction;
 import com.evolveum.midpoint.ninja.action.RunSqlOptions;
-import com.evolveum.midpoint.ninja.impl.NinjaContext;
 
 public abstract class UpgradeTest extends BaseUpgradeTest {
 
@@ -48,12 +49,7 @@ public void test100UpgradeDatabase() throws Exception {
 
         List<Object> options = List.of(baseOptions, connectionOptions, upgradeDatabaseOptions);
 
-        RunSqlAction action = new RunSqlAction();
-        try (NinjaContext context = new NinjaContext(options, action.getApplicationContextLevel(options))) {
-            action.init(context, upgradeDatabaseOptions);
-
-            action.execute();
-        }
+        NinjaTestUtils.runAction(RunSqlAction.class, upgradeDatabaseOptions, options);
 
         then();
 

diff --git a/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/upgrade/VerifyFilesTest.java b/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/upgrade/VerifyFilesTest.java
@@ -1,13 +1,14 @@
 package com.evolveum.midpoint.ninja.upgrade;
 
 import java.io.File;
+import java.io.PrintStream;
 import java.util.List;
 
-import com.evolveum.midpoint.ninja.action.*;
+import com.evolveum.midpoint.ninja.NinjaTestUtils;
 
 import org.testng.annotations.Test;
 
-import com.evolveum.midpoint.ninja.impl.NinjaContext;
+import com.evolveum.midpoint.ninja.action.*;
 
 public class VerifyFilesTest {
 
@@ -27,12 +28,6 @@ public void verifyFilesTest() throws Exception {
 
         List<Object> options = List.of(baseOptions, connectionOptions, verifyFilesOptions);
 
-        VerifyFilesAction action = new VerifyFilesAction();
-
-        try (NinjaContext context = new NinjaContext(options, action.getApplicationContextLevel(options))) {
-            action.init(context, verifyFilesOptions);
-            action.execute();
-        }
-
+        NinjaTestUtils.runAction(VerifyFilesAction.class, verifyFilesOptions, options);
     }
 }