test: refactor: switch to SystemPrintStreamCapturer

Author: voomdoon

src/test/java/de/voomdoon/util/cli/MainBaseTest.java

@@ -8,13 +8,13 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
+import de.voomdoon.testing.system.SystemPrintStreamCapturer;
 import de.voomdoon.testing.tests.TestBase;
 import de.voomdoon.util.cli.MainBaseTest.TestMainBases.TestMain;
 import de.voomdoon.util.cli.MainBaseTest.TestMainBases.TestMainWithTwoSubPrograms;
 import de.voomdoon.util.cli.MainBaseTest.TestPrograms.InvalidTestProgramWithoutMainMethod;
 import de.voomdoon.util.cli.MainBaseTest.TestPrograms.ValidTestProgram;
 import de.voomdoon.util.cli.ProgramTest.HelpTestBase;
-import de.voomdoon.util.commons.SystemOutput;
 
 /**
  * Tests for {@link MainBase}.
@@ -238,9 +238,9 @@ void test_noArgs_printsHelp() throws Exception {
 			MainBase main = new TestMain();
 			main.init(new String[0]);
 
-			SystemOutput output = SystemOutput.run(() -> main.runProgram());
+			SystemPrintStreamCapturer output = SystemPrintStreamCapturer.run(() -> main.runProgram());
 
-			assertThat(output).extracting(SystemOutput::getOut).asString().contains("My-Main");
+			assertThat(output).extracting(SystemPrintStreamCapturer::getOut).asString().contains("My-Main");
 		}
 
 		/**

src/test/java/de/voomdoon/util/cli/ProgramTest.java

@@ -12,13 +12,13 @@
 import org.junit.jupiter.api.Test;
 
 import de.voomdoon.testing.logging.tests.LoggingCheckingTestBase;
+import de.voomdoon.testing.system.SystemPrintStreamCapturer;
 import de.voomdoon.testing.tests.TestBase;
 import de.voomdoon.util.cli.args.Arguments;
 import de.voomdoon.util.cli.args.exception.argument.MissingCliArgumentException;
 import de.voomdoon.util.cli.args.exception.option.CliOptionException;
 import de.voomdoon.util.cli.test.NoOpTestProgram;
 import de.voomdoon.util.cli.test.TestProgramWithOptionWithLongNameAndValue;
-import de.voomdoon.util.commons.SystemOutput;
 
 /**
  * Tests for {@link Program}.
@@ -174,11 +174,11 @@ AbstractStringAssert<?> initRunAndAssert(Class<? extends Program> clazz) throws
 				throw new RuntimeException("Error at 'initRunAndAssert': " + e.getMessage(), e);
 			}
 
-			SystemOutput output = SystemOutput.run(() -> program.runProgram());
+			SystemPrintStreamCapturer output = SystemPrintStreamCapturer.run(() -> program.runProgram());
 
 			output.log(logger);
 
-			return assertThat(output).extracting(SystemOutput::getOut).asString();
+			return assertThat(output).extracting(SystemPrintStreamCapturer::getOut).asString();
 		}
 	}