Streamline Test API - hide BQTestRuntime wrapper #142

* removing non-deamon runtime wrapper

bootique-test/src/main/java/io/bootique/test/BQDaemonTestRuntime.java

@@ -16,15 +16,16 @@
 /**
  * @since 0.13
  */
-public class BQDaemonTestRuntime extends BQTestRuntime {
+public class BQDaemonTestRuntime {
 
+    private BQRuntime runtime;
     private ExecutorService executor;
     private Function<BQDaemonTestRuntime, Boolean> startupCheck;
     private Optional<CommandOutcome> outcome;
 
-    public BQDaemonTestRuntime(BQRuntime runtime, InMemoryPrintStream stdout, InMemoryPrintStream stderr,
+    public BQDaemonTestRuntime(BQRuntime runtime,
                                Function<BQDaemonTestRuntime, Boolean> startupCheck) {
-        super(runtime, stdout, stderr);
+        this.runtime = runtime;
         this.startupCheck = startupCheck;
         this.executor = Executors.newCachedThreadPool();
         this.outcome = Optional.empty();
@@ -38,17 +39,21 @@ public Optional<CommandOutcome> getOutcome() {
         return outcome;
     }
 
+    public BQRuntime getRuntime() {
+        return runtime;
+    }
+
     public void start(long timeout, TimeUnit unit) {
         start();
         checkStartupSucceeded(timeout, unit);
     }
 
     protected void start() {
-        this.executor.submit(() -> outcome = Optional.of(run()));
+        this.executor.submit(() -> outcome = Optional.of(runtime.run()));
     }
 
     protected void checkStartupSucceeded(long timeout, TimeUnit unit) {
-        BootLogger logger = getRuntime().getBootLogger();
+        BootLogger logger = runtime.getBootLogger();
 
         Future<Boolean> startupFuture = executor.submit(() -> {
 
@@ -83,12 +88,11 @@ protected void checkStartupSucceeded(long timeout, TimeUnit unit) {
         }
     }
 
-    @Override
     public void stop() {
 
-        BootLogger logger = getRuntime().getBootLogger();
+        BootLogger logger = runtime.getBootLogger();
 
-        super.stop();
+        runtime.shutdown();
 
         // must interrupt execution (using "shutdown()" is not enough to stop
         // Jetty for instance

bootique-test/src/main/java/io/bootique/test/junit/BQDaemonTestFactory.java

@@ -1,10 +1,7 @@
 package io.bootique.test.junit;
 
 import io.bootique.BQRuntime;
-import io.bootique.log.BootLogger;
-import io.bootique.log.DefaultBootLogger;
 import io.bootique.test.BQDaemonTestRuntime;
-import io.bootique.test.InMemoryPrintStream;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.rules.ExternalResource;
@@ -135,14 +132,8 @@ public BQDaemonTestRuntime start(String... args) {
          */
         public BQDaemonTestRuntime start() {
 
-            InMemoryPrintStream stdout = new InMemoryPrintStream(System.out);
-            InMemoryPrintStream stderr = new InMemoryPrintStream(System.err);
-
-            // TODO: allow to turn off tracing, which can be either useful or annoying dependning on the context...
-            BootLogger bootLogger = new DefaultBootLogger(true, stdout, stderr);
-
-            BQRuntime runtime = bootique.bootLogger(bootLogger).createRuntime();
-            BQDaemonTestRuntime testRuntime = new BQDaemonTestRuntime(runtime, stdout, stderr, startupCheck);
+            BQRuntime runtime = bootique.createRuntime();
+            BQDaemonTestRuntime testRuntime = new BQDaemonTestRuntime(runtime, startupCheck);
             runtimes.add(testRuntime);
 
             testRuntime.start(startupTimeout, startupTimeoutTimeUnit);

bootique-test/src/main/java/io/bootique/test/junit/BQModuleProviderChecker.java

@@ -82,7 +82,7 @@ protected void testMetadata() {
 
         testWithFactory(testFactory -> {
             // must auto-load modules to ensure all tested module dependencies are present...
-            BQRuntime runtime = testFactory.app().autoLoadModules().createRuntime().getRuntime();
+            BQRuntime runtime = testFactory.app().autoLoadModules().createRuntime();
 
             BQModuleProvider provider = matchingProvider();
             String providerName = provider.name();

bootique-test/src/main/java/io/bootique/test/junit/BQTestFactory.java

@@ -2,8 +2,6 @@
 
 import io.bootique.BQRuntime;
 import io.bootique.config.ConfigurationFactory;
-import io.bootique.test.BQTestRuntime;
-import io.bootique.test.InMemoryPrintStream;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.rules.ExternalResource;
@@ -27,16 +25,16 @@
  */
 public class BQTestFactory extends ExternalResource {
 
-    private Collection<BQTestRuntime> runtimes;
+    private Collection<BQRuntime> runtimes;
 
     @Override
     protected void after() {
-        Collection<BQTestRuntime> localRuntimes = this.runtimes;
+        Collection<BQRuntime> localRuntimes = this.runtimes;
 
         if (localRuntimes != null) {
             localRuntimes.forEach(runtime -> {
                 try {
-                    runtime.stop();
+                    runtime.shutdown();
                 } catch (Exception e) {
                     // ignore...
                 }
@@ -68,39 +66,22 @@ public Builder app(String... args) {
 
     public static class Builder extends BQTestRuntimeBuilder<Builder> {
 
-        private Collection<BQTestRuntime> runtimes;
+        private Collection<BQRuntime> runtimes;
 
-        private Builder(Collection<BQTestRuntime> runtimes, String[] args) {
+        private Builder(Collection<BQRuntime> runtimes, String[] args) {
             super(args);
             this.runtimes = runtimes;
         }
 
         /**
-         * @param args arguments for the test stack app.
-         * @return a new instance of test runtime.
-         * @deprecated since 0.20 in favor of {@link #createRuntime()}.
-         */
-        @Deprecated
-        public BQTestRuntime build(String... args) {
-            bootique.args(args);
-            return createRuntime();
-        }
-
-        /**
-         * The main build method that creates and returns a {@link BQTestRuntime}, which is a thin wrapper for
-         * Bootique runtime.
+         * The main build method that creates and returns a {@link BQRuntime}.
          *
-         * @return a new instance of {@link BQTestRuntime} configured in this builder.
+         * @return a new instance of {@link BQRuntime} configured in this builder.
          */
-        public BQTestRuntime createRuntime() {
-
-            InMemoryPrintStream stdout = new InMemoryPrintStream(System.out);
-            InMemoryPrintStream stderr = new InMemoryPrintStream(System.err);
-
+        public BQRuntime createRuntime() {
             BQRuntime runtime = bootique.createRuntime();
-            BQTestRuntime testRuntime = new BQTestRuntime(runtime, stdout, stderr);
-            runtimes.add(testRuntime);
-            return testRuntime;
+            runtimes.add(runtime);
+            return runtime;
         }
     }
 }

bootique-test/src/test/java/io/bootique/test/junit/BQTestFactoryIT.java

@@ -2,19 +2,17 @@
 
 import com.google.inject.Inject;
 import io.bootique.BQCoreModule;
+import io.bootique.BQRuntime;
 import io.bootique.cli.Cli;
 import io.bootique.command.CommandOutcome;
 import io.bootique.command.CommandWithMetadata;
 import io.bootique.log.BootLogger;
 import io.bootique.meta.application.CommandMetadata;
-import io.bootique.test.BQTestRuntime;
 import io.bootique.test.TestIO;
 import org.junit.Rule;
 import org.junit.Test;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class BQTestFactoryIT {
 
@@ -23,22 +21,21 @@ public class BQTestFactoryIT {
 
     @Test
     public void testCreateRuntime_Injection() {
-        BQTestRuntime runtime = testFactory.app("-x").autoLoadModules().createRuntime();
-        assertArrayEquals(new String[]{"-x"}, runtime.getRuntime().getArgs());
+        BQRuntime runtime = testFactory.app("-x").autoLoadModules().createRuntime();
+        assertArrayEquals(new String[]{"-x"}, runtime.getArgs());
     }
 
     @Test
     public void testCreateRuntime_Streams_NoTrace() {
 
         TestIO io = TestIO.noTrace();
 
-        BQTestRuntime runtime = testFactory.app("-x")
+        CommandOutcome result = testFactory.app("-x")
                 .autoLoadModules()
                 .module(b -> BQCoreModule.extend(b).addCommand(XCommand.class))
                 .bootLogger(io.getBootLogger())
-                .createRuntime();
-
-        CommandOutcome result = runtime.run();
+                .createRuntime()
+                .run();
 
         assertTrue(result.isSuccess());
         assertEquals("--out--", io.getStdout().trim());