[maven-release-plugin] prepare release gclc-2.1.0

Signed-off-by: Emmanuel Bigeon <emmanuel@bigeon.fr>

.gitignore

@@ -0,0 +1,6 @@
+# maven files
+target/
+# Eclipse files
+.settings/
+.classpath
+.project

gclc-process/pom.xml

@@ -8,7 +8,7 @@
 
 	<groupId>net.bigeon.gclc</groupId>
 	<artifactId>process</artifactId>
-	<version>0.0.4</version>
+	<version>0.0.6-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>process</name>
@@ -37,7 +37,7 @@
 		</developer>
 	</developers>
 	<scm>
-		<tag>process-0.0.4</tag>
+		<tag>HEAD</tag>
 		<developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
 	</scm>
 	<properties>
@@ -49,7 +49,13 @@
 		<dependency>
 			<groupId>net.bigeon</groupId>
 			<artifactId>gclc</artifactId>
-			<version>2.0.11</version>
+			<version>2.0.12</version>
+		</dependency>
+		<dependency>
+			<groupId>net.bigeon.test</groupId>
+			<artifactId>junitmt</artifactId>
+			<version>1.0.2</version>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<reporting>

gclc-process/src/main/java/net/bigeon/gclc/process/io/ConnectingConsoleInput.java

@@ -68,12 +68,10 @@ package net.bigeon.gclc.process.io;
  * #L%
  */
 import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.function.Supplier;
 
 import net.bigeon.gclc.manager.ConsoleInput;
 import net.bigeon.gclc.tools.ConstantString;
-import net.bigeon.gclc.tools.StringProvider;
 
 /** A console input that can be connected to and diconnected from.
  * 
@@ -82,14 +80,11 @@ public final class ConnectingConsoleInput implements ConsoleInput {
 
     /** The empty string provider. */
     private static final ConstantString EMPTY_STRING = new ConstantString("");
-    /** The logger. */
-    private static final Logger         LOGGER       = Logger
-            .getLogger(ConnectingConsoleInput.class.getName());
 
     /** If the input is closed. */
     private boolean        close          = false;
     /** The prompt string. */
-    private StringProvider prompt         = EMPTY_STRING;
+    private Supplier<String> prompt         = EMPTY_STRING;
     /** If the input is currently in prompting state.
      * <p>
      * To change it you should be in a promptLock. */
@@ -120,15 +115,18 @@ public final class ConnectingConsoleInput implements ConsoleInput {
     public void connect(final ConsoleInput input) {
         disconnect();
         synchronized (promptLock) {
-            connected = input;
             promptLock.notifyAll();
+            synchronized (connectionLock) {
+                connected = input;
+                connectionLock.notifyAll();
+            }
         }
     }
 
     /** Disconnect the current input. */
     public void disconnect() {
-        synchronized (promptLock) {
-            synchronized (connectionLock) {
+        synchronized (connectionLock) {
+            synchronized (promptLock) {
                 if (connected != null) {
                     disconnection = true;
                     connected.interruptPrompt();
@@ -141,7 +139,7 @@ public final class ConnectingConsoleInput implements ConsoleInput {
     /* (non-Javadoc)
      * @see fr.bigeon.gclc.manager.ConsoleInput#getPrompt() */
     @Override
-    public StringProvider getPrompt() {
+    public Supplier<String> getPrompt() {
         return prompt;
     }
 
@@ -149,12 +147,15 @@ public final class ConnectingConsoleInput implements ConsoleInput {
      * @see fr.bigeon.gclc.manager.ConsoleInput#interruptPrompt() */
     @Override
     public void interruptPrompt() {
-        synchronized (promptLock) {
-            prompting = false;
-            if (connected != null) {
-                connected.interruptPrompt();
+        synchronized (connectionLock) {
+            synchronized (promptLock) {
+                connectionLock.notifyAll();
+                if (connected != null) {
+                    connected.interruptPrompt();
+                }
+                prompting = false;
+                promptLock.notifyAll();
             }
-            promptLock.notifyAll();
         }
     }
 
@@ -169,14 +170,14 @@ public final class ConnectingConsoleInput implements ConsoleInput {
      * @see fr.bigeon.gclc.manager.ConsoleInput#prompt() */
     @Override
     public String prompt() throws IOException {
-        return prompt(prompt.apply());
+        return prompt(prompt.get());
     }
 
     /* (non-Javadoc)
      * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(long) */
     @Override
     public String prompt(final long timeout) throws IOException {
-        return prompt(prompt.apply(), timeout);
+        return prompt(prompt.get(), timeout);
     }
 
     /* (non-Javadoc)
@@ -191,27 +192,23 @@ public final class ConnectingConsoleInput implements ConsoleInput {
                 if (!prompting) {
                     return null;
                 }
-                boolean connect;
-                synchronized (connectionLock) {
-                    connect = connected != null;
-                }
-                if (!connect) {
-                    try {
-                        promptLock.wait();
-                    } catch (final InterruptedException e) {
-                        LOGGER.log(Level.WARNING, "Inerruption of console thread", e);
-                        Thread.currentThread().interrupt();
-                    }
-                } else {
-                    synchronized (connectionLock) {
-                        final String res = connected.prompt(message);
-                        if (disconnection) {
-                            disconnection = false;
-                        } else if (prompting) {
-                            return res;
-                        } else {
-                            // prompt interrupted, lose the result.
-                        }
+            }
+            getConnection(0);
+            boolean connect;
+            ConsoleInput actualConnected;
+            synchronized (connectionLock) {
+                connect = connected != null;
+                actualConnected = connected;
+            }
+            if (connect) {
+                final String res = actualConnected.prompt(message);
+                synchronized (promptLock) {
+                    if (disconnection) {
+                        disconnection = false;
+                    } else if (prompting) {
+                        return res;
+                    } else {
+                        // prompt interrupted, lose the result.
                     }
                 }
             }
@@ -232,35 +229,46 @@ public final class ConnectingConsoleInput implements ConsoleInput {
         do {
             synchronized (promptLock) {
                 if (!prompting) {
-                    return null;
+                    break;
                 }
-                boolean connect;
-                synchronized (connectionLock) {
-                    connect = connected != null;
-                }
-                if (!connect) {
-                    try {
-                        promptLock.wait(timeout);
-                    } catch (final InterruptedException e) {
-                        LOGGER.log(Level.WARNING, "Inerruption of console thread", e);
-                        Thread.currentThread().interrupt();
-                    }
-                } else {
-                    synchronized (connectionLock) {
-                        final String res = connected.prompt(message,
-                                end - System.currentTimeMillis());
-                        if (disconnection) {
-                            disconnection = false;
-                        } else if (prompting) {
-                            return res;
-                        } else {
-                            // prompt interrupted, lose the result.
-                        }
+            }
+            getConnection(timeout);
+            boolean connect;
+            ConsoleInput actualConnected;
+            synchronized (connectionLock) {
+                connect = connected != null;
+                actualConnected = connected;
+            }
+            if (connect) {
+                synchronized (promptLock) {
+                    final String res = actualConnected.prompt(message,
+                            end - System.currentTimeMillis());
+                    if (disconnection) {
+                        disconnection = false;
+                    } else if (prompting) {
+                        return res;
+                    } else {
+                        // prompt interrupted, lose the result.
                     }
                 }
             }
         } while (System.currentTimeMillis() < end);
         return null;
+
+    }
+
+    private void getConnection(final long timeout) {
+        boolean connect;
+        synchronized (connectionLock) {
+            connect = connected != null;
+            if (!connect) {
+                try {
+                    connectionLock.wait(timeout);
+                } catch (final InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+            }
+        }
     }
 
     /* (non-Javadoc)
@@ -274,7 +282,7 @@ public final class ConnectingConsoleInput implements ConsoleInput {
      * @see fr.bigeon.gclc.manager.ConsoleInput#setPrompt(fr.bigeon.gclc.tools.
      * StringProvider) */
     @Override
-    public void setPrompt(final StringProvider string) {
+    public void setPrompt(final Supplier<String> string) {
         prompt = string;
     }
 }

gclc-process/src/test/java/net/bigeon/gclc/process/CommandForkTest.java

@@ -37,7 +37,7 @@ public class CommandForkTest {
      * {@link net.bigeon.gclc.process.CommandFork#execute(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, java.lang.String[])}.
      * 
      * @throws InvalidCommandName if the test init failed
-     * @throws CommandRunException */
+     * @throws CommandRunException if the command execution failed in the test */
     @Test
     public void testExecute() throws InvalidCommandName, CommandRunException {
         final TaskPool pool = new TaskPool(false);

gclc-process/src/test/java/net/bigeon/gclc/process/ForkTaskTest.java

@@ -46,6 +46,12 @@ public class ForkTaskTest {
 
         final Thread execThread = new Thread(task);
         execThread.start();
+        try {
+            execThread.join(100);
+        } catch (final InterruptedException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
 
         try (PipedConsoleOutput pco = new PipedConsoleOutput();
                 PipedConsoleInput pci = new PipedConsoleInput(null)) {

gclc-process/src/test/java/net/bigeon/gclc/process/ProcessAttachementTest.java

@@ -0,0 +1,34 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.process;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import net.bigeon.gclc.command.SubedCommand;
+import net.bigeon.gclc.exception.InvalidCommandName;
+
+/**
+ * @author Emmanuel Bigeon
+ *
+ */
+public class ProcessAttachementTest {
+
+    /** Test method for
+     * {@link net.bigeon.gclc.process.ProcessAttachement#attach(net.bigeon.gclc.command.ICommandProvider)}.
+     * 
+     * @throws InvalidCommandName if the command has already some subcommand that is
+     *         incompatible */
+    @Test
+    public void testAttach() throws InvalidCommandName {
+        final TaskPool pool = new TaskPool();
+        final ProcessAttachement attachement = new ProcessAttachement(pool);
+        final SubedCommand testPoint = new SubedCommand("test");
+        attachement.attach(testPoint);
+        assertNotNull("Commands should be added", testPoint.get("kill"));
+        assertNotNull("Commands should be added", testPoint.get("list"));
+    }
+
+}

gclc-process/src/test/java/net/bigeon/gclc/process/ProcessKillTest.java

@@ -7,8 +7,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
-import java.io.IOException;
-
 import org.junit.Test;
 
 import net.bigeon.gclc.exception.CommandRunException;
@@ -30,8 +28,7 @@ public class ProcessKillTest {
     /** Test method for
      * {@link net.bigeon.gclc.process.ProcessKill#execute(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, java.lang.String[])}.
      * 
-     * @throws CommandRunException if an error occured in test
-     * @throws IOException if an error occured with the console output */
+     * @throws CommandRunException if an error occured in test */
     @Test
     public void testExecute() throws CommandRunException {
         final TaskPool pool = new TaskPool();

gclc-process/src/test/java/net/bigeon/gclc/process/ScreenAttachementTest.java

@@ -0,0 +1,33 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.process;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import net.bigeon.gclc.command.SubedCommand;
+import net.bigeon.gclc.exception.InvalidCommandName;
+
+/** @author Emmanuel Bigeon */
+public class ScreenAttachementTest {
+
+    /** Test method for
+     * {@link net.bigeon.gclc.process.ScreenAttachement#attach(net.bigeon.gclc.command.ICommandProvider)}.
+     * 
+     * @throws InvalidCommandName if an error occured in attachement */
+    @Test
+    public void testAttach() throws InvalidCommandName {
+        final TaskPool pool = new TaskPool();
+        final ScreenAttachement attachement = new ScreenAttachement(pool, 15);
+        final SubedCommand testPoint = new SubedCommand("test");
+        attachement.attach(testPoint);
+        assertNotNull("Commands should be added", testPoint.get("terminate"));
+        assertNotNull("Commands should be added", testPoint.get("list"));
+        assertNotNull("Commands should be added", testPoint.get("clear"));
+        assertNotNull("Commands should be added", testPoint.get("fg"));
+        assertNotNull("Commands should be added", testPoint.get("fork"));
+    }
+
+}

gclc-process/src/test/java/net/bigeon/gclc/process/TaskSpawnerTest.java

@@ -0,0 +1,80 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.process;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.junit.Test;
+
+import net.bigeon.gclc.exception.CommandRunException;
+import net.bigeon.gclc.manager.ConsoleInput;
+import net.bigeon.gclc.manager.ConsoleOutput;
+
+/** @author Emmanuel Bigeon */
+public class TaskSpawnerTest {
+
+    /** Test method for
+     * {@link net.bigeon.gclc.process.TaskSpawner#execute(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, java.lang.String[])}.
+     * 
+     * @throws CommandRunException if an error occurred */
+    @Test
+    public void testExecute() throws CommandRunException {
+        final Task task = new Task() {
+            @Override
+            public void run() {
+                //
+            }
+            @Override
+            public void setRunning(final boolean running) {
+                //
+            }
+            @Override
+            public void rmInterruptionListener(final InterruptionListener listener) {
+                //
+            }
+            @Override
+            public boolean isRunning() {
+                return false;
+            }
+            @Override
+            public String getName() {
+                return "abc";
+            }
+            @Override
+            public void addInterruptionListener(final InterruptionListener listener) {
+                //
+            }
+        };
+        final TaskPool pool = new TaskPool();
+        assertTrue("Pool not empty", pool.getPIDs().isEmpty());
+        final ExecutorService service = Executors.newSingleThreadExecutor();
+        final TaskSpawner spawner = new TaskSpawner("name", pool, service) {
+
+            @Override
+            public String tip() {
+                return "tip";
+            }
+
+            @Override
+            protected String usageDetail() {
+                return "no details";
+            }
+
+            @Override
+            protected Task createTask(final ConsoleOutput out, final ConsoleInput in,
+                    final String... args) throws CommandRunException {
+                return task;
+            }
+        };
+        spawner.execute(null, null);
+        assertEquals("Added the task", 1, pool.getPIDs().size());
+        final Integer id = pool.getPIDs().iterator().next();
+        assertEquals("Added task is not the one", task, pool.get(id));
+    }
+
+}

gclc-process/src/test/java/net/bigeon/gclc/process/io/ConnectingConsoleInputTest.java

@@ -6,11 +6,20 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Test;
 
 import net.bigeon.gclc.tools.ConstantString;
 import net.bigeon.gclc.utils.PipedConsoleInput;
+import net.bigeon.gclc.utils.StreamConsoleInput;
+import net.bigeon.test.junitmt.ATestRunnable;
+import net.bigeon.test.junitmt.FunctionalTestRunnable;
+import net.bigeon.test.junitmt.TestFunction;
+import net.bigeon.test.junitmt.ThreadTest;
 
 public class ConnectingConsoleInputTest {
 
@@ -57,9 +66,72 @@ public class ConnectingConsoleInputTest {
         final ConnectingConsoleInput in = new ConnectingConsoleInput();
         in.setPrompt("test");
         assertEquals("Prompt should be set correctly", "test",
-                ((ConstantString) in.getPrompt()).apply());
+                ((ConstantString) in.getPrompt()).get());
         final ConstantString prompt = new ConstantString("other");
         in.setPrompt(prompt);
         assertEquals("Prompt should be set correctly", prompt, in.getPrompt());
     }
+
+    @Test
+    public void testPromptSequence() throws IOException, InterruptedException {
+        final ConnectingConsoleInput in = new ConnectingConsoleInput();
+        // Unconnected
+        final AtomicBoolean ended = new AtomicBoolean(false);
+        final TestFunction one = new TestFunction() {
+
+            @Override
+            public void apply() throws Exception {
+                assertNull("Interrupted should return null", in.prompt("m1", -1));
+                assertNull("Interrupted should return null", in.prompt("m2", 5000));
+                ended.set(true);
+                assertNull("Overtime should return null", in.prompt("m3", 200));
+            }
+        };
+        final ATestRunnable runnable = new FunctionalTestRunnable(one);
+        final Thread th = new Thread(runnable);
+        final Thread inter = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                while (!ended.get()) {
+                    try {
+                        th.join(500);
+                    } catch (final InterruptedException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                    in.interruptPrompt();
+                }
+            }
+        });
+        th.start();
+        inter.start();
+        ThreadTest.assertRuns(th, runnable);
+        inter.join();
+        ended.set(false);
+
+        final PipedOutputStream os = new PipedOutputStream();
+        final PipedInputStream pis = new PipedInputStream(os);
+        in.connect(new StreamConsoleInput(System.out, pis, StandardCharsets.UTF_8));
+        final ATestRunnable runnable2 = new FunctionalTestRunnable(one);
+        final Thread th2 = new Thread(runnable2);
+        final Thread inter2 = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                while (!ended.get()) {
+                    try {
+                        th2.join(500);
+                    } catch (final InterruptedException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                    in.interruptPrompt();
+                }
+            }
+        });
+        th2.start();
+        inter2.start();
+        ThreadTest.assertRuns(th2, runnable2);
+    }
 }

gclc-process/src/test/java/net/bigeon/gclc/process/mocks/ForkTaskMock.java

@@ -15,7 +15,7 @@ public class ForkTaskMock extends ForkTask implements Task {
 
     private int runCall = 0;
 
-    /** @param lines */
+    /** Default constructor. */
     public ForkTaskMock() {
         super(10);
     }

gclc-process/src/test/java/net/bigeon/gclc/process/mocks/TaskMock.java

@@ -49,8 +49,8 @@ public class TaskMock implements Task {
         setRunningCall = 0;
     }
 
-    /** @return */
-    public Object getNumberSetRunning() {
+    /** @return the number of calls to set running method */
+    public int getNumberSetRunning() {
         return setRunningCall;
     }
 

gclc-socket/pom.xml

@@ -7,7 +7,7 @@
 	</parent>
 	<groupId>net.bigeon.gclc</groupId>
 	<artifactId>socket</artifactId>
-	<version>1.1.13-SNAPSHOT</version>
+	<version>1.1.14-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>GCLC Socket</name>
 	<description>Socket implementation of GCLC</description>
@@ -40,14 +40,13 @@
 	</scm>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.scm.id>git.code.bigeon.net</project.scm.id>
 		<license.licenseName>cecill_2.1</license.licenseName>
 	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>net.bigeon</groupId>
 			<artifactId>gclc</artifactId>
-			<version>2.0.11</version>
+			<version>2.0.12</version>
 		</dependency>
 		<dependency>
 			<groupId>net.bigeon</groupId>

gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleInput.java

@@ -43,12 +43,12 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.bigeon.gclc.manager.ConsoleInput;
 import net.bigeon.gclc.tools.ConstantString;
-import net.bigeon.gclc.tools.StringProvider;
 import net.bigeon.gclc.utils.ReadingRunnable;
 
 /** A console input where the stream can be plugged.
@@ -75,7 +75,7 @@ public final class PluggableConsoleInput implements ConsoleInput {
     /** If the element is closed. */
     private boolean             closed      = false;
     /** The default prompt. */
-    private StringProvider      prompt      = new ConstantString("> "); //$NON-NLS-1$
+    private Supplier<String>    prompt      = new ConstantString("> "); //$NON-NLS-1$
     /** If the input is plugged or buffering. */
     private boolean             connected   = false;
     /** The current connexion (if any). */
@@ -146,7 +146,7 @@ public final class PluggableConsoleInput implements ConsoleInput {
     /* (non-Javadoc)
      * @see fr.bigeon.gclc.manager.ConsoleInput#getPrompt() */
     @Override
-    public StringProvider getPrompt() {
+    public Supplier<String> getPrompt() {
         return prompt;
     }
 
@@ -175,14 +175,14 @@ public final class PluggableConsoleInput implements ConsoleInput {
      * @see fr.bigeon.gclc.manager.ConsoleInput#prompt() */
     @Override
     public String prompt() throws IOException {
-        return prompt(prompt.apply());
+        return prompt(prompt.get());
     }
 
     /* (non-Javadoc)
      * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(long) */
     @Override
     public String prompt(final long timeout) throws IOException {
-        return prompt(prompt.apply(), timeout);
+        return prompt(prompt.get(), timeout);
     }
 
     /* (non-Javadoc)
@@ -264,7 +264,7 @@ public final class PluggableConsoleInput implements ConsoleInput {
      * @see net.bigeon.gclc.manager.ConsoleInput#setPrompt(net.bigeon.gclc.tools.
      * StringProvider) */
     @Override
-    public void setPrompt(final StringProvider prompt) {
+    public void setPrompt(final Supplier<String> prompt) {
         this.prompt = prompt;
     }
 

gclc-socket/src/test/java/net/bigeon/gclc/socket/PluggableConsoleInputTest.java

@@ -90,7 +90,7 @@ public class PluggableConsoleInputTest {
 
                 }
                 try {
-                    Object obj = new Object();
+                    final Object obj = new Object();
                     synchronized (obj) {
                             obj.wait(100);
                     }
@@ -115,7 +115,7 @@ public class PluggableConsoleInputTest {
             @Override
             public void run() {
                 try {
-                    Object obj = new Object();
+                    final Object obj = new Object();
                     synchronized (obj) {
                             obj.wait(200);
                     }
@@ -168,7 +168,7 @@ public class PluggableConsoleInputTest {
             });
             th.start();
 
-            Object obj = new Object();
+            final Object obj = new Object();
             synchronized (obj) {
                 while (!input.isPrompting()) {
                     obj.wait(10);
@@ -211,8 +211,8 @@ public class PluggableConsoleInputTest {
     @Test
     public final void testGetPrompt() {
         final PluggableConsoleInput input = new PluggableConsoleInput();
-        assertEquals("Default prompt invalid", "> ", input.getPrompt().apply());
+        assertEquals("Default prompt invalid", "> ", input.getPrompt().get());
         input.setPrompt("test");
-        assertEquals("Prompt setting failed", "test", input.getPrompt().apply());
+        assertEquals("Prompt setting failed", "test", input.getPrompt().get());
     }
 }

gclc-socket/src/test/java/net/bigeon/gclc/socket/SocketConsoleApplicationTest.java

@@ -43,6 +43,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.net.InetAddress;
 import java.net.Socket;
 import java.util.logging.Logger;
 
@@ -76,8 +77,8 @@ public class SocketConsoleApplicationTest {
     public void testIntegration() throws IOException, InterruptedException {
         Thread server;
         server = TestServer.getServer();
-        final String hostName = "127.0.0.1";
-        final int portNumber = 3300;
+        final InetAddress hostName = InetAddress.getLocalHost();
+        final int portNumber = TestServer.PORT;
 
         try (Socket kkSocket = new Socket(hostName, portNumber);
                 PrintWriter out = new PrintWriter(kkSocket.getOutputStream(), true);

gclc-socket/src/test/java/net/bigeon/gclc/socket/TestServer.java

@@ -46,7 +46,7 @@ import net.bigeon.gclc.ConsoleApplication;
 @SuppressWarnings({ "javadoc", "nls" })
 public class TestServer {
 
-    public static final int                      PORT = 3300;
+    public static final int                      PORT = 12343;
     private static SocketConsoleApplicationShell SHELL;
     private static ConnexionManager<Socket>      manager;
 
@@ -76,8 +76,7 @@ public class TestServer {
             input.setPrompt("> \n");
             output = new PluggableConsoleOutput();
             manager = new DConnexionManager<>();
-            SHELL = new SocketConsoleApplicationShell(PORT,
-                    InetAddress.getByName("127.0.0.1"));
+            SHELL = new SocketConsoleApplicationShell(PORT, InetAddress.getLocalHost());
             final ConsoleApplication app = ConsoleTestApplication.create(output, input,
                     manager);
             SHELL.setInterface(new SocketConsoleInterface(input, output));

gclc-swt/.gitignore

@@ -1,4 +0,0 @@
-/target/
-/.settings/
-/.classpath
-/.project

gclc-swt/pom.xml

@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>net.bigeon.config</groupId>
@@ -9,7 +7,7 @@
 	</parent>
 	<groupId>net.bigeon.gclc</groupId>
 	<artifactId>swt</artifactId>
-	<version>1.1.6-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>GCLC swt</name>
 	<description>A swt window for console applications</description>
@@ -50,13 +48,19 @@
 		<dependency>
 			<groupId>net.bigeon</groupId>
 			<artifactId>gclc</artifactId>
-			<version>2.0.11</version>
+			<version>2.0.12</version>
 		</dependency>
 		<dependency>
 			<groupId>net.bigeon</groupId>
 			<artifactId>collections</artifactId>
 			<version>1.1.6</version>
 		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>2.23.0</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<reporting>

gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleDelayIO.java

@@ -35,6 +35,8 @@
  */
 package net.bigeon.gclc.swt;
 
+import java.io.IOException;
+
 /*-
  * #%L
  * GCLC swt
@@ -86,6 +88,8 @@ public interface ConsoleDelayIO {
      * @param input the input to set */
     void setInput(String input);
 
-    /** Actually send the input as the prompt next input. */
-    void validateInput();
+    /** Actually send the input as the prompt next input.
+     * 
+     * @throws IOException if an error occurred */
+    void validateInput() throws IOException;
 }

gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleInputManager.java

@@ -0,0 +1,97 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
+import java.io.IOException;
+
+import org.eclipse.swt.widgets.Text;
+
+import net.bigeon.gclc.utils.PipedConsoleInput;
+
+/** The object managing the console input.
+ * 
+ * @author Emmanuel Bigeon */
+public final class ConsoleInputManager implements ConsoleDelayIO {
+
+    private final Text        text;
+    private PipedConsoleInput input;
+
+    /** Create a managing object.
+     * 
+     * @param text the text */
+    public ConsoleInputManager(final Text text) {
+        super();
+        this.text = text;
+    }
+
+    /* (non-Javadoc)
+     * @see net.bigeon.gclc.swt.ConsoleDelayIO#setInput(java.lang.String) */
+    @Override
+    public void setInput(final String string) {
+        text.setText(string);
+        text.setSelection(string.length());
+    }
+
+    /* (non-Javadoc)
+     * @see net.bigeon.gclc.swt.ConsoleDelayIO#getInput() */
+    @Override
+    public String getInput() {
+        return text.getText();
+    }
+
+    /* (non-Javadoc)
+     * @see net.bigeon.gclc.swt.ConsoleDelayIO#validateInput() */
+    @Override
+    public void validateInput() throws IOException {
+        input.type(text.getText());
+    }
+
+    /** Set the input to control.
+     * 
+     * @param input the input */
+    public void setManager(final PipedConsoleInput input) {
+        this.input = input;
+    }
+
+    /** Get the text component containing the currently set input.
+     * 
+     * @return the text */
+    public Text getText() {
+        return text;
+    }
+}

gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputDisplay.java

@@ -0,0 +1,50 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
+/** The common interface for console display.
+ * 
+ * @author Emmanuel Bigeon */
+public interface ConsoleOutputDisplay {
+
+    /** Append a line to the display.
+     * 
+     * @param m the line content */
+    void appendLine(String m);
+
+}

gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputManager.java

@@ -0,0 +1,186 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Widget;
+
+import net.bigeon.gclc.utils.AOutputForwardRunnable;
+import net.bigeon.gclc.utils.PipedConsoleOutput;
+
+/** The manager for console output to insert in a text.
+ * 
+ * @author Emmanuel Bigeon */
+public final class ConsoleOutputManager implements ConsoleOutputDisplay {
+    /** A runnable appending text to the content of a {@link Text} component.
+     * 
+     * @author Emmanuel Bigeon */
+    private static class TextAppendingRunnable implements Runnable {
+        /** The text to append on a line (possibly new). */
+        private final String next;
+        /** The {@link Text} component. */
+        private final Text   text;
+
+        /** Create the appending runnable.
+         * 
+         * @param text the component to update
+         * @param next the text to append */
+        public TextAppendingRunnable(final Text text, final String next) {
+            this.text = text;
+            this.next = next;
+        }
+
+        /* (non-Javadoc)
+         * @see java.lang.Runnable#run() */
+        @Override
+        public void run() {
+            final String initialText = text.getText();
+            if (initialText != null && !initialText.isEmpty()) {
+                text.append(System.lineSeparator());
+            }
+            text.append(next);
+        }
+    }
+
+    /** The local implementation of the forwarding runnable.
+     *
+     * @author Emmanuel Bigeon */
+    private static final class ToSWTConsoleForwardRunnable
+            extends AOutputForwardRunnable {
+        /** The running status. */
+        private boolean                    running = true;
+        /** The console output. */
+        private final PipedConsoleOutput   out;
+        /** The console output display. */
+        private final ConsoleOutputDisplay display;
+        /** The actual SWT component. */
+        private final Widget               element;
+
+        /** Create the forwarding runnable.
+         * 
+         * @param manager the manager
+         * @param display the display
+         * @param element the composite */
+        public ToSWTConsoleForwardRunnable(final PipedConsoleOutput manager,
+                                           final ConsoleOutputDisplay display,
+                                           final Widget element) {
+            super(manager);
+            out = manager;
+            this.display = display;
+            this.element = element;
+        }
+
+        /* (non-Javadoc)
+         * @see
+         * net.bigeon.gclc.utils.AOutputForwardRunnable#forwardLine(java.lang.String) */
+        @Override
+        protected void forwardLine(final String m) {
+            display.appendLine(m);
+        }
+
+        /* (non-Javadoc)
+         * @see net.bigeon.gclc.utils.AOutputForwardRunnable#isRunning() */
+        @Override
+        protected boolean isRunning() {
+            return running && !element.isDisposed();
+        }
+
+        /** Set the running status.
+         * 
+         * @param running the running to set */
+        public void setRunning(final boolean running) {
+            this.running = running;
+        }
+
+        /** Get the output.
+         * 
+         * @return the currently forwarded output */
+        public PipedConsoleOutput getOuput() {
+            return out;
+        }
+    }
+
+    /** The SWT component displaying the output content. */
+    private final Text                  text;
+    /** The forwarding runnable. */
+    private ToSWTConsoleForwardRunnable forward;
+    /** The forwarding thread. */
+    private Thread                      forwardThread;
+
+    /** Create the manager.
+     * 
+     * @param text the text to display the output in. */
+    public ConsoleOutputManager(final Text text) {
+        super();
+        this.text = text;
+    }
+
+    /* (non-Javadoc)
+     * @see net.bigeon.gclc.swt.ConsoleOutputDisplay#appendLine(java.lang.String) */
+    @Override
+    public void appendLine(final String next) {
+        text.getDisplay().syncExec(new TextAppendingRunnable(text, next));
+    }
+
+    /** Set the output.
+     *
+     * @param output the output to set */
+    public void setManager(final PipedConsoleOutput output) {
+        if (forward != null) {
+            if (forward.getOuput() == output) {
+                return;
+            }
+            forward.setRunning(false);
+        }
+        if (output == null) {
+            forward = null;
+            forwardThread = null;
+            return;
+        }
+        forward = new ToSWTConsoleForwardRunnable(output, this, text);
+        forwardThread = new Thread(forward, "gclcToSWT"); //$NON-NLS-1$
+        forwardThread.start();
+    }
+
+    /** Get the current thread forwarding the console output to the SWT components.
+     * 
+     * @return the forwardThread */
+    public Thread getForwardThread() {
+        return forwardThread;
+    }
+}

gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsolePromptManager.java

@@ -0,0 +1,91 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
+import java.io.BufferedReader;
+
+import org.eclipse.swt.widgets.Label;
+
+/** The manager for the console prompt updates.
+ * 
+ * @author Emmanuel Bigeon */
+public final class ConsolePromptManager {
+
+    /** The label to set the prompts at. */
+    private final Label label;
+
+    /** The current prompt reading runnable. */
+    private PromptReadingRunnable promptRead;
+
+    /** Create the manager.
+     * 
+     * @param label the label to update with prompts */
+    public ConsolePromptManager(final Label label) {
+        super();
+        this.label = label;
+    }
+
+    /** Set the prompt.
+     * <p>
+     * This method sets the prompt on the label as requested, without changing the
+     * actual prompt of the console input.
+     * 
+     * @param string the text */
+    public void setPrompt(final String string) {
+        label.setText(string);
+    }
+
+    /** Set the input to control.
+     * 
+     * @param promptStream the input */
+    public void setStream(final BufferedReader promptStream) {
+        if (promptRead != null) {
+            if (promptRead.getReader() == promptStream) {
+                return;
+            }
+            promptRead.setRunning(false);
+        }
+        if (promptStream == null) {
+            promptRead = null;
+            return;
+        }
+        promptRead = new PromptReadingRunnable(promptStream, label);
+        final Thread th = new Thread(promptRead, "Prompt To Label");
+        th.start();
+    }
+}

gclc-swt/src/main/java/net/bigeon/gclc/swt/HistoryTextKeyListener.java

@@ -35,6 +35,10 @@
  */
 package net.bigeon.gclc.swt;
 
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 /*-
  * #%L
  * GCLC swt
@@ -83,7 +87,9 @@ public final class HistoryTextKeyListener extends KeyAdapter {
     /** The size of commands history. */
     private static final int     DEFAULT_HISTORY_SIZE = 10;
     /** The empty string constant. */
-    private static final String  EMPTY                = ""; //$NON-NLS-1$
+    private static final String  EMPTY                = "";    //$NON-NLS-1$
+    private static final Logger  LOGGER               = Logger
+            .getLogger(HistoryTextKeyListener.class.getName());
     /** The history ribbon. */
     private final Ribbon<String> commands;
     /** The current index in history search. */
@@ -118,7 +124,11 @@ public final class HistoryTextKeyListener extends KeyAdapter {
             if (!input.isEmpty()) {
                 commands.add(input);
             }
-            console.validateInput();
+            try {
+                console.validateInput();
+            } catch (final IOException e) {
+                LOGGER.log(Level.SEVERE, "Unable to write to console", e);
+            }
             currentIndex = -1;
         }
 

gclc-swt/src/main/java/net/bigeon/gclc/swt/PromptReadingRunnable.java

@@ -0,0 +1,134 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.eclipse.swt.widgets.Label;
+
+/** The runnable forwarding prompts from a buffered input to a label.
+ * 
+ * @author Emmanuel Bigeon */
+public class PromptReadingRunnable implements Runnable {
+
+    /** The logger for this class. */
+    private static final Logger LOGGER = Logger
+            .getLogger(PromptReadingRunnable.class.getName());
+
+    /** The reader providing the succession of prompts */
+    private final BufferedReader reader;
+    /** The label. */
+    private final Label          view;
+    /** The running status. */
+    private boolean              running = true;
+
+    /** The updating runnable implementation.
+     * 
+     * @author Emmanuel Bigeon */
+    private static class LabelUpdater implements Runnable {
+        /** The label to update. */
+        private final Label  label;
+        /** The text to set. */
+        private final String content;
+
+        /** Create the updating runnable.
+         * 
+         * @param label the label
+         * @param content the content */
+        public LabelUpdater(final Label label, final String content) {
+            super();
+            this.label = label;
+            this.content = content;
+        }
+
+        /* (non-Javadoc)
+         * @see java.lang.Runnable#run() */
+        @Override
+        public void run() {
+            label.setText(content);
+        }
+    }
+
+    /** Create the prompt flow updating runnable.
+     * 
+     * @param reader the reader
+     * @param view the view to update on lines. */
+    public PromptReadingRunnable(final BufferedReader reader, final Label view) {
+        super();
+        this.reader = reader;
+        this.view = view;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Runnable#run() */
+    @Override
+    public void run() {
+        String prompt;
+        try {
+            while (isRunning() && (prompt = reader.readLine()) != null) {
+                view.getDisplay().syncExec(new LabelUpdater(view, prompt));
+            }
+        } catch (final IOException e) {
+            LOGGER.log(Level.INFO, "Prompt cannot be read, or was prematuraly closed", e);
+        }
+    }
+
+    /** Get the running state.
+     * 
+     * @return the running */
+    public synchronized boolean isRunning() {
+        return running;
+    }
+
+    /** Set the running state.
+     * 
+     * @param running the running to set */
+    public synchronized void setRunning(final boolean running) {
+        this.running = running;
+    }
+
+    /** Get the prompt flow.
+     * 
+     * @return the reader */
+    public BufferedReader getReader() {
+        return reader;
+    }
+}

gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java

@@ -30,11 +30,13 @@
  * knowledge of the CeCILL license and that you accept its terms.
  */
 /**
- * gclc-swt:net.bigeon.gclc.swt.SWTConsole.java
+ * gclc-swt:net.bigeon.gclc.swt.SWTConsoleShell.java
  * Created on: Apr 18, 2015
  */
 package net.bigeon.gclc.swt;
 
+import java.io.BufferedReader;
+
 /*-
  * #%L
  * GCLC swt
@@ -68,411 +70,75 @@ package net.bigeon.gclc.swt;
  * knowledge of the CeCILL license and that you accept its terms.
  * #L%
  */
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-import net.bigeon.gclc.ConsoleApplication;
-import net.bigeon.gclc.manager.ConsoleInput;
-import net.bigeon.gclc.manager.ConsoleOutput;
-import net.bigeon.gclc.tools.ConstantString;
-import net.bigeon.gclc.tools.StringProvider;
+import net.bigeon.gclc.utils.PipedConsoleInput;
+import net.bigeon.gclc.utils.PipedConsoleOutput;
 
-/** A SWT component to connect to gclc {@link ConsoleApplication}.
+/** A shell containing a {@link SWTConsoleView}
  * <p>
  *
  * @author Emmanuel Bigeon */
-public final class SWTConsole extends Composite
-        implements ConsoleDelayIO, ConsoleInput, ConsoleOutput {
-    private static final int    TWO                  = 2;
-    private static final String ERROR_SYNCHRO_PROMPT = "Error in synchronization of prompting";
-    /** The number of columns of the layout. */
-    private static final int    LAYOUT_NB_COLUMNS    = 2;
-    /** The cmd prefix in the output console. */
-    private static final String CMD_PREFIX           = "[CMD] ";                               //$NON-NLS-1$
-    /** The class logger. */
-    private static final Logger LOGGER               = Logger
-            .getLogger(SWTConsole.class.getName());
-    /** The empty string constant. */
-    private static final String EMPTY                = "";                                     //$NON-NLS-1$
+public final class SWTConsole extends Composite {
 
-    /** The console output text field. */
-    private final Text     consoleOutput;
-    /** The console input text field. */
-    private final Text     consoleInput;
-    /** The prompt label. */
-    private final Label    lblPromptlabel;
-    /** The prompt text. */
-    private StringProvider prompt     = new ConstantString("> "); //$NON-NLS-1$
-    /** The command entered by the user. */
-    private String         command    = null;
-    /** If the prompt should be active. */
-    private boolean        prompting  = false;
-    /** The object for thread synchronization with the prompt. */
-    private final Object   promptLock = new Object();
+    private ConsoleInputManager  inputManager;
+    private ConsoleOutputManager outputManager;
+    private ConsolePromptManager promptManager;
 
-    /** Create the composite.
+    /** Create the shell.
      *
-     * @param parent the prent composite
-     * @param style the composite style */
+     * @param parent the containing composite
+     * @param style the shell style */
     public SWTConsole(final Composite parent, final int style) {
         super(parent, style);
-
-        setLayout(new GridLayout(LAYOUT_NB_COLUMNS, false));
-
-        consoleOutput = new Text(this,
-                SWT.BORDER | SWT.READ_ONLY | SWT.WRAP | SWT.V_SCROLL | SWT.MULTI);
-        consoleOutput.setLayoutData(
-                new GridData(SWT.FILL, SWT.FILL, true, true, LAYOUT_NB_COLUMNS, 1));
-        consoleOutput.setRedraw(true);
-
-        lblPromptlabel = new Label(this, SWT.NONE);
-        lblPromptlabel.setText(prompt.apply());
-
-        consoleInput = new Text(this, SWT.BORDER);
-        consoleInput.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-        consoleInput.addKeyListener(new HistoryTextKeyListener(this));
-
+        setLayout(new GridLayout(2, false));
+        createContents();
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.swt.widgets.Composite#checkSubclass() */
-    @Override
-    protected void checkSubclass() {
-        // Disable the check that prevents subclassing of SWT components
+    /** Create contents of the shell. */
+    private void createContents() {
+        final Text output = new Text(this,
+                SWT.WRAP | SWT.READ_ONLY | SWT.MULTI | SWT.V_SCROLL);
+        output.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+        final Label prompt = new Label(this, SWT.NONE);
+        prompt.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+        final Text input = new Text(this, SWT.NONE);
+        input.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+
+        inputManager = new ConsoleInputManager(input);
+        outputManager = new ConsoleOutputManager(output);
+        promptManager = new ConsolePromptManager(prompt);
     }
 
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.manager.ConsoleManager#close() */
-    @Override
-    public void close() {
-        synchronized (promptLock) {
-            prompting = false;
-            promptLock.notifyAll();
-        }
-        if (consoleInput.isDisposed()) {
-            return;
-        }
-        consoleInput.setEnabled(false);
-        consoleOutput.setEnabled(false);
-    }
-
-    /* (non-Javadoc)
-     * @see net.bigeon.gclc.swt.ConsoleDelayIO#getInput() */
-    @Override
-    public String getInput() {
-        return consoleInput.getText();
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.ConsoleManager#getPrompt() */
-    @Override
-    public StringProvider getPrompt() {
-        return prompt;
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.manager.ConsoleManager#interruptPrompt() */
-    @Override
-    public void interruptPrompt() {
-        synchronized (promptLock) {
-            promptLock.notifyAll();
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.manager.ConsoleManager#isClosed() */
-    @Override
-    public boolean isClosed() {
-        return isDisposed();
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.ConsoleManager#print(java.lang.String) */
-    @Override
-    public void print(final String text) throws IOException {
-        if (isDisposed()) {
-            throw new IOException();
-        }
-        Display.getDefault().syncExec(new Runnable() {
-            @SuppressWarnings("synthetic-access")
-            @Override
-            public void run() {
-                if (!consoleOutput.isDisposed()) {
-                    consoleOutput.append(text);
-                }
-            }
-        });
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.ConsoleManager#println() */
-    @Override
-    public void println() throws IOException {
-        if (isDisposed()) {
-            throw new IOException();
-        }
-        Display.getDefault().syncExec(new Runnable() {
-            @SuppressWarnings("synthetic-access")
-            @Override
-            public void run() {
-                if (!consoleOutput.isDisposed()) {
-                    consoleOutput.append(System.lineSeparator());
-                }
-            }
-        });
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.ConsoleManager#println(java.lang.String) */
-    @Override
-    public void println(final String message) throws IOException {
-        if (isDisposed()) {
-            throw new IOException();
-        }
-        Display.getDefault().syncExec(new Runnable() {
-            @SuppressWarnings("synthetic-access")
-            @Override
-            public void run() {
-                if (!consoleOutput.isDisposed()) {
-                    consoleOutput.append(message + System.lineSeparator());
-                }
-            }
-        });
-
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.ConsoleManager#prompt() */
-    @Override
-    public String prompt() throws IOException {
-        synchronized (promptLock) {
-            initPrompt(prompt.apply());
-            promptLock.notifyAll();
-            try {
-                while (prompting) {
-                    promptLock.wait();
-                }
-            } catch (final InterruptedException e) {
-                LOGGER.log(Level.WARNING, ERROR_SYNCHRO_PROMPT, e);
-                command = null;
-                Thread.currentThread().interrupt();
-            }
-        }
-        if (isDisposed()) {
-            throw new IOException("Input closed"); //$NON-NLS-1$
-        }
-        return command;
-    }
-
-    /** Initialize the prompting.
+    /** Connect the console parts to the shell.
      * 
-     * @param message the prompt message
-     * @throws IOException if the console is disposed */
-    private void initPrompt(final String message) throws IOException {
-        if (isDisposed()) {
-            throw new IOException();
-        }
-        Display.getDefault().syncExec(new Runnable() {
-            @SuppressWarnings("synthetic-access")
-            @Override
-            public void run() {
-                if (!consoleOutput.isDisposed()) {
-                    lblPromptlabel.setText(message);
-                    // relayout
-                    SWTConsole.this.layout();
-                    consoleInput.setEnabled(true);
-                    consoleInput.setFocus();
-                }
-            }
-        });
-        prompting = true;
-        command = null;
+     * @param input the input
+     * @param output the output
+     * @param promptStream the stream where the prompts are forwarded. */
+    public void connect(final PipedConsoleInput input, final PipedConsoleOutput output,
+            final BufferedReader promptStream) {
+        inputManager.setManager(input);
+        outputManager.setManager(output);
+        promptManager.setStream(promptStream);
     }
 
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(long) */
-    @Override
-    public String prompt(final long timeout) throws IOException {
-        synchronized (promptLock) {
-            initPrompt(prompt.apply());
-            promptLock.notifyAll();
-            try {
-                waitPromptResolution(timeout);
-            } catch (final InterruptedException e) {
-                LOGGER.log(Level.WARNING, ERROR_SYNCHRO_PROMPT, e);
-                command = null;
-                Thread.currentThread().interrupt();
-            }
-        }
-        return command;
+    /** @return the inputManager */
+    public ConsoleInputManager getInputManager() {
+        return inputManager;
     }
 
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.ConsoleManager#prompt(java.lang.String) */
-    @Override
-    public String prompt(final String message) throws IOException {
-        synchronized (promptLock) {
-            initPrompt(message);
-            promptLock.notifyAll();
-            try {
-                while (prompting) {
-                    promptLock.wait();
-                }
-                if (isDisposed()) {
-                    throw new IOException();
-                }
-            } catch (final InterruptedException e) {
-                LOGGER.log(Level.WARNING, ERROR_SYNCHRO_PROMPT, e);
-                command = null;
-                Thread.currentThread().interrupt();
-            } finally {
-                resetPrompt();
-            }
-        }
-        return command;
+    /** @return the outputManager */
+    public ConsoleOutputManager getOutputManager() {
+        return outputManager;
     }
 
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(java.lang.String, long) */
-    @Override
-    public String prompt(final String message, final long timeout) throws IOException {
-        synchronized (promptLock) {
-            initPrompt(message);
-            promptLock.notifyAll();
-            try {
-                waitPromptResolution(timeout);
-            } catch (final InterruptedException e) {
-                LOGGER.log(Level.WARNING, ERROR_SYNCHRO_PROMPT, e);
-                command = null;
-                Thread.currentThread().interrupt();
-            } finally {
-                resetPrompt();
-            }
-        }
-        return command;
+    /** @return the promptManager */
+    public ConsolePromptManager getPromptManager() {
+        return promptManager;
     }
-
-    /** Wait the prompt resolution by user.
-     * 
-     * @param timeout the timeout for the wait
-     * @throws InterruptedException if the thread is interrupted
-     * @throws IOException if the console is disposed. */
-    private void waitPromptResolution(final long timeout)
-            throws InterruptedException, IOException {
-        final long start = System.currentTimeMillis();
-        long cur = start;
-        while (prompting && start + timeout > cur) {
-            promptLock.wait((cur - start - timeout) / TWO);
-            cur = System.currentTimeMillis();
-        }
-        if (isDisposed()) {
-            throw new IOException();
-        }
-    }
-
-    /** Reset the prompt message. */
-    private void resetPrompt() {
-        Display.getDefault().syncExec(new Runnable() {
-            @SuppressWarnings("synthetic-access")
-            @Override
-            public void run() {
-                if (!consoleOutput.isDisposed()) {
-                    lblPromptlabel.setText(prompt.apply());
-                    // relayout
-                    SWTConsole.this.layout();
-                }
-            }
-        });
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.swt.widgets.Composite#setFocus() */
-    @Override
-    public boolean setFocus() {
-        return consoleInput.setFocus();
-    }
-
-    /* (non-Javadoc)
-     * @see net.bigeon.gclc.swt.ConsoleDelayIO#setInput(java.lang.String) */
-    @Override
-    public void setInput(final String input) {
-        consoleInput.setText(input);
-        consoleInput.setSelection(input.length());
-    }
-
-    /* (non-Javadoc)
-     * @see net.bigeon.gclc.manager.ConsoleInput#setPrompt(java.lang.String) */
-    @Override
-    public void setPrompt(final String prompt) {
-        setPrompt(new ConstantString(prompt));
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.ConsoleManager#setPrompt(java.lang.String) */
-    @Override
-    public void setPrompt(final StringProvider prompt) {
-        this.prompt = prompt;
-        Display.getDefault().syncExec(new Runnable() {
-            @SuppressWarnings("synthetic-access")
-            @Override
-            public void run() {
-                if (!consoleOutput.isDisposed()) {
-                    lblPromptlabel.setText(prompt.apply());
-                    // relayout
-                    SWTConsole.this.layout();
-                }
-            }
-        });
-    }
-
-    /** Set the input text.
-     * 
-     * @param string the text */
-    public void setText(final String string) {
-        consoleInput.setText(string);
-    }
-
-    /* (non-Javadoc)
-     * @see net.bigeon.gclc.swt.ConsoleDelayIO#validateInput() */
-    @Override
-    public void validateInput() {
-        Display.getDefault().syncExec(new Runnable() {
-            @SuppressWarnings("synthetic-access")
-            @Override
-            public void run() {
-                consoleInput.setEnabled(false);
-            }
-        });
-        synchronized (promptLock) {
-            while (!prompting) {
-                try {
-                    promptLock.wait();
-                } catch (final InterruptedException e) {
-                    LOGGER.log(Level.SEVERE, "Interruption while waiting prompt", e); //$NON-NLS-1$
-                    Thread.currentThread().interrupt();
-                }
-            }
-            Display.getDefault().syncExec(new Runnable() {
-                @SuppressWarnings("synthetic-access")
-                @Override
-                public void run() {
-                    command = consoleInput.getText();
-                    prompting = false;
-                    consoleInput.setText(EMPTY);
-                    consoleOutput.append(CMD_PREFIX + command + System.lineSeparator());
-                }
-            });
-            promptLock.notifyAll();
-        }
-    }
-
 }

gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleShell.java

@@ -1,118 +0,0 @@
-/*
- * GCLC swt, provide a swt window for console applications
- * Copyright (C) 2015-2017 E. Bigeon
- * mailto:emmanuel@bigeon.fr
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software.  You can  use,
- * modify and/or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and  rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty  and the software's author,  the holder of the
- * economic rights,  and the successive licensors  have only  limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading,  using,  modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean  that it is complicated to manipulate,  and  that  also
- * therefore means  that it is reserved for developers  and  experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and,  more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-/**
- * gclc-swt:net.bigeon.gclc.swt.SWTConsoleShell.java
- * Created on: Apr 18, 2015
- */
-package net.bigeon.gclc.swt;
-
-/*-
- * #%L
- * GCLC swt
- * %%
- * Copyright (C) 2015 - 2018 Bigeon
- * %%
- * This software is governed by the CeCILL  license under French law and
- * abiding by the rules of distribution of free software.  You can  use,
- * modify and/ or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and  rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty  and the software's author,  the holder of the
- * economic rights,  and the successive licensors  have only  limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading,  using,  modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean  that it is complicated to manipulate,  and  that  also
- * therefore means  that it is reserved for developers  and  experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and,  more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- * #L%
- */
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-/** A shell containing a {@link SWTConsole}
- * <p>
- *
- * @author Emmanuel Bigeon */
-public final class SWTConsoleShell extends Shell {
-
-    /** The console component */
-    private SWTConsole console;
-
-    /** Create the shell.
-     *
-     * @param display the display */
-    public SWTConsoleShell(final Display display, final int style) {
-        super(display, style);
-        setLayout(new FillLayout(SWT.HORIZONTAL));
-
-        createContents();
-    }
-
-    @Override
-    protected void checkSubclass() {
-        // Disable the check that prevents subclassing of SWT components
-    }
-
-    /** Create contents of the shell. */
-    private void createContents() {
-        console = new SWTConsole(this, SWT.NONE);
-        setText("Console Application"); //$NON-NLS-1$
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.swt.widgets.Shell#dispose() */
-    @Override
-    public void dispose() {
-        super.dispose();
-        console.close();
-    }
-
-    /** @return the input and output. */
-    public SWTConsole getManager() {
-        return console;
-    }
-}

gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java

@@ -68,66 +68,25 @@ package net.bigeon.gclc.swt;
  * knowledge of the CeCILL license and that you accept its terms.
  * #L%
  */
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Text;
 
 import net.bigeon.gclc.ConsoleApplication;
-import net.bigeon.gclc.utils.AOutputForwardRunnable;
 import net.bigeon.gclc.utils.PipedConsoleInput;
 import net.bigeon.gclc.utils.PipedConsoleOutput;
 
-/** A SWT component to connect to gclc {@link ConsoleApplication}
- * <p>
+/** A SWT component to connect to gclc {@link ConsoleApplication}.
  *
  * @author Emmanuel Bigeon */
-public final class SWTConsoleView extends Composite implements ConsoleDelayIO {
-    /** The local implementation of the forwarding runnable
-     *
-     * @author Emmanuel Bigeon */
-    private final class ToSWTConsoleForwardRunnable extends AOutputForwardRunnable {
-        /** The running status */
-        private boolean running = true;
-
-        /** @param manager the manager */
-        public ToSWTConsoleForwardRunnable(final PipedConsoleOutput manager) {
-            super(manager);
-        }
-
-        @Override
-        protected void forwardLine(final String m) {
-            appendConsoleOutput(System.lineSeparator() + m);
-        }
-
-        @Override
-        protected boolean isRunning() {
-            return running && !isDisposed();
-        }
-
-        /** @param running the running to set */
-        public void setRunning(final boolean running) {
-            this.running = running;
-        }
-    }
-
-    /** The class logger */
-    private static final Logger         LOGGER = Logger
-            .getLogger(SWTConsoleView.class.getName());
-    /** The console output text field */
-    private final Text                  consoleOutput;
-    /** The console input text field */
-    private final Text                  consoleInput;
-    /** The input. */
-    private PipedConsoleInput           input;
-    /** The forwarding runnable */
-    private ToSWTConsoleForwardRunnable forward;
+public final class SWTConsoleView extends Composite {
+    /** The input manager. */
+    private final ConsoleInputManager  inManager;
+    /** The output manager. */
+    private final ConsoleOutputManager outManager;
 
     /** Create the composite.
      *
@@ -138,52 +97,23 @@ public final class SWTConsoleView extends Composite implements ConsoleDelayIO {
 
         setLayout(new GridLayout(1, false));
 
-        consoleOutput = new Text(this,
+        final Text consoleOutput = new Text(this,
                 SWT.BORDER | SWT.READ_ONLY | SWT.WRAP | SWT.V_SCROLL | SWT.MULTI);
         consoleOutput.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
         consoleOutput.setRedraw(true);
+        outManager = new ConsoleOutputManager(consoleOutput);
 
-        consoleInput = new Text(this, SWT.BORDER);
+        final Text consoleInput = new Text(this, SWT.BORDER);
         consoleInput.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-        consoleInput.addKeyListener(new HistoryTextKeyListener(this));
-    }
-
-    /** @param next the next message */
-    public void appendConsoleOutput(final String next) {
-        Display.getDefault().syncExec(new Runnable() {
-            @SuppressWarnings("synthetic-access")
-            @Override
-            public void run() {
-                consoleOutput.append(next);
-            }
-        });
-    }
-
-    @Override
-    protected void checkSubclass() {
-        // Disable the check that prevents subclassing of SWT components
-    }
-
-    /* (non-Javadoc)
-     * @see net.bigeon.gclc.swt.ConsoleDelayIO#getInput() */
-    @Override
-    public String getInput() {
-        return consoleInput.getText();
+        inManager = new ConsoleInputManager(consoleInput);
+        consoleInput.addKeyListener(new HistoryTextKeyListener(inManager));
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.swt.widgets.Composite#setFocus() */
     @Override
     public boolean setFocus() {
-        return consoleInput.setFocus();
-    }
-
-    /* (non-Javadoc)
-     * @see net.bigeon.gclc.swt.ConsoleDelayIO#setInput(java.lang.String) */
-    @Override
-    public void setInput(final String input) {
-        consoleInput.setText(input);
-        consoleInput.setSelection(input.length());
+        return inManager.getText().setFocus();
     }
 
     /** Set the input and output.
@@ -192,29 +122,21 @@ public final class SWTConsoleView extends Composite implements ConsoleDelayIO {
      * @param input the input */
     public void setManager(final PipedConsoleOutput manager,
             final PipedConsoleInput input) {
-        this.input = input;
-        if (forward != null) {
-            forward.setRunning(false);
-        }
-        forward = new ToSWTConsoleForwardRunnable(manager);
-        final Thread th = new Thread(forward, "gclcToSWT"); //$NON-NLS-1$
-        th.start();
+        outManager.setManager(manager);
+        inManager.setManager(input);
     }
 
-    /** @param string the text */
-    public void setText(final String string) {
-        consoleInput.setText(string);
-    }
-
-    /**
+    /** Get the manager of console input.
      * 
-     */
-    @Override
-    public void validateInput() {
-        try {
-            input.type(getInput());
-        } catch (final IOException e) {
-            LOGGER.log(Level.SEVERE, "Unable to input value to console", e); //$NON-NLS-1$
-        }
+     * @return the input manager */
+    public ConsoleInputManager getInputManager() {
+        return inManager;
+    }
+
+    /** Get the manager of console output.
+     * 
+     * @return the output manager */
+    public ConsoleOutputManager getOutputManager() {
+        return outManager;
     }
 }

gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleInputManagerTest.java

@@ -0,0 +1,119 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+
+import org.eclipse.swt.widgets.Text;
+import org.junit.Test;
+
+import net.bigeon.gclc.utils.PipedConsoleInput;
+
+/** @author Emmanuel Bigeon */
+public class ConsoleInputManagerTest {
+
+    private final Text                text = mock(Text.class);
+    private final ConsoleInputManager cim  = new ConsoleInputManager(text);
+
+    /** Test method for
+     * {@link net.bigeon.gclc.swt.ConsoleInputManager#setInput(java.lang.String)}. */
+    @Test
+    public void testSetText() {
+        cim.setInput("Text");
+        verify(text).setText("Text");
+    }
+
+    /** Test method for
+     * {@link net.bigeon.gclc.swt.ConsoleInputManager#validateInput()}.
+     * 
+     * @throws IOException if an error occurred */
+    @Test
+    public void testValidateInput() throws IOException {
+        // Expected calls
+        when(text.getText()).thenReturn("abc");
+
+        try {
+            cim.validateInput();
+            fail("No input should cause exception for input validation");
+        } catch (final Exception e) {
+            // ok
+        }
+        final PipedConsoleInput input = mock(PipedConsoleInput.class);
+        cim.setManager(input);
+
+        cim.validateInput();
+        verify(input).type("abc");
+    }
+
+    @Test
+    public void testValidateInputWithError() throws IOException {
+        final PipedConsoleInput input = mock(PipedConsoleInput.class);
+        cim.setManager(input);
+        // Expected calls
+        when(text.getText()).thenReturn("abc");
+        doThrow(new IOException()).when(input).type("abc");
+
+        try {
+            cim.validateInput();
+            fail("IO exception should be forwarded");
+        } catch (final IOException e) {
+            // ok
+        }
+    }
+
+    /** Test method for
+     * {@link net.bigeon.gclc.swt.ConsoleInputManager#getText()}. */
+    @Test
+    public void testGetText() {
+        assertEquals("Text component should be preserved", text, cim.getText());
+    }
+
+    @Test
+    public void testGetInput() {
+        when(text.getText()).thenReturn("abc");
+        assertEquals("Text component should be preserved", "abc", cim.getInput());
+    }
+
+}

gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleOutputManagerTest.java

@@ -0,0 +1,105 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Text;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import net.bigeon.gclc.utils.PipedConsoleOutput;
+
+/** @author Emmanuel Bigeon */
+public class ConsoleOutputManagerTest {
+    private final Text                 text    = mock(Text.class);
+    private final ConsoleOutputManager com     = new ConsoleOutputManager(text);
+    private final Display              display = mock(Display.class);
+    {
+        when(text.getDisplay()).thenReturn(display);
+        doAnswer(new Answer<Object>() {
+            /* (non-Javadoc)
+             * @see
+             * org.mockito.stubbing.Answer#answer(org.mockito.invocation.InvocationOnMock) */
+            @Override
+            public Object answer(final InvocationOnMock invocation) throws Throwable {
+                final Runnable runnable = invocation.getArgument(0);
+                runnable.run();
+                return null;
+            }
+        }).when(display).syncExec(any(Runnable.class));
+    }
+
+    /** Test method for
+     * {@link net.bigeon.gclc.swt.ConsoleOutputManager#appendLine(java.lang.String)}. */
+    @Test
+    public void testAppendConsoleOutput() {
+        when(text.getText()).thenReturn("", "abc",
+                "abc" + System.lineSeparator() + "def");
+        com.appendLine("abc");
+        verify(text).append("abc");
+        com.appendLine("def");
+        verify(text).append(System.lineSeparator());
+        verify(text).append("def");
+    }
+
+    @Test
+    public void testSetManager() throws IOException, InterruptedException {
+        final PipedConsoleOutput output = mock(PipedConsoleOutput.class);
+        com.setManager(output);
+        com.setManager(output);
+
+        try (PipedConsoleOutput output2 = new PipedConsoleOutput()) {
+            com.setManager(output2);
+            output2.println("line");
+            final Thread forwardThread = com.getForwardThread();
+            forwardThread.join(500);
+            com.setManager(null);
+            forwardThread.join();
+            verify(text).append("line");
+        }
+    }
+}

gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsolePromptManagerTest.java

@@ -0,0 +1,81 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import java.io.BufferedReader;
+
+import org.eclipse.swt.widgets.Label;
+import org.junit.Test;
+
+/**
+ * @author Emmanuel Bigeon
+ *
+ */
+public class ConsolePromptManagerTest {
+
+    private final Label label = mock(Label.class);
+
+    private final ConsolePromptManager manager = new ConsolePromptManager(label);
+
+    /**
+     * Test method for {@link net.bigeon.gclc.swt.ConsolePromptManager#setPrompt(java.lang.String)}.
+     */
+    @Test
+    public void testSetPrompt() {
+        manager.setPrompt("abc");
+        verify(label).setText("abc");
+    }
+
+    /**
+     * Test method for {@link net.bigeon.gclc.swt.ConsolePromptManager#setStream(java.io.BufferedReader)}.
+     */
+    @Test
+    public void testSetStream() {
+        BufferedReader output = mock(BufferedReader.class);
+        manager.setStream(output);
+        manager.setStream(output);
+        output = mock(BufferedReader.class);
+        manager.setStream(output);
+        manager.setStream(null);
+        manager.setStream(output);
+    }
+
+}

gclc-swt/src/test/java/net/bigeon/gclc/swt/HistoryTextKeyListenerTest.java

@@ -69,8 +69,10 @@ package net.bigeon.gclc.swt;
  * #L%
  */
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyEvent;
 import org.junit.Test;
 
 /**
@@ -84,7 +86,7 @@ public class HistoryTextKeyListenerTest {
      * {@link net.bigeon.gclc.swt.HistoryTextKeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)}. */
     @Test
     public final void testKeyPressedKeyEvent() {
-        ConsoleDelayIO io = new ConsoleDelayIO() {
+        final ConsoleDelayIO io = new ConsoleDelayIO() {
             private String input = "";
 
             @Override
@@ -93,7 +95,7 @@ public class HistoryTextKeyListenerTest {
             }
 
             @Override
-            public void setInput(String input) {
+            public void setInput(final String input) {
                 this.input = input;
             }
 
@@ -102,7 +104,7 @@ public class HistoryTextKeyListenerTest {
                 input = "";
             }
         };
-        HistoryTextKeyListener listener = new HistoryTextKeyListener(io);
+        final HistoryTextKeyListener listener = new HistoryTextKeyListener(io);
 
         // no effects
         assertEquals("", io.getInput());
@@ -139,4 +141,12 @@ public class HistoryTextKeyListenerTest {
         assertEquals("cmd arg2", io.getInput());
     }
 
+    @Test
+    public void testKeyPressed() {
+        final ConsoleDelayIO io = mock(ConsoleDelayIO.class);
+        final KeyEvent event = mock(KeyEvent.class);
+        event.keyCode = 'a';
+        final HistoryTextKeyListener listener = new HistoryTextKeyListener(io);
+        listener.keyPressed(event);
+    }
 }

gclc-swt/src/test/java/net/bigeon/gclc/swt/PromptReadingRunnableTest.java

@@ -0,0 +1,105 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+/** @author Emmanuel Bigeon */
+public class PromptReadingRunnableTest {
+    private final Label   view    = mock(Label.class);
+    private final Display display = mock(Display.class);
+    {
+        when(view.getDisplay()).thenReturn(display);
+        doAnswer(new Answer<Object>() {
+            /* (non-Javadoc)
+             * @see
+             * org.mockito.stubbing.Answer#answer(org.mockito.invocation.InvocationOnMock) */
+            @Override
+            public Object answer(final InvocationOnMock invocation) throws Throwable {
+                final Runnable runnable = invocation.getArgument(0);
+                runnable.run();
+                return null;
+            }
+        }).when(display).syncExec(any(Runnable.class));
+    }
+
+    /** Test method for {@link net.bigeon.gclc.swt.PromptReadingRunnable#run()}.
+     * 
+     * @throws IOException if an error occurred */
+    @Test
+    public void testRun() throws IOException {
+        final BufferedReader reader = mock(BufferedReader.class);
+        when(reader.readLine()).thenReturn("abc", "def", null);
+
+        final PromptReadingRunnable runnable = new PromptReadingRunnable(reader, view);
+
+        runnable.run();
+    }
+
+    /** Test method for {@link net.bigeon.gclc.swt.PromptReadingRunnable#run()}.
+     * 
+     * @throws IOException if an error occurred */
+    @Test
+    public void testRunWithIO() throws IOException {
+        final BufferedReader reader = mock(BufferedReader.class);
+        when(reader.readLine()).thenThrow(new IOException());
+
+        final PromptReadingRunnable runnable = new PromptReadingRunnable(reader, view);
+        final Logger logger = Logger.getLogger(PromptReadingRunnable.class.getName());
+        final Level back = logger.getLevel();
+        logger.setLevel(Level.OFF);
+
+        runnable.run();
+        logger.setLevel(back);
+    }
+
+}

gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java

@@ -1,37 +1,5 @@
-/*
- * GCLC swt, provide a swt window for console applications
- * Copyright (C) 2015-2017 E. Bigeon
- * mailto:emmanuel@bigeon.fr
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software.  You can  use,
- * modify and/or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and  rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty  and the software's author,  the holder of the
- * economic rights,  and the successive licensors  have only  limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading,  using,  modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean  that it is complicated to manipulate,  and  that  also
- * therefore means  that it is reserved for developers  and  experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and,  more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
 /**
- * gclc-swt:net.bigeon.gclc.swt.SWTConsoleShellTest.java
- * Created on: Jun 8, 2016
+ * 
  */
 package net.bigeon.gclc.swt;
 
@@ -68,299 +36,37 @@ package net.bigeon.gclc.swt;
  * knowledge of the CeCILL license and that you accept its terms.
  * #L%
  */
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
-import java.io.IOException;
+import static org.junit.Assert.assertNotNull;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
 import org.junit.Test;
 
-import net.bigeon.gclc.ConsoleApplication;
-import net.bigeon.gclc.command.Command;
-import net.bigeon.gclc.command.base.ExitCommand;
-import net.bigeon.gclc.exception.CommandRunException;
-import net.bigeon.gclc.exception.InvalidCommandName;
-import net.bigeon.gclc.manager.ConsoleInput;
-import net.bigeon.gclc.manager.ConsoleOutput;
-
-/**
- * <p>
- * TODO
- *
- * @author Emmanuel Bigeon */
-@SuppressWarnings({ "javadoc", "static-method", "nls", "deprecation" })
+/** @author Emmanuel Bigeon */
 public class SWTConsoleShellTest {
 
-    protected static final long  TWO_SECONDS = 2000;
-    private static final Display DISPLAY     = Display.getDefault();
-
+    /** Test method for
+     * {@link net.bigeon.gclc.swt.SWTConsole#SWTConsole(Composite, int)}. */
     @Test
-    public void testGeneric() {
-        final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY, SWT.SHELL_TRIM);
-        final SWTConsole swtConsole = shell.getManager();
-        try {
-            final ConsoleApplication appl = new ConsoleApplication(swtConsole, swtConsole,
-                    "Hello", "See you");
-            appl.add(new ExitCommand("exit", appl));
-            appl.add(new Command("long") {
-
-                /* (non-Javadoc)
-                 * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.
-                 * manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput,
-                 * java.lang.String[]) */
-                @Override
-                public void execute(final ConsoleOutput out, final ConsoleInput in,
-                        final String... args) throws CommandRunException {
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (final InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                }
-
-                @Override
-                public String tip() {
-                    return "a long running command";
-                }
-
-                /* (non-Javadoc)
-                 * @see fr.bigeon.gclc.command.Command#usageDetail() */
-                @Override
-                protected String usageDetail() {
-                    // TODO Auto-generated method stub
-                    // return null;
-                    throw new RuntimeException("Not implemented yet");
-                }
-            });
-// shell.pack();
-            shell.open();
-            shell.setVisible(false);
-            final Thread applThread = new Thread(new Runnable() {
-
-                @Override
-                public void run() {
-                    appl.start();
-                }
-            });
-            final Thread testThread = new Thread(new Runnable() {
-
-                @Override
-                public void run() {
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (final InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                    Display.getDefault().syncExec(new Runnable() {
-                        @Override
-                        public void run() {
-                            swtConsole.setText("test"); //$NON-NLS-1$
-                            swtConsole.validateInput();
-                        }
-                    });
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (final InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                    Display.getDefault().syncExec(new Runnable() {
-                        @Override
-                        public void run() {
-                            shell.dispose();
-                        }
-                    });
-                }
-            });
-            applThread.start();
-            testThread.start();
-            while (!shell.isDisposed()) {
-                if (!DISPLAY.readAndDispatch()) {
-                    DISPLAY.sleep();
-                }
-            }
-// DISPLAY.dispose();
-            assertTrue(swtConsole.isClosed());
-            Thread.sleep(TWO_SECONDS);
-            assertFalse(appl.isRunning());
-        } catch (final InvalidCommandName e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (final InterruptedException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
+    public void testSWTConsoleShell() {
+        final SWTConsole console = new SWTConsole(new Shell(), SWT.NONE);
+        assertNotNull("View should be initialized with managers",
+                console.getInputManager());
+        assertNotNull("View should be initialized with managers",
+                console.getOutputManager());
+        assertNotNull("View should be initialized with managers",
+                console.getPromptManager());
     }
 
+    /** Test method for
+     * {@link net.bigeon.gclc.swt.SWTConsole#connect(net.bigeon.gclc.utils.PipedConsoleInput, net.bigeon.gclc.utils.PipedConsoleOutput, java.io.BufferedReader)}. */
     @Test
-    public void testConsoleClose() {
-        final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY, SWT.SHELL_TRIM);
-        final SWTConsole swtConsole = shell.getManager();
-        swtConsole.close();
-        swtConsole.setPrompt(":");
-        try {
-            final ConsoleApplication appl = new ConsoleApplication(swtConsole, swtConsole,
-                    "Hello", "See you");
-            appl.add(new ExitCommand("exit", appl));
-            appl.add(new Command("long") {
-                /* (non-Javadoc)
-                 * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.
-                 * manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput,
-                 * java.lang.String[]) */
-                @Override
-                public void execute(final ConsoleOutput out, final ConsoleInput in,
-                        final String... args) throws CommandRunException {
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (final InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                }
-
-                @Override
-                public String tip() {
-                    return "a long running command";
-                }
-
-                /* (non-Javadoc)
-                 * @see fr.bigeon.gclc.command.Command#usageDetail() */
-                @Override
-                protected String usageDetail() {
-                    // TODO Auto-generated method stub
-                    // return null;
-                    throw new RuntimeException("Not implemented yet");
-                }
-            });
-            appl.add(new Command("test") {
-                /* (non-Javadoc)
-                 * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.
-                 * manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput,
-                 * java.lang.String[]) */
-                @Override
-                public void execute(final ConsoleOutput out, final ConsoleInput in,
-                        final String... args) throws CommandRunException {
-                    try {
-                        swtConsole.prompt("Test");
-                    } catch (final IOException e) {
-                        throw new CommandRunException("No input", e);
-                    }
-                }
-
-                @Override
-                public String tip() {
-                    return "a prompting running command";
-                }
-
-                /* (non-Javadoc)
-                 * @see fr.bigeon.gclc.command.Command#usageDetail() */
-                @Override
-                protected String usageDetail() {
-                    // TODO Auto-generated method stub
-                    // return null;
-                    throw new RuntimeException("Not implemented yet");
-                }
-            });
-// shell.pack();
-            shell.open();
-            shell.setVisible(false);
-            final Thread applThread = new Thread(new Runnable() {
-
-                @Override
-                public void run() {
-                    appl.start();
-                }
-            });
-            final Thread testThread = new Thread(new Runnable() {
-
-                @Override
-                public void run() {
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (final InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                    Display.getDefault().syncExec(new Runnable() {
-                        @Override
-                        public void run() {
-                            swtConsole.setText("test"); //$NON-NLS-1$
-                            swtConsole.validateInput();
-                        }
-                    });
-                    Display.getDefault().syncExec(new Runnable() {
-                        @Override
-                        public void run() {
-                            swtConsole.setText("ok"); //$NON-NLS-1$
-                        }
-                    });
-                    swtConsole.validateInput();
-                    Display.getDefault().syncExec(new Runnable() {
-                        @Override
-                        public void run() {
-                            swtConsole.setText("long"); //$NON-NLS-1$
-                        }
-                    });
-                    swtConsole.validateInput();
-                    Display.getDefault().syncExec(new Runnable() {
-                        @Override
-                        public void run() {
-                            swtConsole.setText("test"); //$NON-NLS-1$
-                        }
-                    });
-                    swtConsole.validateInput();
-                    Display.getDefault().syncExec(new Runnable() {
-                        @Override
-                        public void run() {
-                            swtConsole.setText("test"); //$NON-NLS-1$
-                        }
-                    });
-                    swtConsole.validateInput();
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (final InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                    Display.getDefault().syncExec(new Runnable() {
-                        @Override
-                        public void run() {
-                            shell.dispose();
-                        }
-                    });
-
-                }
-            });
-            applThread.start();
-            testThread.start();
-            while (!shell.isDisposed()) {
-                if (!DISPLAY.readAndDispatch()) {
-                    DISPLAY.sleep();
-                }
-            }
-            swtConsole.setPrompt(">");
-            try {
-                swtConsole.prompt();
-                fail("Prompting when closed should fail!");
-            } catch (final IOException e) {
-                assertNotNull(e);
-            }
-// DISPLAY.dispose();
-            assertTrue(swtConsole.isClosed());
-            Thread.sleep(TWO_SECONDS);
-            assertFalse(appl.isRunning());
-        } catch (final InvalidCommandName e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (final InterruptedException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
+    public void testConnect() {
+        final SWTConsole console = new SWTConsole(new Shell(), SWT.NONE);
+        // Disconnection should work.
+        console.connect(null, null, null);
     }
+
 }

gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java

@@ -1,37 +1,5 @@
-/*
- * GCLC swt, provide a swt window for console applications
- * Copyright (C) 2015-2017 E. Bigeon
- * mailto:emmanuel@bigeon.fr
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software.  You can  use,
- * modify and/or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and  rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty  and the software's author,  the holder of the
- * economic rights,  and the successive licensors  have only  limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading,  using,  modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean  that it is complicated to manipulate,  and  that  also
- * therefore means  that it is reserved for developers  and  experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and,  more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
 /**
- * gclc-swt:net.bigeon.gclc.swt.SWTConsoleShellTest.java
- * Created on: Jun 8, 2016
+ * 
  */
 package net.bigeon.gclc.swt;
 
@@ -68,137 +36,40 @@ package net.bigeon.gclc.swt;
  * knowledge of the CeCILL license and that you accept its terms.
  * #L%
  */
-import static org.junit.Assert.assertNull;
 
-import java.io.IOException;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.junit.Test;
 
-import net.bigeon.gclc.ConsoleApplication;
-import net.bigeon.gclc.command.Command;
-import net.bigeon.gclc.command.base.ExitCommand;
-import net.bigeon.gclc.exception.CommandRunException;
-import net.bigeon.gclc.exception.InvalidCommandName;
-import net.bigeon.gclc.manager.ConsoleInput;
-import net.bigeon.gclc.manager.ConsoleOutput;
-import net.bigeon.gclc.utils.PipedConsoleInput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
-
-/**
- * <p>
- * TODO
- *
- * @author Emmanuel Bigeon */
-@SuppressWarnings({ "javadoc", "static-method", "nls", "deprecation" })
+/** @author Emmanuel Bigeon */
 public class SWTConsoleViewTest {
 
-    protected static final long  TWO_SECONDS = 2000;
-    private static final Display DISPLAY     = Display.getDefault();
-
+    /** Test method for {@link net.bigeon.gclc.swt.SWTConsoleView#setFocus()}. */
     @Test
-    public void testGeneric() {
-        final Shell shell = new Shell(DISPLAY);
-        final SWTConsoleView swtConsole = new SWTConsoleView(shell, SWT.NONE);
-        try (PipedConsoleOutput manager = new PipedConsoleOutput();
-                PipedConsoleInput input = new PipedConsoleInput(System.out)) {
-            swtConsole.setManager(manager, input);
-        } catch (final IOException e2) {
-            assertNull(e2);
-        }
-        try (PipedConsoleOutput manager = new PipedConsoleOutput();
-                PipedConsoleInput input = new PipedConsoleInput(System.out)) {
-            swtConsole.setManager(manager, input);
-            final ConsoleApplication appl = new ConsoleApplication(manager, input,
-                    "Hello", "See you");
-            appl.add(new ExitCommand("exit", appl));
-            appl.add(new Command("long") {
+    public void testSetFocus() {
+        final SWTConsoleView view = new SWTConsoleView(new Shell(), SWT.NONE);
+        assertFalse("Non visible component set focus should fail", view.setFocus());
+    }
 
-                /* (non-Javadoc)
-                 * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.manager.
-                 * ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput,
-                 * java.lang.String[]) */
-                @Override
-                public void execute(final ConsoleOutput out, final ConsoleInput in,
-                        final String... args) throws CommandRunException {
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (final InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                }
+    /** Test method for
+     * {@link net.bigeon.gclc.swt.SWTConsoleView#SWTConsoleView(org.eclipse.swt.widgets.Composite, int)}. */
+    @Test
+    public void testSWTConsoleView() {
+        final SWTConsoleView view = new SWTConsoleView(new Shell(), SWT.NONE);
+        assertNotNull("View should be initialized with managers", view.getInputManager());
+        assertNotNull("View should be initialized with managers",
+                view.getOutputManager());
+    }
 
-                @Override
-                public String tip() {
-                    return "a long running command";
-                }
-
-                /* (non-Javadoc)
-                 * @see fr.bigeon.gclc.command.Command#usageDetail() */
-                @Override
-                protected String usageDetail() {
-                    // TODO Auto-generated method stub
-                    // return null;
-                    throw new RuntimeException("Not implemented yet");
-                }
-            });
-// shell.pack();
-            shell.open();
-            shell.setVisible(false);
-            final Thread applThread = new Thread(new Runnable() {
-
-                @Override
-                public void run() {
-                    appl.start();
-                }
-            });
-            final Thread testThread = new Thread(new Runnable() {
-
-                @Override
-                public void run() {
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (final InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                    Display.getDefault().syncExec(new Runnable() {
-                        @Override
-                        public void run() {
-                            swtConsole.setText("test"); //$NON-NLS-1$
-                            swtConsole.validateInput();
-                        }
-                    });
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (final InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                    Display.getDefault().syncExec(new Runnable() {
-                        @Override
-                        public void run() {
-                            shell.dispose();
-                        }
-                    });
-                }
-            });
-            applThread.start();
-            testThread.start();
-            while (!shell.isDisposed()) {
-                if (!DISPLAY.readAndDispatch()) {
-                    DISPLAY.sleep();
-                }
-            }
-        } catch (final InvalidCommandName e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (final IOException e1) {
-            // TODO Auto-generated catch block
-            e1.printStackTrace();
-        }
+    /** Test method for
+     * {@link net.bigeon.gclc.swt.SWTConsoleView#setManager(net.bigeon.gclc.utils.PipedConsoleOutput, net.bigeon.gclc.utils.PipedConsoleInput)}. */
+    @Test
+    public void testSetManager() {
+        final SWTConsoleView view = new SWTConsoleView(new Shell(), SWT.NONE);
+        // Disconnection should work.
+        view.setManager(null, null);
     }
 }

gclc-swt/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -0,0 +1 @@
+mock-maker-inline

gclc-test/pom.xml

@@ -0,0 +1,79 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>net.bigeon.config</groupId>
+		<artifactId>ebigeon-config</artifactId>
+		<version>1.8.21</version>
+	</parent>
+	<groupId>net.bigeon.gclc</groupId>
+	<artifactId>test</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>GCLC Tests</name>
+	<description>Test utilities for GCLC applications and extensions</description>
+	<inceptionYear>2018</inceptionYear>
+	<organization>
+		<name>Bigeon</name>
+		<url>https://bigeon.net</url>
+	</organization>
+	<licenses>
+		<license>
+			<distribution>manual</distribution>
+			<name>CeCILL 2.1</name>
+			<url>https://cecill.info/licences/Licence_CeCILL_V2.1-en.html</url>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<email>emmanuel@bigeon.fr</email>
+			<name>Emmanuel Bigeon</name>
+			<url>bigeon.net</url>
+			<roles>
+				<role>PM</role>
+			</roles>
+		</developer>
+	</developers>
+	<scm>
+		<developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
+		<tag>HEAD</tag>
+	</scm>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<license.licenseName>cecill_2.1</license.licenseName>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>net.bigeon</groupId>
+			<artifactId>gclc</artifactId>
+			<version>2.0.12</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
+		<dependency>
+			<groupId>net.bigeon.test</groupId>
+			<artifactId>junitmt</artifactId>
+			<version>1.0.2</version>
+		</dependency>
+	</dependencies>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.3</version>
+			</plugin>
+			<plugin>
+				<groupId>com.github.sevntu-checkstyle</groupId>
+				<artifactId>dsm-maven-plugin</artifactId>
+				<version>2.2.0</version>
+			</plugin>
+		</plugins>
+	</reporting>
+</project>

gclc-test/src/main/java/net/bigeon/gclc/test/InputContract.java

@@ -0,0 +1,62 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.util.function.Supplier;
+
+import net.bigeon.gclc.manager.ConsoleInput;
+import net.bigeon.test.junitmt.FunctionalTestRunnable;
+import net.bigeon.test.junitmt.TestFunction;
+import net.bigeon.test.junitmt.ThreadTest;
+
+/** @author Emmanuel Bigeon */
+public final class InputContract {
+
+    public void testInputContract(final Supplier<ConsoleInput> inputs)
+            throws IOException, InterruptedException {
+        // Test close contract
+        final ConsoleInput input = inputs.get();
+        assertFalse("An input should not initially be closed", input.isClosed());
+        input.close();
+        assertTrue("An input should close", input.isClosed());
+        input.close();
+        assertTrue("A closed input should stay closed", input.isClosed());
+        try {
+            input.prompt();
+            fail("Closed input prompting should fail");
+        } catch (final IOException e) {
+            // ok
+        }
+
+        // Test interruption contract
+        final ConsoleInput input2 = inputs.get();
+        final FunctionalTestRunnable prompting = new FunctionalTestRunnable(
+                new TestFunction() {
+
+                    @Override
+                    public void apply() throws Exception {
+                        try {
+                            input2.prompt();
+                            fail("Interrupted prompt should throw INterruptedIOException");
+                        } catch (final InterruptedIOException e) {
+                            // ok
+                        }
+                    }
+                });
+        final Thread th = new Thread(prompting);
+        th.start();
+// while (!input2.isPrompting()) {
+        th.join(200);
+//
+// }
+        input2.interruptPrompt();
+        ThreadTest.assertRuns(th, prompting);
+    }
+}

gclc.system/pom.xml

@@ -50,6 +50,12 @@
 			<artifactId>gclc</artifactId>
 			<version>2.0.11</version>
 		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>2.23.0</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

gclc.system/src/main/java/net/bigeon/gclc/system/ForwardingRunnable.java

@@ -63,6 +63,7 @@ public final class ForwardingRunnable implements Runnable {
     private final ConsoleOutput out;
     /** The input stream. */
     private final InputStream   is;
+    private Exception           error;
 
     /** Create the runnable.
      * 
@@ -78,22 +79,23 @@ public final class ForwardingRunnable implements Runnable {
     @Override
     public void run() {
         try {
-            readToEnd(out, is);
-            is.close();
+            readToEnd();
         } catch (final CommandRunException e) {
             LOGGER.log(Level.WARNING, "Manager was closed in the meantime...", e); //$NON-NLS-1$
-        } catch (final IOException e) {
-            LOGGER.log(Level.WARNING, "Input stream was closed...", e); //$NON-NLS-1$
+            setError(e);
         }
     }
 
     /** Read the input until its end.
+     * <p>
+     * This method actually perform a loop on the input stream to read the next
+     * character and then print int on the screen.
+     * <p>
+     * When the stream returns a negative value, it will exit its loop and return.
      * 
-     * @param is the input stream
      * @throws CommandRunException if the manager was closed while writing the
      *         stream */
-    private static void readToEnd(final ConsoleOutput out, final InputStream is)
-            throws CommandRunException {
+    private void readToEnd() throws CommandRunException {
         int c;
         try {
             while ((c = is.read()) >= 0) {
@@ -102,6 +104,7 @@ public final class ForwardingRunnable implements Runnable {
             }
         } catch (final IOException e) {
             LOGGER.log(Level.INFO, "input stream reading failed", e); //$NON-NLS-1$
+            setError(e);
         }
     }
 
@@ -141,4 +144,22 @@ public final class ForwardingRunnable implements Runnable {
     public static Thread connect(final InputStream stream, final ConsoleOutput output) {
         return connect(stream, output, "Forwarding");
     }
+
+    /** Get the error in this runnable execution if any.
+     * <p>
+     * In the current implementation, this error can be an {@link IOException} if
+     * the input stream failed or a {@link CommandRunException} if the output was
+     * closed.
+     * 
+     * @return the error */
+    public synchronized Exception getError() {
+        return error;
+    }
+
+    /** Set the error that caused this runnable to stop executing.
+     * 
+     * @param error the error to set */
+    private synchronized void setError(final Exception error) {
+        this.error = error;
+    }
 }

gclc.system/src/test/java/net/bigeon/gclc/system/ExecSystemCommandTest.java

@@ -59,7 +59,7 @@ public class ExecSystemCommandTest {
 
     /** Test the execution of the command.
      * 
-     * @throws CommandRunException */
+     * @throws CommandRunException if the command fails */
     @Test
     public void testExecute() throws CommandRunException {
         final ConsoleOutput out = SinkOutput.INSTANCE;

gclc.system/src/test/java/net/bigeon/gclc/system/ForwardingRunnableTest.java

@@ -0,0 +1,44 @@
+/**
+ * 
+ */
+package net.bigeon.gclc.system;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import net.bigeon.gclc.exception.CommandRunException;
+import net.bigeon.gclc.utils.SinkOutput;
+import net.bigeon.gclc.utils.StreamConsoleOutput;
+
+/** @author Emmanuel Bigeon */
+public class ForwardingRunnableTest {
+
+    public void testClosedOutput() {
+        final StreamConsoleOutput out = new StreamConsoleOutput();
+        out.close();
+        final InputStream is = new ByteArrayInputStream(new byte[] { 1, 2, 3 });
+        final ForwardingRunnable runnable = new ForwardingRunnable(out, is);
+        // Runnable should close immediatly.
+        runnable.run();
+
+        assertTrue("Error should be a CommandRunException",
+                runnable.getError() instanceof CommandRunException);
+    }
+
+    @Test
+    public void testIOInInput() throws IOException {
+        final InputStream is = Mockito.mock(InputStream.class);
+        Mockito.when(is.read()).thenThrow(new IOException());
+        final ForwardingRunnable runnable = new ForwardingRunnable(SinkOutput.INSTANCE,
+                is);
+        // Runnable should close immediatly.
+        runnable.run();
+        assertTrue("Error should be an IO", runnable.getError() instanceof IOException);
+    }
+}

gclc/pom.xml

@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>net.bigeon</groupId>
 	<artifactId>gclc</artifactId>
-	<version>2.0.12-SNAPSHOT</version>
+	<version>2.1.0</version>
 	<packaging>jar</packaging>
 	<name>Generic Command Ligne console</name>
 	<description>A generic framework for console applications, with customized command input and output streams.</description>
@@ -37,7 +37,7 @@
 	</developers>
 	<scm>
 		<developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>gclc-2.1.0</tag>
 	</scm>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>net.bigeon.test</groupId>
 			<artifactId>junitmt</artifactId>
-			<version>1.0.0</version>
+			<version>1.0.2</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

gclc/src/main/java/net/bigeon/gclc/ConsoleApplication.java

@@ -95,8 +95,8 @@ import net.bigeon.gclc.manager.ConsoleOutput;
  * A typical use case is the following:
  *
  * <pre>
- * {@link ConsoleOutput} out = new {@link net.bigeon.gclc.utils.StreamConsoleOutput StreamConsoleOutput}();
- * {@link ConsoleInput} in = new {@link net.bigeon.gclc.utils.StreamConsoleInput StreamConsoleInput}();
+ * {@link ConsoleOutput} out = new {@link net.bigeon.gclc.manager.StreamConsoleOutput StreamConsoleOutput}();
+ * {@link ConsoleInput} in = new {@link net.bigeon.gclc.manager.StreamConsoleInput StreamConsoleInput}();
  * {@link ConsoleApplication} app = new {@link ConsoleApplication}(out, in, "welcome", "see you latter")};
  * app.{@link ConsoleApplication#add(ICommand) add}("my_command", new {@link ICommand MyCommand()});
  * app.{@link ConsoleApplication#start() start()};

gclc/src/main/java/net/bigeon/gclc/command/ParametrizedCommand.java

@@ -116,8 +116,7 @@ public abstract class ParametrizedCommand extends Command {
      * @param flag the boolean flag
      * @throws InvalidParameterException if the parameter is already defined as a
      *         string parameter */
-    protected final void addBooleanParameter(final String flag)
-            throws InvalidParameterException {
+    protected final void addBooleanParameter(final String flag) {
         data.addBooleanParameter(flag);
     }
 
@@ -127,8 +126,7 @@ public abstract class ParametrizedCommand extends Command {
      * @param needed if the parameter's absence should cause an exception
      * @throws InvalidParameterException if the parameter is already defined as a
      *         boolean parameter */
-    protected final void addStringParameter(final String flag, final boolean needed)
-            throws InvalidParameterException {
+    protected final void addStringParameter(final String flag, final boolean needed) {
         data.addStringParameter(flag, needed);
     }
 

gclc/src/main/java/net/bigeon/gclc/command/ParametrizedCommandData.java

@@ -85,7 +85,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import net.bigeon.gclc.exception.CommandParsingException;
 import net.bigeon.gclc.exception.InvalidParameterException;
 import net.bigeon.gclc.manager.ConsoleInput;
-import net.bigeon.gclc.utils.EmptyInput;
+import net.bigeon.gclc.manager.EmptyInput;
 
 /** An object to handle standardized command parameters.
  *
@@ -120,7 +120,7 @@ public final class ParametrizedCommandData {
      * @param flag the boolean flag
      * @throws InvalidParameterException if the parameter is already defined as a
      *         string parameter */
-    public void addBooleanParameter(final String flag) throws InvalidParameterException {
+    public void addBooleanParameter(final String flag) {
         if (params.containsKey(flag) && stringParams.containsKey(flag)) {
             throw new InvalidParameterException("Parameter is already defined as string"); //$NON-NLS-1$
         }
@@ -134,8 +134,7 @@ public final class ParametrizedCommandData {
      * @param needed if the parameter's absence should cause an exception
      * @throws InvalidParameterException if the parameter is already defined as a
      *         boolean parameter */
-    public void addStringParameter(final String flag, final boolean needed)
-            throws InvalidParameterException {
+    public void addStringParameter(final String flag, final boolean needed) {
         if (params.containsKey(flag)) {
             checkParam(flag, needed);
             return;
@@ -149,9 +148,8 @@ public final class ParametrizedCommandData {
      * @param param the string parameter
      * @param needed if the parameter is needed
      * @throws InvalidParameterException if the new definition is invalid */
-    private void checkParam(final String param, final boolean needed)
-            throws InvalidParameterException {
-        Boolean val = stringParams.get(param);
+    private void checkParam(final String param, final boolean needed) {
+        final Boolean val = stringParams.get(param);
         if (val != null) {
             final Boolean need = Boolean.valueOf(needed || val.booleanValue());
             stringParams.put(param, need);
@@ -217,7 +215,7 @@ public final class ParametrizedCommandData {
      * @param param the parameter name
      * @return if the parameter is needed */
     public boolean isNeeded(final String param) {
-        Boolean val = params.get(param);
+        final Boolean val = params.get(param);
         return val != null && val.booleanValue();
     }
 

gclc/src/main/java/net/bigeon/gclc/command/base/EchoCommand.java

@@ -34,6 +34,39 @@
  */
 package net.bigeon.gclc.command.base;
 
+/*-
+ * #%L
+ * Generic Command Ligne console
+ * %%
+ * Copyright (C) 2014 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.Arrays;

gclc/src/main/java/net/bigeon/gclc/exception/CommandParsingException.java

@@ -74,7 +74,7 @@ package net.bigeon.gclc.exception;
 /** An exception raised during command parsing.
  *
  * @author Emmanuel Bigeon */
-public class CommandParsingException extends Exception {
+public final class CommandParsingException extends Exception {
 
     /** svuid. */
     private static final long serialVersionUID = 1L;

gclc/src/main/java/net/bigeon/gclc/exception/InvalidCommandName.java

@@ -75,7 +75,7 @@ package net.bigeon.gclc.exception;
  * the command is already used.
  *
  * @author Emmanuel BIGEON */
-public class InvalidCommandName extends Exception {
+public final class InvalidCommandName extends Exception {
 
     /** the SVUID. */
     private static final long serialVersionUID = 1L;

gclc/src/main/java/net/bigeon/gclc/exception/InvalidParameterException.java

@@ -75,7 +75,7 @@ package net.bigeon.gclc.exception;
  * parameter definition.
  *
  * @author Emmanuel Bigeon */
-public class InvalidParameterException extends Exception {
+public final class InvalidParameterException extends RuntimeException {
 
     /** the SVUID. */
     private static final long serialVersionUID = 1L;

gclc/src/main/java/net/bigeon/gclc/manager/ConsoleInput.java

@@ -73,8 +73,7 @@ package net.bigeon.gclc.manager;
  */
 import java.io.IOException;
 import java.io.InterruptedIOException;
-
-import net.bigeon.gclc.tools.StringProvider;
+import java.util.function.Supplier;
 
 /** A console application input.
  *
@@ -90,13 +89,12 @@ public interface ConsoleInput extends AutoCloseable {
     /** Get the prompt string.
      *
      * @return the prompt prefix */
-    StringProvider getPrompt();
+    Supplier<String> getPrompt();
 
     /** Indicate to the input that is should interrompt the prompting, if possible.
      * <p>
      * The pending {@link #prompt()} or {@link #prompt(String)} operations should
-     * return immediatly. However the returned value can be anything (from the
-     * partial prompt content to an empty string or even a null pointer). */
+     * return immediately by throwing an InterruptedIOException. */
     void interruptPrompt();
 
     /** Test if the input is closed.
@@ -148,5 +146,5 @@ public interface ConsoleInput extends AutoCloseable {
     /** Set the prompting string.
      *
      * @param string the prompt string */
-    void setPrompt(StringProvider string);
+    void setPrompt(Supplier<String> string);
 }

gclc/src/main/java/net/bigeon/gclc/manager/EmptyInput.java

@@ -36,9 +36,9 @@
  * gclc:net.bigeon.gclc.manager.EmptyInput.java
  * Created on: Nov 13, 2017
  */
-package net.bigeon.gclc.utils;
+package net.bigeon.gclc.manager;
 
-import net.bigeon.gclc.manager.ConsoleInput;
+import java.util.function.Supplier;
 
 /*-
  * #%L
@@ -75,7 +75,6 @@ import net.bigeon.gclc.manager.ConsoleInput;
  */
 
 import net.bigeon.gclc.tools.ConstantString;
-import net.bigeon.gclc.tools.StringProvider;
 
 /** A console input that return empty to all prompting.
  *
@@ -101,8 +100,8 @@ public final class EmptyInput implements ConsoleInput {
     /* (non-Javadoc)
      * @see net.bigeon.gclc.manager.ConsoleInput#getPrompt() */
     @Override
-    public StringProvider getPrompt() {
-        return CONSTANT_STRING; //$NON-NLS-1$
+    public Supplier<String> getPrompt() {
+        return CONSTANT_STRING; 
     }
 
     /* (non-Javadoc)
@@ -155,7 +154,7 @@ public final class EmptyInput implements ConsoleInput {
     }
 
     @Override
-    public void setPrompt(StringProvider string) {
+    public void setPrompt(final Supplier<String> string) {
         //
     }
 }

gclc/src/main/java/net/bigeon/gclc/manager/PipedConsoleInput.java

@@ -36,7 +36,7 @@
  * gclc-test:net.bigeon.gclc.test.TestConsoleManager.java
  * Created on: Nov 18, 2016
  */
-package net.bigeon.gclc.utils;
+package net.bigeon.gclc.manager;
 
 /*-
  * #%L
@@ -76,9 +76,9 @@ import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
+import java.util.function.Supplier;
 
-import net.bigeon.gclc.manager.ConsoleInput;
-import net.bigeon.gclc.tools.StringProvider;
+import net.bigeon.gclc.utils.WritingRunnable;
 
 /** This console input allows to enter commands and retrieve the output as an
  * input.
@@ -120,7 +120,7 @@ public final class PipedConsoleInput implements ConsoleInput {
     }
 
     @Override
-    public StringProvider getPrompt() {
+    public Supplier<String> getPrompt() {
         return innerManager.getPrompt();
     }
 
@@ -174,7 +174,7 @@ public final class PipedConsoleInput implements ConsoleInput {
     }
 
     @Override
-    public void setPrompt(StringProvider string) {
+    public void setPrompt(final Supplier<String> string) {
         innerManager.setPrompt(string);
     }
 

gclc/src/main/java/net/bigeon/gclc/manager/PipedConsoleOutput.java

@@ -36,7 +36,7 @@
  * gclc-test:net.bigeon.gclc.test.TestConsoleManager.java
  * Created on: Nov 18, 2016
  */
-package net.bigeon.gclc.utils;
+package net.bigeon.gclc.manager;
 
 /*-
  * #%L
@@ -79,7 +79,7 @@ import java.io.PipedOutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 
-import net.bigeon.gclc.manager.ConsoleOutput;
+import net.bigeon.gclc.utils.ReadingRunnable;
 
 /** This console output allows to retrieve the output as an input.
  * <p>

gclc/src/main/java/net/bigeon/gclc/manager/SinkOutput.java

@@ -36,9 +36,7 @@
  * gclc:net.bigeon.gclc.manager.SinkOutput.java
  * Created on: Nov 13, 2017
  */
-package net.bigeon.gclc.utils;
-
-import net.bigeon.gclc.manager.ConsoleOutput;
+package net.bigeon.gclc.manager;
 
 /*-
  * #%L

gclc/src/main/java/net/bigeon/gclc/manager/StreamConsoleInput.java

@@ -36,7 +36,7 @@
  * gclc:net.bigeon.gclc.system.SystemConsoleManager.java
  * Created on: Dec 19, 2014
  */
-package net.bigeon.gclc.utils;
+package net.bigeon.gclc.manager;
 
 /*-
  * #%L
@@ -77,10 +77,10 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.nio.charset.Charset;
+import java.util.function.Supplier;
 
-import net.bigeon.gclc.manager.ConsoleInput;
 import net.bigeon.gclc.tools.ConstantString;
-import net.bigeon.gclc.tools.StringProvider;
+import net.bigeon.gclc.utils.ReadingRunnable;
 
 /** A console using the input stream and print stream.
  * <p>
@@ -90,10 +90,10 @@ import net.bigeon.gclc.tools.StringProvider;
 public final class StreamConsoleInput implements ConsoleInput {
 
     /** The default prompt. */
-    public static final StringProvider DEFAULT_PROMPT = new ConstantString("> "); //$NON-NLS-1$
+    public static final Supplier<String> DEFAULT_PROMPT = new ConstantString("> "); //$NON-NLS-1$
 
     /** The command prompt. It can be changed. */
-    private StringProvider prompt = DEFAULT_PROMPT;
+    private Supplier<String> prompt = DEFAULT_PROMPT;
 
     /** The print stream. */
     private final PrintStream    out;
@@ -152,7 +152,7 @@ public final class StreamConsoleInput implements ConsoleInput {
     /* (non-Javadoc)
      * @see net.bigeon.gclc.manager.ConsoleInput#getPrompt() */
     @Override
-    public StringProvider getPrompt() {
+    public Supplier<String> getPrompt() {
         return prompt;
     }
 
@@ -175,14 +175,14 @@ public final class StreamConsoleInput implements ConsoleInput {
      * @see net.bigeon.gclc.ConsoleManager#prompt() */
     @Override
     public String prompt() throws IOException {
-        return prompt(prompt.apply());
+        return prompt(prompt.get());
     }
 
     /* (non-Javadoc)
      * @see net.bigeon.gclc.manager.ConsoleManager#prompt(long) */
     @Override
     public String prompt(final long timeout) throws IOException {
-        return prompt(prompt.apply(), timeout);
+        return prompt(prompt.get(), timeout);
     }
 
     /* (non-Javadoc)
@@ -217,7 +217,7 @@ public final class StreamConsoleInput implements ConsoleInput {
     }
 
     @Override
-    public void setPrompt(StringProvider string) {
+    public void setPrompt(final Supplier<String> string) {
         prompt = string;
     }
 }

gclc/src/main/java/net/bigeon/gclc/manager/StreamConsoleOutput.java

@@ -36,7 +36,7 @@
  * gclc:net.bigeon.gclc.system.SystemConsoleManager.java
  * Created on: Dec 19, 2014
  */
-package net.bigeon.gclc.utils;
+package net.bigeon.gclc.manager;
 
 /*-
  * #%L
@@ -74,8 +74,6 @@ package net.bigeon.gclc.utils;
 import java.io.IOException;
 import java.io.PrintStream;
 
-import net.bigeon.gclc.manager.ConsoleOutput;
-
 /** A console using the input stream and print stream.
  * <p>
  * The default constructor will use the system standart input and output.

gclc/src/main/java/net/bigeon/gclc/manager/forwarding/AOutputForwardRunnable.java

@@ -36,7 +36,7 @@
  * gclc:net.bigeon.gclc.tools.AOutputForwardRunnable.java
  * Created on: Dec 1, 2016
  */
-package net.bigeon.gclc.utils;
+package net.bigeon.gclc.manager.forwarding;
 
 /*-
  * #%L
@@ -75,6 +75,8 @@ import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.bigeon.gclc.manager.PipedConsoleOutput;
+
 /** An incomplete implematation used to forward messages from a piped console.
  * <p>
  * This forwarding can be interrupted without closing the piped manager.
@@ -88,9 +90,9 @@ public abstract class AOutputForwardRunnable implements Runnable {
     /** The default timeout (one tenth of second). */
     private static final long        DEFAULT_TIMEOUT = 100;
     /** The manager. */
-    private final PipedConsoleOutput manager;
+    protected final PipedConsoleOutput manager;
     /** The timeout. */
-    private final long               timeout;
+    protected final long               timeout;
 
     /** Create a forwarding runnable.
      *

gclc/src/main/java/net/bigeon/gclc/manager/forwarding/package-info.java

@@ -0,0 +1,43 @@
+/**
+ * 
+ */
+/** This package contains the {@link java.lang.Runnable} implementations used to
+ * forward messages to or from console output or input.
+ * 
+ * @author Emmanuel Bigeon */
+package net.bigeon.gclc.manager.forwarding;
+
+/*-
+ * #%L
+ * Generic Command Ligne console
+ * %%
+ * Copyright (C) 2014 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+

gclc/src/main/java/net/bigeon/gclc/tools/ConstantString.java

@@ -34,6 +34,9 @@
  */
 package net.bigeon.gclc.tools;
 
+import java.util.Objects;
+import java.util.function.Supplier;
+
 /*-
  * #%L
  * Generic Command Ligne console
@@ -68,10 +71,10 @@ package net.bigeon.gclc.tools;
  * #L%
  */
 
-/** A {@link StringProvider} that hold a constant string.
+/** A supplier of string that hold a constant string.
  *
  * @author Emmanuel Bigeon */
-public class ConstantString implements StringProvider {
+public class ConstantString implements Supplier<String> {
     private final String string;
 
     /** Create a provider for a string.
@@ -81,10 +84,8 @@ public class ConstantString implements StringProvider {
         this.string = string;
     }
 
-    /* (non-Javadoc)
-     * @see net.bigeon.gclc.tools.StringProvider#apply() */
     @Override
-    public String apply() {
+    public String get() {
         return string;
     }
 
@@ -92,10 +93,7 @@ public class ConstantString implements StringProvider {
      * @see java.lang.Object#hashCode() */
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((string == null) ? 0 : string.hashCode());
-        return result;
+        return Objects.hash(string);
     }
 
     /* (non-Javadoc)
@@ -112,13 +110,6 @@ public class ConstantString implements StringProvider {
             return false;
         }
         final ConstantString other = (ConstantString) obj;
-        if (string == null) {
-            if (other.string != null) {
-                return false;
-            }
-        } else if (!string.equals(other.string)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(string, other.string);
     }
 }

gclc/src/main/java/net/bigeon/gclc/tools/StringProvider.java

@@ -1,83 +0,0 @@
-/*
- * Copyright Bigeon Emmanuel (2014)
- *
- * emmanuel@bigeon.fr
- *
- * This software is a computer program whose purpose is to
- * provide a generic framework for console applications.
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software.  You can  use,
- * modify and/or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and  rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty  and the software's author,  the holder of the
- * economic rights,  and the successive licensors  have only  limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading,  using,  modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean  that it is complicated to manipulate,  and  that  also
- * therefore means  that it is reserved for developers  and  experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and,  more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-package net.bigeon.gclc.tools;
-
-/*-
- * #%L
- * Generic Command Ligne console
- * %%
- * Copyright (C) 2014 - 2018 bigeon.fr
- * %%
- * This software is governed by the CeCILL  license under French law and
- * abiding by the rules of distribution of free software.  You can  use,
- * modify and/ or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and  rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty  and the software's author,  the holder of the
- * economic rights,  and the successive licensors  have only  limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading,  using,  modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean  that it is complicated to manipulate,  and  that  also
- * therefore means  that it is reserved for developers  and  experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and,  more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- * #L%
- */
-
-/** A string providing object.
- * <p>
- * Implementations of this interface will provide a string, this internal state
- * of the object may be so that successive calls to the apply method return
- * different results.
- *
- * @author Emmanuel */
-public interface StringProvider {
-    /** Provide a string.
-     *
-     * @return the string */
-    String apply();
-}

gclc/src/main/java/net/bigeon/gclc/utils/ReadingRunnable.java

@@ -111,6 +111,7 @@ public final class ReadingRunnable implements Runnable {
     private final Map<String, Object> messageBlocker     = new ConcurrentHashMap<>();
     /** The lock. */
     private final Object              messageBlockerLock = new Object();
+    private boolean                   interrupting       = false;
     /** Create a reading runnable.
      *
      * @param reader the input to read from */
@@ -145,6 +146,9 @@ public final class ReadingRunnable implements Runnable {
      * @throws IOException if the pipe is closed */
     public String getMessage() throws IOException {
         synchronized (lock) {
+            if (!messages.isEmpty()) {
+                return pollMessage();
+            }
             if (!running) {
                 throw new IOException(CLOSED_PIPE);
             }
@@ -152,8 +156,7 @@ public final class ReadingRunnable implements Runnable {
             waitMessage(TIMEOUT);
             LOGGER.log(Level.FINEST, "Polled: {0}", messages.peek()); //$NON-NLS-1$
             waiting = false;
-            notifyMessage(messages.peek());
-            return messages.poll();
+            return pollMessage();
         }
     }
 
@@ -164,6 +167,9 @@ public final class ReadingRunnable implements Runnable {
      * @throws IOException if the input was closed */
     public String getNextMessage(final long timeout) throws IOException {
         synchronized (lock) {
+            if (!messages.isEmpty()) {
+                return pollMessage();
+            }
             if (!running) {
                 throw new IOException(CLOSED_PIPE);
             }
@@ -173,10 +179,23 @@ public final class ReadingRunnable implements Runnable {
             if (messages.isEmpty()) {
                 return null;
             }
-            return messages.poll();
+            return pollMessage();
         }
     }
 
+    private String pollMessage() throws InterruptedIOException {
+        final String msg = messages.poll();
+        if (msg.isEmpty() && interrupting) {
+            throw new InterruptedIOException();
+        }
+        notifyMessage(msg);
+        return msg;
+    }
+    
+    /** Wait for a message to be delivered.
+     * 
+     * @param message the message
+     * @throws InterruptedException if the wait was interrupted */
     public void waitForDelivery(final String message) throws InterruptedException {
         Object mLock;
         synchronized (messageBlockerLock) {
@@ -208,7 +227,8 @@ public final class ReadingRunnable implements Runnable {
     public void interrupt() {
         synchronized (lock) {
             if (waiting) {
-                messages.offer(""); //$NON-NLS-1$
+                messages.offer("");
+                interrupting = true;
                 lock.notifyAll();
             }
         }

gclc/src/test/java/net/bigeon/gclc/CommandTestingApplication.java

@@ -75,8 +75,8 @@ import java.io.IOException;
 
 import net.bigeon.gclc.command.ICommand;
 import net.bigeon.gclc.exception.InvalidCommandName;
-import net.bigeon.gclc.utils.PipedConsoleInput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleInput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 
 /**
  * <p>

gclc/src/test/java/net/bigeon/gclc/ConsoleApplicationTest.java

@@ -95,8 +95,8 @@ import net.bigeon.gclc.exception.InvalidCommandName;
 import net.bigeon.gclc.i18n.Messages;
 import net.bigeon.gclc.manager.ConsoleInput;
 import net.bigeon.gclc.manager.ConsoleOutput;
-import net.bigeon.gclc.utils.PipedConsoleInput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleInput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 
 /** Test class for ConsoleApplication
  *

gclc/src/test/java/net/bigeon/gclc/command/CommandTest.java

@@ -82,7 +82,7 @@ import org.junit.Test;
 import net.bigeon.gclc.exception.CommandRunException;
 import net.bigeon.gclc.manager.ConsoleInput;
 import net.bigeon.gclc.manager.ConsoleOutput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 
 /**
  * <p>

gclc/src/test/java/net/bigeon/gclc/command/HelpExecutorTest.java

@@ -83,7 +83,7 @@ import net.bigeon.gclc.command.base.MockCommand;
 import net.bigeon.gclc.exception.CommandRunException;
 import net.bigeon.gclc.manager.ConsoleInput;
 import net.bigeon.gclc.manager.ConsoleOutput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 
 /**
  * <p>

gclc/src/test/java/net/bigeon/gclc/command/ParametrizedCommandDataTest.java

@@ -1,5 +1,39 @@
 package net.bigeon.gclc.command;
 
+/*-
+ * #%L
+ * Generic Command Ligne console
+ * %%
+ * Copyright (C) 2014 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
 import static org.junit.Assert.*;
 
 import org.junit.Test;

gclc/src/test/java/net/bigeon/gclc/command/ParametrizedCommandTest.java

@@ -91,9 +91,11 @@ import net.bigeon.gclc.exception.CommandRunException;
 import net.bigeon.gclc.exception.InvalidParameterException;
 import net.bigeon.gclc.manager.ConsoleInput;
 import net.bigeon.gclc.manager.ConsoleOutput;
-import net.bigeon.gclc.utils.PipedConsoleInput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleInput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 import net.bigeon.test.junitmt.ATestRunnable;
+import net.bigeon.test.junitmt.FunctionalTestRunnable;
+import net.bigeon.test.junitmt.TestFunction;
 import net.bigeon.test.junitmt.ThreadTest;
 
 /**
@@ -511,24 +513,21 @@ public class ParametrizedCommandTest {
             cmd.execute(out, in, "-" + str1, str2, "-" + addParam);
             cmd.execute(out, in, "-" + str1, str2, "-" + addParam, addParam);
 
-            final ATestRunnable testConsole = new ATestRunnable() {
+            final TestFunction function = new TestFunction() {
 
                 @Override
-                protected void testRun() {
-                    try {
-                        assertEquals("value of " + str1 + "? ", buf.readLine());
-                        in.type("");
-                        assertEquals("value of " + str1 + "? (cannot be empty) ",
-                                buf.readLine());
-                        in.type("");
-                        assertEquals("value of " + str1 + "? (cannot be empty) ",
-                                buf.readLine());
-                        in.type(str2);
-                    } catch (final IOException e) {
-                        fail("IO exception in test");
-                    }
+                public void apply() throws Exception {
+                    assertEquals("value of " + str1 + "? ", buf.readLine());
+                    in.type("");
+                    assertEquals("value of " + str1 + "? (cannot be empty) ",
+                            buf.readLine());
+                    in.type("");
+                    assertEquals("value of " + str1 + "? (cannot be empty) ",
+                            buf.readLine());
+                    in.type(str2);
                 }
             };
+            final ATestRunnable testConsole = new FunctionalTestRunnable(function);
 
             final Thread th = new Thread(testConsole);
             th.start();
@@ -544,18 +543,15 @@ public class ParametrizedCommandTest {
                         new InputStreamReader(pis, StandardCharsets.UTF_8));
                 PipedConsoleInput in = new PipedConsoleInput(new PrintStream(pout))) {
 
-            final ATestRunnable testConsole = new ATestRunnable() {
+            final TestFunction function = new TestFunction() {
 
                 @Override
-                protected void testRun() {
-                    try {
-                        assertEquals("value of " + str1 + "? ", buf.readLine());
-                        in.type(str2);
-                    } catch (final IOException e) {
-                        fail("IO exception in test");
-                    }
+                public void apply() throws Exception {
+                    assertEquals("value of " + str1 + "? ", buf.readLine());
+                    in.type(str2);
                 }
             };
+            final ATestRunnable testConsole = new FunctionalTestRunnable(function);
 
             final Thread th = new Thread(testConsole);
             th.start();

gclc/src/test/java/net/bigeon/gclc/command/ScriptExecutionTest.java

@@ -85,8 +85,8 @@ import net.bigeon.gclc.ConsoleTestApplication;
 import net.bigeon.gclc.command.base.ScriptExecution;
 import net.bigeon.gclc.exception.CommandRunException;
 import net.bigeon.gclc.exception.CommandRunExceptionType;
-import net.bigeon.gclc.utils.PipedConsoleInput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleInput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 
 /**
  * <p>

gclc/src/test/java/net/bigeon/gclc/command/SubedCommandTest.java

@@ -85,7 +85,7 @@ import net.bigeon.gclc.exception.CommandRunException;
 import net.bigeon.gclc.exception.InvalidCommandName;
 import net.bigeon.gclc.manager.ConsoleInput;
 import net.bigeon.gclc.manager.ConsoleOutput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 
 /**
  * <p>

gclc/src/test/java/net/bigeon/gclc/command/base/EchoCommandTest.java

@@ -1,5 +1,39 @@
 package net.bigeon.gclc.command.base;
 
+/*-
+ * #%L
+ * Generic Command Ligne console
+ * %%
+ * Copyright (C) 2014 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
@@ -9,7 +43,7 @@ import java.io.IOException;
 import org.junit.Test;
 
 import net.bigeon.gclc.exception.CommandRunException;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 
 public class EchoCommandTest {
 

gclc/src/test/java/net/bigeon/gclc/manager/ReadingRunnableTest.java

@@ -38,6 +38,7 @@
  */
 package net.bigeon.gclc.manager;
 
+import static org.junit.Assert.assertEquals;
 /*-
  * #%L
  * Generic Command Ligne console
@@ -75,17 +76,24 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.InterruptedIOException;
+import java.io.OutputStreamWriter;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.junit.Before;
 import org.junit.Test;
 
 import net.bigeon.gclc.utils.ReadingRunnable;
+import net.bigeon.test.junitmt.FunctionalTestRunnable;
+import net.bigeon.test.junitmt.TestFunction;
+import net.bigeon.test.junitmt.ThreadTest;
 
 /**
  * <p>
@@ -131,13 +139,13 @@ public class ReadingRunnableTest {
             final ReadingRunnable runnable = new ReadingRunnable(reader);
             final Thread th0 = new Thread(runnable, "read");
             th0.start();
-            Thread th = new Thread(new Runnable() {
+            final Thread th = new Thread(new Runnable() {
 
                 @Override
                 public void run() {
                     try {
                         runnable.waitForDelivery("msg");
-                    } catch (InterruptedException e) {
+                    } catch (final InterruptedException e) {
                         // TODO Auto-generated catch block
                         e.printStackTrace();
                     }
@@ -186,4 +194,64 @@ public class ReadingRunnableTest {
         }
     }
 
+    /** Test method for {@link net.bigeon.gclc.utils.ReadingRunnable#hasMessage()}.
+     * 
+     * @throws IOException if an error occurred
+     * @throws InterruptedException if an error occured in the reading thread */
+    @Test
+    public final void testGetPendingMessages() throws IOException, InterruptedException {
+
+        final PipedOutputStream out = new PipedOutputStream();
+        final BufferedReader reader = new BufferedReader(
+                new InputStreamReader(new PipedInputStream(out), StandardCharsets.UTF_8));
+        final ReadingRunnable runnable = new ReadingRunnable(reader);
+        final BufferedWriter writer = new BufferedWriter(
+                new OutputStreamWriter(out, StandardCharsets.UTF_8));
+        writer.write("one");
+        writer.newLine();
+        writer.write("two");
+        writer.close();
+        out.close();
+
+        final Thread th = new Thread(runnable);
+        th.start();
+        th.join();
+
+        assertEquals("Pending messages should be retrievable", "one",
+                runnable.getMessage());
+        assertEquals("Pending messages should be retrievable", "two",
+                runnable.getMessage());
+        try {
+            runnable.getMessage();
+            fail("reading from closed runnable");
+        } catch (final IOException e) {
+            // ok
+        }
+    }
+
+    @Test
+    public void testInterruption() throws IOException, InterruptedException {
+        final PipedOutputStream out = new PipedOutputStream();
+        final BufferedReader reader = new BufferedReader(
+                new InputStreamReader(new PipedInputStream(out), StandardCharsets.UTF_8));
+        final ReadingRunnable runnable = new ReadingRunnable(reader);
+
+        final FunctionalTestRunnable test = new FunctionalTestRunnable(
+                new TestFunction() {
+                    @Override
+                    public void apply() throws IOException {
+                        try {
+                            runnable.getMessage();
+                            fail("Message interruption should cause an exception");
+                        } catch (final InterruptedIOException e) {
+                            // ok
+                        }
+                    }
+                });
+        final Thread th = new Thread(test, "Prompt wait");
+        th.start();
+        th.join(200);
+        runnable.interrupt();
+        ThreadTest.assertRuns(th, test);
+    }
 }

gclc/src/test/java/net/bigeon/gclc/manager/SystemConsoleManagerTest.java

@@ -85,8 +85,6 @@ import java.nio.charset.Charset;
 
 import org.junit.Test;
 
-import net.bigeon.gclc.utils.StreamConsoleInput;
-
 /**
  * <p>
  * TODO
@@ -174,7 +172,7 @@ public class SystemConsoleManagerTest {
 
             final String prt = "++";
             manager.setPrompt(prt);
-            assertEquals(prt, manager.getPrompt().apply());
+            assertEquals(prt, manager.getPrompt().get());
         }
     }
 

gclc/src/test/java/net/bigeon/gclc/prompt/CLIPrompterTest.java

@@ -92,9 +92,11 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import net.bigeon.gclc.utils.PipedConsoleInput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleInput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 import net.bigeon.test.junitmt.ATestRunnable;
+import net.bigeon.test.junitmt.FunctionalTestRunnable;
+import net.bigeon.test.junitmt.TestFunction;
 import net.bigeon.test.junitmt.ThreadTest;
 
 /**
@@ -128,20 +130,17 @@ public class CLIPrompterTest {
                 BufferedReader buf = new BufferedReader(
                         new InputStreamReader(pis, StandardCharsets.UTF_8));
                 PipedConsoleInput in = new PipedConsoleInput(new PrintStream(pout))) {
-            final ATestRunnable target = new ATestRunnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void testRun() {
-                    try {
-                        assertTrue(CLIPrompter.promptBoolean(out, in, "My message")); //$NON-NLS-1$
-                        assertTrue(CLIPrompter.promptBoolean(out, in, "My message")); //$NON-NLS-1$
-                        assertFalse(CLIPrompter.promptBoolean(out, in, "My message")); //$NON-NLS-1$
-                        assertFalse(CLIPrompter.promptBoolean(out, in, "My message")); //$NON-NLS-1$
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                    }
+                public void apply() throws Exception {
+                    assertTrue(CLIPrompter.promptBoolean(out, in, "My message")); //$NON-NLS-1$
+                    assertTrue(CLIPrompter.promptBoolean(out, in, "My message")); //$NON-NLS-1$
+                    assertFalse(CLIPrompter.promptBoolean(out, in, "My message")); //$NON-NLS-1$
+                    assertFalse(CLIPrompter.promptBoolean(out, in, "My message")); //$NON-NLS-1$
                 }
             };
+            final ATestRunnable target = new FunctionalTestRunnable(func);
             final Thread th = new Thread(target);
             th.start();
             assertTrue(buf.readLine().startsWith("My message")); //$NON-NLS-1$
@@ -161,9 +160,12 @@ public class CLIPrompterTest {
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptChoice(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, List, List, String, String)}. */
+     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptChoice(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, List, List, String, String)}.
+     * 
+     * @throws IOException if an IO occurred */
     @Test
-    public final void testPromptChoiceConsoleManagerListOfStringListOfUStringString() {
+    public final void testPromptChoiceConsoleManagerListOfStringListOfUStringString()
+            throws IOException {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
                 PipedOutputStream pout = new PipedOutputStream();
                 PipedInputStream pis = new PipedInputStream(pout);
@@ -179,26 +181,23 @@ public class CLIPrompterTest {
             final String cancel = "Cancel"; //$NON-NLS-1$
             final String message = "My message"; //$NON-NLS-1$
 
-            final Thread th = new Thread(new Runnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void run() {
-                    try {
-                        assertEquals("Asserted provided value to be retrieved",
-                                choices.get(0), CLIPrompter.promptChoice(out, in, keys,
-                                        choices, message, cancel));
-                        assertEquals("Asserted provided value to be retrieved",
-                                choices.get(0), CLIPrompter.promptChoice(out, in, keys,
-                                        choices, message, null));
-                        assertEquals("Asserted provided value to be retrieved", null,
-                                CLIPrompter.promptChoice(out, in, keys, choices, message,
-                                        cancel));
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
+                public void apply() throws Exception {
+                    assertEquals("Asserted provided value to be retrieved",
+                            choices.get(0), CLIPrompter.promptChoice(out, in, keys,
+                                    choices, message, cancel));
+                    assertEquals("Asserted provided value to be retrieved",
+                            choices.get(0), CLIPrompter.promptChoice(out, in, keys,
+                                    choices, message, null));
+                    assertEquals("Asserted provided value to be retrieved", null,
+                            CLIPrompter.promptChoice(out, in, keys, choices, message,
+                                    cancel));
                 }
-            });
+            };
+            final ATestRunnable target = new FunctionalTestRunnable(func);
+            final Thread th = new Thread(target);
             th.start();
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0)));
@@ -242,15 +241,13 @@ public class CLIPrompterTest {
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
                     buf.readLine());
             in.type("2"); //$NON-NLS-1$
-            th.join();
-        } catch (IOException | InterruptedException e) {
-            fail("Unexpected excpetion"); //$NON-NLS-1$
-            e.printStackTrace();
+            ThreadTest.assertRuns(th, target);
         }
     }
 
     @Test
-    public final void testPromptChoiceConsoleManagerListOfUMapOfUTStringString() {
+    public final void testPromptChoiceConsoleManagerListOfUMapOfUTStringString()
+            throws IOException {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
                 PipedOutputStream pout = new PipedOutputStream();
                 PipedInputStream pis = new PipedInputStream(pout);
@@ -265,27 +262,23 @@ public class CLIPrompterTest {
             choices.put(keys.get(1), "The actual other"); //$NON-NLS-1$
             final String cancel = "Cancel"; //$NON-NLS-1$
             final String message = "My message"; //$NON-NLS-1$
-
-            final Thread th = new Thread(new Runnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void run() {
-                    try {
-                        assertEquals("Asserted provided value to be retrieved",
-                                choices.get(keys.get(0)), CLIPrompter.promptChoice(out,
-                                        in, keys, choices, message, cancel));
-                        assertEquals("Asserted provided value to be retrieved",
-                                choices.get(keys.get(0)), CLIPrompter.promptChoice(out,
-                                        in, keys, choices, message, null));
-                        assertEquals("Asserted provided value to be retrieved", null,
-                                CLIPrompter.promptChoice(out, in, keys, choices, message,
-                                        cancel));
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
+                public void apply() throws Exception {
+                    assertEquals("Asserted provided value to be retrieved",
+                            choices.get(keys.get(0)), CLIPrompter.promptChoice(out, in,
+                                    keys, choices, message, cancel));
+                    assertEquals("Asserted provided value to be retrieved",
+                            choices.get(keys.get(0)), CLIPrompter.promptChoice(out, in,
+                                    keys, choices, message, null));
+                    assertEquals("Asserted provided value to be retrieved", null,
+                            CLIPrompter.promptChoice(out, in, keys, choices, message,
+                                    cancel));
                 }
-            });
+            };
+            final ATestRunnable target = new FunctionalTestRunnable(func);
+            final Thread th = new Thread(target);
             th.start();
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
@@ -329,15 +322,13 @@ public class CLIPrompterTest {
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
                     buf.readLine());
             in.type("2"); //$NON-NLS-1$
-            th.join();
-        } catch (IOException | InterruptedException e) {
-            fail("Unexpected excpetion"); //$NON-NLS-1$
-            e.printStackTrace();
+            ThreadTest.assertRuns(th, target);
         }
     }
 
     @Test
-    public final void testPromptChoiceConsoleManagerListOfUStringString() {
+    public final void testPromptChoiceConsoleManagerListOfUStringString()
+            throws IOException {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
                 PipedOutputStream pout = new PipedOutputStream();
                 PipedInputStream pis = new PipedInputStream(pout);
@@ -349,29 +340,26 @@ public class CLIPrompterTest {
             keys.add("An other"); //$NON-NLS-1$
             final String cancel = "Cancel"; //$NON-NLS-1$
             final String message = "My message"; //$NON-NLS-1$
-
-            final Thread th = new Thread(new Runnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void run() {
-                    try {
-                        assertEquals("Asserted provided value to be retrieved",
-                                Integer.valueOf(0),
-                                CLIPrompter.promptChoice(out, in, keys, message, cancel));
-                        assertEquals("Asserted provided value to be retrieved",
-                                Integer.valueOf(0),
-                                CLIPrompter.promptChoice(out, in, keys, message, null));
-                        assertEquals("Asserted provided value to be retrieved",
-                                Integer.valueOf(1),
-                                CLIPrompter.promptChoice(out, in, keys, message, null));
-                        assertEquals("Asserted provided value to be retrieved", null,
-                                CLIPrompter.promptChoice(out, in, keys, message, cancel));
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
+                public void apply() throws Exception {
+                    assertEquals("Asserted provided value to be retrieved",
+                            Integer.valueOf(0),
+                            CLIPrompter.promptChoice(out, in, keys, message, cancel));
+                    assertEquals("Asserted provided value to be retrieved",
+                            Integer.valueOf(0),
+                            CLIPrompter.promptChoice(out, in, keys, message, null));
+                    assertEquals("Asserted provided value to be retrieved",
+                            Integer.valueOf(1),
+                            CLIPrompter.promptChoice(out, in, keys, message, null));
+                    assertEquals("Asserted provided value to be retrieved", null,
+                            CLIPrompter.promptChoice(out, in, keys, message, cancel));
                 }
-            });
+            };
+            final ATestRunnable target = new FunctionalTestRunnable(func);
+            final Thread th = new Thread(target);
+
             th.start();
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
@@ -422,17 +410,17 @@ public class CLIPrompterTest {
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
                     buf.readLine());
             in.type("2"); //$NON-NLS-1$
-            th.join();
-        } catch (IOException | InterruptedException e) {
-            fail("Unexpected excpetion"); //$NON-NLS-1$
-            e.printStackTrace();
+            ThreadTest.assertRuns(th, target);
         }
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptChoice(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, Map, String, String)}. */
+     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptChoice(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, Map, String, String)}.
+     * 
+     * @throws IOException if errors */
     @Test
-    public final void testPromptChoiceConsoleManagerMapOfUTStringString() {
+    public final void testPromptChoiceConsoleManagerMapOfUTStringString()
+            throws IOException {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
                 PipedOutputStream pout = new PipedOutputStream();
                 PipedInputStream pis = new PipedInputStream(pout);
@@ -448,26 +436,23 @@ public class CLIPrompterTest {
             final String cancel = "Cancel"; //$NON-NLS-1$
             final String message = "My message"; //$NON-NLS-1$
 
-            final Thread th = new Thread(new Runnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void run() {
-                    try {
-                        assertEquals("Asserted provided value to be retrieved",
-                                choices.get(keys.get(0)), CLIPrompter.promptChoice(out,
-                                        in, keys, choices, message, cancel));
-                        assertEquals("Asserted provided value to be retrieved",
-                                choices.get(keys.get(0)), CLIPrompter.promptChoice(out,
-                                        in, keys, choices, message, null));
-                        assertEquals("Asserted provided value to be retrieved", null,
-                                CLIPrompter.promptChoice(out, in, keys, choices, message,
-                                        cancel));
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
+                public void apply() throws Exception {
+                    assertEquals("Asserted provided value to be retrieved",
+                            choices.get(keys.get(0)), CLIPrompter.promptChoice(out, in,
+                                    keys, choices, message, cancel));
+                    assertEquals("Asserted provided value to be retrieved",
+                            choices.get(keys.get(0)), CLIPrompter.promptChoice(out, in,
+                                    keys, choices, message, null));
+                    assertEquals("Asserted provided value to be retrieved", null,
+                            CLIPrompter.promptChoice(out, in, keys, choices, message,
+                                    cancel));
                 }
-            });
+            };
+            final ATestRunnable runnable = new FunctionalTestRunnable(func);
+            final Thread th = new Thread(runnable);
             th.start();
             assertTrue(out.readNextLine().startsWith(message));
             final String readNextLine = out.readNextLine();
@@ -513,37 +498,33 @@ public class CLIPrompterTest {
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
                     buf.readLine());
             in.type("2"); //$NON-NLS-1$
-            th.join();
-        } catch (IOException | InterruptedException e) {
-            fail("Unexpected excpetion"); //$NON-NLS-1$
-            e.printStackTrace();
+            ThreadTest.assertRuns(th, runnable);
         }
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptInteger(net.bigeon.gclc.manager.ConsoleInput, String)}. */
+     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptInteger(net.bigeon.gclc.manager.ConsoleInput, String)}.
+     * 
+     * @throws IOException if errors */
     @Test
-    public final void testPromptInteger() {
+    public final void testPromptInteger() throws IOException {
         try (PipedOutputStream pout = new PipedOutputStream();
                 PipedInputStream pis = new PipedInputStream(pout);
                 BufferedReader buf = new BufferedReader(
                         new InputStreamReader(pis, StandardCharsets.UTF_8));
                 PipedConsoleInput in = new PipedConsoleInput(new PrintStream(pout))) {
-            final Thread th = new Thread(new Runnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void run() {
-                    try {
-                        assertEquals("Asserted provided value to be retrieved", 10,
-                                CLIPrompter.promptInteger(in, "My message")); //$NON-NLS-1$
-                        assertEquals("Asserted provided value to be retrieved", -15,
-                                CLIPrompter.promptInteger(in, "My message")); //$NON-NLS-1$
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
+                public void apply() throws Exception {
+                    assertEquals("Asserted provided value to be retrieved", 10,
+                            CLIPrompter.promptInteger(in, "My message")); //$NON-NLS-1$
+                    assertEquals("Asserted provided value to be retrieved", -15,
+                            CLIPrompter.promptInteger(in, "My message")); //$NON-NLS-1$
                 }
-            });
+            };
+            final ATestRunnable runnable = new FunctionalTestRunnable(func);
+            final Thread th = new Thread(runnable);
             th.start();
             assertTrue(buf.readLine().startsWith("My message")); //$NON-NLS-1$
             in.type(""); //$NON-NLS-1$
@@ -553,18 +534,16 @@ public class CLIPrompterTest {
             in.type("10"); //$NON-NLS-1$
             assertTrue(buf.readLine().startsWith("My message")); //$NON-NLS-1$
             in.type("-15"); //$NON-NLS-1$
-            th.join();
-
-        } catch (IOException | InterruptedException e) {
-            fail("Unexpected excpetion"); //$NON-NLS-1$
-            e.printStackTrace();
+            ThreadTest.assertRuns(th, runnable);
         }
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptList(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, String)}. */
+     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptList(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, String)}.
+     * 
+     * @throws IOException if errors */
     @Test
-    public final void testPromptListConsoleManagerString() {
+    public final void testPromptListConsoleManagerString() throws IOException {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
                 PipedOutputStream pout = new PipedOutputStream();
                 PipedInputStream pis = new PipedInputStream(pout);
@@ -576,22 +555,19 @@ public class CLIPrompterTest {
             keys.add("An other"); //$NON-NLS-1$
             final String message = "My message"; //$NON-NLS-1$
 
-            final Thread th = new Thread(new Runnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void run() {
-                    try {
-                        assertEquals("Asserted provided value to be retrieved",
-                                new ArrayList<String>(),
-                                CLIPrompter.promptList(out, in, message));
-                        assertEquals("Asserted provided value to be retrieved", keys,
-                                CLIPrompter.promptList(out, in, message));
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
+                public void apply() throws Exception {
+                    assertEquals("Asserted provided value to be retrieved",
+                            new ArrayList<String>(),
+                            CLIPrompter.promptList(out, in, message));
+                    assertEquals("Asserted provided value to be retrieved", keys,
+                            CLIPrompter.promptList(out, in, message));
                 }
-            });
+            };
+            final ATestRunnable runnable = new FunctionalTestRunnable(func);
+            final Thread th = new Thread(runnable);
             th.start();
             String nLine = out.readNextLine();
             assertTrue(nLine.startsWith(message));
@@ -615,17 +591,16 @@ public class CLIPrompterTest {
                         buf.readLine());
             }
             in.type(CLIPrompterMessages.getString("promptlist.exit.defaultkey")); //$NON-NLS-1$
-            th.join();
-        } catch (IOException | InterruptedException e) {
-            fail("Unexpected excpetion"); //$NON-NLS-1$
-            e.printStackTrace();
+            ThreadTest.assertRuns(th, runnable);
         }
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptList(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, String, String)}. */
+     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptList(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, String, String)}.
+     * 
+     * @throws IOException if errors */
     @Test
-    public final void testPromptListConsoleManagerStringString() {
+    public final void testPromptListConsoleManagerStringString() throws IOException {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
                 PipedOutputStream pout = new PipedOutputStream();
                 PipedInputStream pis = new PipedInputStream(pout);
@@ -638,22 +613,19 @@ public class CLIPrompterTest {
             final String ender = "*"; //$NON-NLS-1$
             final String message = "My message"; //$NON-NLS-1$
 
-            final Thread th = new Thread(new Runnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void run() {
-                    try {
-                        assertEquals("Asserted provided value to be retrieved",
-                                new ArrayList<String>(),
-                                CLIPrompter.promptList(out, in, message, ender));
-                        assertEquals("Asserted provided value to be retrieved", keys,
-                                CLIPrompter.promptList(out, in, message, ender));
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
+                public void apply() throws Exception {
+                    assertEquals("Asserted provided value to be retrieved",
+                            new ArrayList<String>(),
+                            CLIPrompter.promptList(out, in, message, ender));
+                    assertEquals("Asserted provided value to be retrieved", keys,
+                            CLIPrompter.promptList(out, in, message, ender));
                 }
-            });
+            };
+            final ATestRunnable runnable = new FunctionalTestRunnable(func);
+            final Thread th = new Thread(runnable);
             th.start();
             String nLine = out.readNextLine();
             assertTrue(nLine.startsWith(message));
@@ -675,17 +647,16 @@ public class CLIPrompterTest {
                         buf.readLine());
             }
             in.type(ender);
-            th.join();
-        } catch (IOException | InterruptedException e) {
-            fail("Unexpected excpetion"); //$NON-NLS-1$
-            e.printStackTrace();
+            ThreadTest.assertRuns(th, runnable);
         }
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptLongText(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, String)}. */
+     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptLongText(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, String)}.
+     * 
+     * @throws IOException if errors */
     @Test
-    public final void testPromptLongTextConsoleManagerString() {
+    public final void testPromptLongTextConsoleManagerString() throws IOException {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
                 PipedOutputStream pout = new PipedOutputStream();
                 PipedInputStream pis = new PipedInputStream(pout);
@@ -697,22 +668,19 @@ public class CLIPrompterTest {
                     + "line feeds and other" + System.lineSeparator()
                     + System.lineSeparator() + " \tspecial characters";
 
-            final Thread th = new Thread(new Runnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void run() {
-                    try {
-                        assertEquals("Asserted provided value to be retrieved", "",
-                                CLIPrompter.promptLongText(out, in, message));
-                        assertEquals("Asserted provided value to be retrieved",
-                                longText + System.lineSeparator(),
-                                CLIPrompter.promptLongText(out, in, message));
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
+                public void apply() throws Exception {
+                    assertEquals("Asserted provided value to be retrieved", "",
+                            CLIPrompter.promptLongText(out, in, message));
+                    assertEquals("Asserted provided value to be retrieved",
+                            longText + System.lineSeparator(),
+                            CLIPrompter.promptLongText(out, in, message));
                 }
-            });
+            };
+            final ATestRunnable runnable = new FunctionalTestRunnable(func);
+            final Thread th = new Thread(runnable);
             th.start();
             String nLine = out.readNextLine();
             assertTrue(nLine.startsWith(message));
@@ -737,17 +705,16 @@ public class CLIPrompterTest {
                         buf.readLine());
             }
             in.type(CLIPrompterMessages.getString("promptlongtext.exit.defaultkey"));
-            th.join();
-        } catch (IOException | InterruptedException e) {
-            fail("Unexpected excpetion"); //$NON-NLS-1$
-            e.printStackTrace();
+            ThreadTest.assertRuns(th, runnable);
         }
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptLongText(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, String, String)}. */
+     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptLongText(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, String, String)}.
+     * 
+     * @throws IOException if errors */
     @Test
-    public final void testPromptLongTextConsoleManagerStringString() {
+    public final void testPromptLongTextConsoleManagerStringString() throws IOException {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
                 PipedOutputStream pout = new PipedOutputStream();
                 PipedInputStream pis = new PipedInputStream(pout);
@@ -761,22 +728,19 @@ public class CLIPrompterTest {
             final String longText = text[0] + System.lineSeparator() + text[1]
                     + System.lineSeparator() + text[2];
 
-            final Thread th = new Thread(new Runnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void run() {
-                    try {
-                        assertEquals("Asserted provided value to be retrieved", //$NON-NLS-1$
-                                "", CLIPrompter.promptLongText(out, in, message, ender));
-                        assertEquals("Asserted provided value to be retrieved",
-                                longText + System.lineSeparator(),
-                                CLIPrompter.promptLongText(out, in, message, ender));
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
+                public void apply() throws Exception {
+                    assertEquals("Asserted provided value to be retrieved", //$NON-NLS-1$
+                            "", CLIPrompter.promptLongText(out, in, message, ender));
+                    assertEquals("Asserted provided value to be retrieved",
+                            longText + System.lineSeparator(),
+                            CLIPrompter.promptLongText(out, in, message, ender));
                 }
-            });
+            };
+            final ATestRunnable runnable = new FunctionalTestRunnable(func);
+            final Thread th = new Thread(runnable);
             th.start();
             String nLine = out.readNextLine();
             assertTrue(nLine.startsWith(message));
@@ -798,17 +762,17 @@ public class CLIPrompterTest {
                         buf.readLine());
             }
             in.type(ender);
-            th.join();
-        } catch (IOException | InterruptedException e) {
-            fail("Unexpected excpetion"); //$NON-NLS-1$
-            e.printStackTrace();
+            ThreadTest.assertRuns(th, runnable);
         }
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptMultiChoice(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, List, List, String)}. */
+     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptMultiChoice(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, List, List, String)}.
+     * 
+     * @throws IOException if errors */
     @Test
-    public final void testPromptMultiChoiceConsoleManagerListOfStringListOfUString() {
+    public final void testPromptMultiChoiceConsoleManagerListOfStringListOfUString()
+            throws IOException {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
                 PipedOutputStream pout = new PipedOutputStream();
                 PipedInputStream pis = new PipedInputStream(pout);
@@ -823,29 +787,24 @@ public class CLIPrompterTest {
             choices.add("The actual other"); //$NON-NLS-1$
             final String message = "My message"; //$NON-NLS-1$
 
-            final Thread th = new Thread(new Runnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void run() {
-                    try {
-                        assertTrue("Asserted provided value to be retrieved", CLIPrompter
-                                .promptMultiChoice(out, in, keys, choices, message)
-                                .isEmpty());
-                        final ArrayList<Object> l = new ArrayList<>();
-                        l.add(choices.get(0));
-                        assertEquals("Asserted provided value to be retrieved", l,
-                                CLIPrompter.promptMultiChoice(out, in, keys, choices,
-                                        message));
-                        l.add(choices.get(1));
-                        assertEquals("Asserted provided value to be retrieved", l,
-                                CLIPrompter.promptMultiChoice(out, in, keys, choices,
-                                        message));
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
+                public void apply() throws Exception {
+                    assertTrue("Asserted provided value to be retrieved",
+                            CLIPrompter.promptMultiChoice(out, in, keys, choices, message)
+                                    .isEmpty());
+                    final ArrayList<Object> l = new ArrayList<>();
+                    l.add(choices.get(0));
+                    assertEquals("Asserted provided value to be retrieved", l, CLIPrompter
+                            .promptMultiChoice(out, in, keys, choices, message));
+                    l.add(choices.get(1));
+                    assertEquals("Asserted provided value to be retrieved", l, CLIPrompter
+                            .promptMultiChoice(out, in, keys, choices, message));
                 }
-            });
+            };
+            final ATestRunnable runnable = new FunctionalTestRunnable(func);
+            final Thread th = new Thread(runnable);
             th.start();
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0)));
@@ -886,17 +845,17 @@ public class CLIPrompterTest {
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
                     buf.readLine());
             in.type("0 1"); //$NON-NLS-1$
-            th.join();
-        } catch (IOException | InterruptedException e) {
-            fail("Unexpected excpetion"); //$NON-NLS-1$
-            e.printStackTrace();
+            ThreadTest.assertRuns(th, runnable);
         }
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptMultiChoice(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, List, Map, String)}. */
+     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptMultiChoice(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, List, Map, String)}.
+     * 
+     * @throws IOException if errors */
     @Test
-    public final void testPromptMultiChoiceConsoleManagerListOfUMapOfUTString() {
+    public final void testPromptMultiChoiceConsoleManagerListOfUMapOfUTString()
+            throws IOException {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
                 PipedOutputStream pout = new PipedOutputStream();
                 PipedInputStream pis = new PipedInputStream(pout);
@@ -910,30 +869,24 @@ public class CLIPrompterTest {
             keys.add("An other"); //$NON-NLS-1$
             choices.put(keys.get(1), "The actual other"); //$NON-NLS-1$
             final String message = "My message"; //$NON-NLS-1$
-
-            final Thread th = new Thread(new Runnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void run() {
-                    try {
-                        assertTrue("Asserted provided value to be retrieved", CLIPrompter
-                                .promptMultiChoice(out, in, keys, choices, message)
-                                .isEmpty());
-                        final ArrayList<Object> l = new ArrayList<>();
-                        l.add(choices.get(keys.get(0)));
-                        assertEquals("Asserted provided value to be retrieved", l,
-                                CLIPrompter.promptMultiChoice(out, in, keys, choices,
-                                        message));
-                        l.add(choices.get(keys.get(1)));
-                        assertEquals("Asserted provided value to be retrieved", l,
-                                CLIPrompter.promptMultiChoice(out, in, keys, choices,
-                                        message));
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
+                public void apply() throws Exception {
+                    assertTrue("Asserted provided value to be retrieved",
+                            CLIPrompter.promptMultiChoice(out, in, keys, choices, message)
+                                    .isEmpty());
+                    final ArrayList<Object> l = new ArrayList<>();
+                    l.add(choices.get(keys.get(0)));
+                    assertEquals("Asserted provided value to be retrieved", l, CLIPrompter
+                            .promptMultiChoice(out, in, keys, choices, message));
+                    l.add(choices.get(keys.get(1)));
+                    assertEquals("Asserted provided value to be retrieved", l, CLIPrompter
+                            .promptMultiChoice(out, in, keys, choices, message));
                 }
-            });
+            };
+            final ATestRunnable target = new FunctionalTestRunnable(func);
+            final Thread th = new Thread(target);
             th.start();
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
@@ -974,17 +927,17 @@ public class CLIPrompterTest {
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
                     buf.readLine());
             in.type("0 1"); //$NON-NLS-1$
-            th.join();
-        } catch (IOException | InterruptedException e) {
-            fail("Unexpected excpetion"); //$NON-NLS-1$
-            e.printStackTrace();
+            ThreadTest.assertRuns(th, target);
         }
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptMultiChoice(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, List, String)}. */
+     * {@link net.bigeon.gclc.prompt.CLIPrompter#promptMultiChoice(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, List, String)}.
+     * 
+     * @throws IOException if error */
     @Test
-    public final void testPromptMultiChoiceConsoleManagerListOfUString() {
+    public final void testPromptMultiChoiceConsoleManagerListOfUString()
+            throws IOException {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
                 PipedOutputStream pout = new PipedOutputStream();
                 PipedInputStream pis = new PipedInputStream(pout);
@@ -995,27 +948,23 @@ public class CLIPrompterTest {
             keys.add("A choice"); //$NON-NLS-1$
             keys.add("An other"); //$NON-NLS-1$
             final String message = "My message"; //$NON-NLS-1$
-
-            final Thread th = new Thread(new Runnable() {
+            final TestFunction func = new TestFunction() {
 
                 @Override
-                public void run() {
-                    try {
-                        assertTrue("Asserted provided value to be retrieved", CLIPrompter
-                                .promptMultiChoice(out, in, keys, message).isEmpty());
-                        final ArrayList<Integer> l = new ArrayList<>();
-                        l.add(0);
-                        assertEquals("Asserted provided value to be retrieved", l,
-                                CLIPrompter.promptMultiChoice(out, in, keys, message));
-                        l.add(1);
-                        assertEquals("Asserted provided value to be retrieved", l,
-                                CLIPrompter.promptMultiChoice(out, in, keys, message));
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
+                public void apply() throws Exception {
+                    assertTrue("Asserted provided value to be retrieved", CLIPrompter
+                            .promptMultiChoice(out, in, keys, message).isEmpty());
+                    final ArrayList<Integer> l = new ArrayList<>();
+                    l.add(0);
+                    assertEquals("Asserted provided value to be retrieved", l,
+                            CLIPrompter.promptMultiChoice(out, in, keys, message));
+                    l.add(1);
+                    assertEquals("Asserted provided value to be retrieved", l,
+                            CLIPrompter.promptMultiChoice(out, in, keys, message));
                 }
-            });
+            };
+            final ATestRunnable target = new FunctionalTestRunnable(func);
+            final Thread th = new Thread(target);
             th.start();
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
@@ -1056,10 +1005,7 @@ public class CLIPrompterTest {
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
                     buf.readLine());
             in.type("0 1"); //$NON-NLS-1$
-            th.join();
-        } catch (IOException | InterruptedException e) {
-            fail("Unexpected excpetion"); //$NON-NLS-1$
-            e.printStackTrace();
+            ThreadTest.assertRuns(th, target);
         }
     }
 
@@ -1084,8 +1030,7 @@ public class CLIPrompterTest {
             final ATestRunnable target = new ATestRunnable() {
 
                 @Override
-                public void testRun() {
-                    try {
+                public void testRun() throws IOException {
                         assertTrue("Asserted provided value to be retrieved", CLIPrompter
                                 .promptMultiChoice(out, in, keys, choices, message)
                                 .isEmpty());
@@ -1098,10 +1043,6 @@ public class CLIPrompterTest {
                         assertEquals("Asserted provided value to be retrieved", l,
                                 CLIPrompter.promptMultiChoice(out, in, keys, choices,
                                         message));
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                        e.printStackTrace();
-                    }
                 }
             };
             final Thread th = new Thread(target);
@@ -1157,14 +1098,10 @@ public class CLIPrompterTest {
             final ATestRunnable target = new ATestRunnable() {
 
                 @Override
-                public void testRun() {
-                    try {
+                public void testRun() throws IOException {
                         assertEquals("Expected provided message to be returned", res,
                                 CLIPrompter.promptNonEmpty(in, "My message", //$NON-NLS-1$
                                         "my reprompt")); //$NON-NLS-1$
-                    } catch (final IOException e) {
-                        fail("Unexpected io excpetion"); //$NON-NLS-1$
-                    }
                 }
             };
             final Thread th = new Thread(target);

gclc/src/test/java/net/bigeon/gclc/tools/AOutputForwardRunnableTest.java

@@ -77,8 +77,8 @@ import java.io.IOException;
 
 import org.junit.Test;
 
-import net.bigeon.gclc.utils.AOutputForwardRunnable;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
+import net.bigeon.gclc.manager.forwarding.AOutputForwardRunnable;
 
 /**
  * <p>
@@ -143,7 +143,7 @@ public class AOutputForwardRunnableTest {
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.utils.AOutputForwardRunnable#run()}. */
+     * {@link net.bigeon.gclc.manager.forwarding.AOutputForwardRunnable#run()}. */
     @Test
     public final void testRun() {
         try (PipedConsoleOutput manager = new PipedConsoleOutput()) {

gclc/src/test/java/net/bigeon/gclc/utils/EmptyInputTest.java

@@ -1,20 +1,55 @@
 package net.bigeon.gclc.utils;
 
-import static org.junit.Assert.*;
+/*-
+ * #%L
+ * Generic Command Ligne console
+ * %%
+ * Copyright (C) 2014 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 import java.io.IOException;
 
 import org.junit.Test;
 
 import net.bigeon.gclc.manager.ConsoleInput;
+import net.bigeon.gclc.manager.EmptyInput;
 import net.bigeon.gclc.tools.ConstantString;
-import net.bigeon.gclc.utils.EmptyInput;
 
 public class EmptyInputTest {
 
     @Test
     public void testClose() throws IOException {
-        ConsoleInput input = EmptyInput.INSTANCE;
+        final ConsoleInput input = EmptyInput.INSTANCE;
         // several close operation shold create no error
         input.close();
         input.close();
@@ -24,19 +59,19 @@ public class EmptyInputTest {
     @Test
     public void testGetPrompt() {
         
-        ConsoleInput input = EmptyInput.INSTANCE;
-        String init = input.getPrompt().apply();
+        final ConsoleInput input = EmptyInput.INSTANCE;
+        final String init = input.getPrompt().get();
         input.setPrompt("some prompt different from "+init);
-        assertEquals("Prompts should not be changed", init, input.getPrompt().apply());
+        assertEquals("Prompts should not be changed", init, input.getPrompt().get());
         
         input.setPrompt(new ConstantString("some other prompt different from "+init));
-        assertEquals("Prompts should not be changed", init, input.getPrompt().apply());
+        assertEquals("Prompts should not be changed", init, input.getPrompt().get());
     }
 
     @Test
     public void testInterruptPrompt() {
         // Nothing to test, really...
-        ConsoleInput input = EmptyInput.INSTANCE;
+        final ConsoleInput input = EmptyInput.INSTANCE;
         // several close operation shold create no error
         input.interruptPrompt();
         assertFalse("This source input should never be closed", input.isClosed());
@@ -44,7 +79,7 @@ public class EmptyInputTest {
 
     @Test
     public void testIsClosed() throws IOException {
-        ConsoleInput input = EmptyInput.INSTANCE;
+        final ConsoleInput input = EmptyInput.INSTANCE;
         // several close operation shold create no error
         assertFalse("This source input should never be closed", input.isClosed());
         input.close();
@@ -55,7 +90,7 @@ public class EmptyInputTest {
 
     @Test
     public void testPrompt() throws IOException {
-        ConsoleInput input = EmptyInput.INSTANCE;
+        final ConsoleInput input = EmptyInput.INSTANCE;
         // several close operation shold create no error
         assertEquals("Any prompt should return the empty value", "", input.prompt());
         assertEquals("Any prompt should return the empty value", "", input.prompt(0));

gclc/src/test/java/net/bigeon/gclc/utils/SinkOutputTest.java

@@ -1,5 +1,39 @@
 package net.bigeon.gclc.utils;
 
+/*-
+ * #%L
+ * Generic Command Ligne console
+ * %%
+ * Copyright (C) 2014 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+
 import static org.junit.Assert.assertFalse;
 
 import java.io.IOException;
@@ -7,6 +41,7 @@ import java.io.IOException;
 import org.junit.Test;
 
 import net.bigeon.gclc.manager.ConsoleOutput;
+import net.bigeon.gclc.manager.SinkOutput;
 
 public class SinkOutputTest {