[maven-release-plugin] prepare release gclc-socket-1.1.9

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

gclc-process/pom.xml

@@ -54,7 +54,7 @@
     <dependency>
       <groupId>fr.bigeon</groupId>
       <artifactId>gclc</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>2.0.0</version>
     </dependency>
   </dependencies>
 </project>

gclc-socket/pom.xml

@@ -1,4 +1,35 @@
 
+<!-- GCLC Socket, Socket implementation of GCLC                                   -->
+<!-- Copyright (C) 2014-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.            -->
+
+
 <!-- Copyright E. Bigeon (2014)                             -->
 <!--                                                                           -->
 <!-- emmanuel@bigeon.fr                                                                  -->
@@ -70,7 +101,7 @@ of Emmanuel Bigeon.                                                   -->
 <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>
   <artifactId>gclc-socket</artifactId>
-  <version>1.1.9-SNAPSHOT</version>
+  <version>1.1.9</version>
   <packaging>jar</packaging>
   <url>http://www.bigeon.fr/emmanuel</url>
   <properties>
@@ -81,12 +112,12 @@ of Emmanuel Bigeon.                                                   -->
     <dependency>
     	<groupId>fr.bigeon</groupId>
     	<artifactId>gclc</artifactId>
-    	<version>1.5.0</version>
+    	<version>2.0.1</version>
     </dependency>
     <dependency>
     	<groupId>fr.bigeon</groupId>
     	<artifactId>smu</artifactId>
-    	<version>0.0.5</version>
+    	<version>0.0.7</version>
     </dependency>
   </dependencies>
   <parent>
@@ -98,6 +129,6 @@ of Emmanuel Bigeon.                                                   -->
   <description>Socket implementation of GCLC</description>
   <scm>
     <developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>gclc-socket-1.1.9</tag>
   </scm>
 </project>

gclc-socket/src/main/java/fr/bigeon/gclc/socket/ConnexionManager.java

@@ -0,0 +1,98 @@
+/*
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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-socket:fr.bigeon.gclc.socket.ConnexionManager.java
+ * Created on: Nov 18, 2017
+ */
+package fr.bigeon.gclc.socket;
+
+import java.util.Collection;
+
+/** A manager for connected elements.
+ * <p>
+ * Connected elements are given an identifier (unique) at connexion.
+ *
+ * @author Emmanuel Bigeon
+ * @param <T> the type of object connected */
+public interface ConnexionManager<T> {
+    /** Add a connection in the name.
+     *
+     * @param handle the connected object
+     * @return the name */
+    String addConnexion(T handle);
+
+    /** Disconnect an element.
+     *
+     * @param id the element connection id
+     * @return the object being disconnected */
+    T disconnect(String id);
+
+    /** Get the connected object.
+     *
+     * @param id the connexion id
+     * @return the object */
+    T get(String id);
+
+    /** Get the connected elements' ids.
+     *
+     * @return the connected elements' ids */
+    Collection<String> getConnected();
+
+    /** Test if a connection is active.
+     *
+     * @param id the connexion id
+     * @return if the connection is active. */
+    boolean isConnected(String id);
+
+    /** Add a lock on the disconnection.
+     * <p>
+     * This lock will <strong>not</strong> prevent calls to
+     * {@link #disconnect(String)}. It will however stop them from completing
+     * after the effective disconnection of the specified connection.
+     * <p>
+     * Calls to {@link #releaseDisconnexionLock(String)} remove a lock (at a
+     * pace of one for one).
+     *
+     * @param id the connexion id */
+    void lockDisconnexion(String id);
+
+    /** Release one lock on a disconnection
+     *
+     * @param id the connexion being released. */
+    void releaseDisconnexionLock(String id);
+
+    /** Wait for calls to {@link #disconnect(String)}
+     *
+     * @param id the connexion id
+     * @throws InterruptedException if the wait was interrupted. */
+    void waitDisconnexion(String id) throws InterruptedException;
+}

gclc-socket/src/main/java/fr/bigeon/gclc/socket/ConsoleRunnable.java

@@ -1,133 +0,0 @@
-/*
- * Copyright E. Bigeon (2014)
- *
- * emmanuel@bigeon.fr
- *
- * This software is a computer program whose purpose is to
- * Socket implementation of GCLC.
- *
- * 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-socket:fr.bigeon.gclc.socket.ConsoleRunnable.java
- * Created on: Jun 1, 2016
- */
-package fr.bigeon.gclc.socket;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import fr.bigeon.gclc.ConsoleApplication;
-
-/** A runnable class that will actually have the application running.
- *
- * @author Emmanuel Bigeon */
-public class ConsoleRunnable implements Runnable {
-
-    /** The wait timeout */
-    private static final long TIMEOUT = 100;
-    /** The logger */
-    private static final Logger LOGGER = Logger
-            .getLogger(ConsoleRunnable.class.getName());
-    /** The actual application */
-    private final ConsoleApplication app;
-    /** The synchro object */
-    private final Object lock = new Object();
-    /** the state of this runnable */
-    private boolean running = true;
-    /** If a start is required */
-    private boolean startReq;
-
-    /** @param app the application */
-    public ConsoleRunnable(ConsoleApplication app) {
-        super();
-        this.app = app;
-    }
-
-    /* (non-Javadoc)
-     * @see java.lang.Runnable#run() */
-    @Override
-    public void run() {
-        while (running) {
-            synchronized (lock) {
-                while (running && !startReq) {
-                    try {
-                        lock.wait(TIMEOUT);
-                    } catch (InterruptedException e) {
-                        LOGGER.log(Level.SEVERE,
-                                "Console application runnable interrupted wildly!", //$NON-NLS-1$
-                                e);
-                        return;
-                    }
-                }
-                startReq = false;
-                if (!running) {
-                    return;
-                }
-                lock.notify();
-            }
-            app.start();
-        }
-    }
-
-    /** Stop the application (it will finish its current operation) */
-    public void stop() {
-        app.exit();
-    }
-
-    /** @return if the application is running */
-    public boolean isApplicationRunning() {
-        return app.isRunning();
-    }
-
-    /** @param running the running to set */
-    public void setRunning(boolean running) {
-        synchronized (lock) {
-            this.running = running;
-        }
-    }
-
-    /** @return the running */
-    public boolean isRunning() {
-        synchronized (lock) {
-            return running;
-        }
-    }
-
-    /** Request a restart of application */
-    public void restart() {
-        synchronized (lock) {
-            startReq = true;
-            lock.notify();
-            try {
-                lock.wait(TIMEOUT);
-            } catch (InterruptedException e) {
-                LOGGER.log(Level.SEVERE, "Restart wait interrupted!", e); //$NON-NLS-1$
-            }
-        }
-    }
-}

gclc-socket/src/main/java/fr/bigeon/gclc/socket/DConnexionManager.java

@@ -0,0 +1,173 @@
+/*
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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-socket:fr.bigeon.gclc.socket.DConnexionManager.java
+ * Created on: Nov 18, 2017
+ */
+package fr.bigeon.gclc.socket;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/** Default implementation of the {@link ConnexionManager}.
+ *
+ * @author Emmanuel Bigeon
+ * @param <T> the connected objects */
+public final class DConnexionManager<T> implements ConnexionManager<T> {
+
+    /** Class logger. */
+    private static final Logger LOGGER = Logger
+            .getLogger(DConnexionManager.class.getName());
+    /** The connected objects. */
+    private final Map<String, T> connecteds = new HashMap<>();
+    /** The locks for the connexions. */
+    private final Map<String, Object> locks = new HashMap<>();
+    /** The counter for the disconnexion locks. */
+    private final Map<String, Integer> counters = new HashMap<>();
+    /** The lock for modification of {@link #counters}. */
+    private final Object counterLock = new Object();
+    /** The count of connexions. */
+    private int count = 0;
+
+    /** Default.constructor. */
+    public DConnexionManager() {
+        //
+    }
+    /* (non-Javadoc)
+     * @see
+     * fr.bigeon.gclc.socket.ConnexionManager#addConnexion(java.lang.Object) */
+    @Override
+    public String addConnexion(final T handle) {
+        final String newID = newID();
+        connecteds.put(newID, handle);
+        locks.put(newID, new Object());
+        counters.put(newID, Integer.valueOf(0));
+        return newID;
+    }
+
+    /* (non-Javadoc)
+     * @see
+     * fr.bigeon.gclc.socket.ConnexionManager#disconnect(java.lang.String) */
+    @Override
+    public T disconnect(final String id) {
+        if (connecteds.containsKey(id)) {
+            final T disc = connecteds.remove(id);
+            final Object lock = locks.get(id);
+            synchronized (lock) {
+                lock.notifyAll();
+            }
+            synchronized (counterLock) {
+                while (counters.get(id).intValue() > 0) {
+                    try {
+                        counterLock.wait();
+                    } catch (final InterruptedException e) {
+                        LOGGER.log(Level.FINE, "Interruption of thread", e); //$NON-NLS-1$
+                        Thread.currentThread().interrupt();
+                    }
+                }
+            }
+            return disc;
+        }
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.socket.ConnexionManager#get(java.lang.String) */
+    @Override
+    public T get(final String id) {
+        return connecteds.get(id);
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.socket.ConnexionManager#getConnected() */
+    @Override
+    public Collection<String> getConnected() {
+        return connecteds.keySet();
+    }
+
+    /* (non-Javadoc)
+     * @see
+     * fr.bigeon.gclc.socket.ConnexionManager#isConnected(java.lang.String) */
+    @Override
+    public boolean isConnected(final String id) {
+        return connecteds.containsKey(id);
+    }
+
+    /* (non-Javadoc)
+     * @see
+     * fr.bigeon.gclc.socket.ConnexionManager#lockDisconnexion(java.lang.String) */
+    @Override
+    public void lockDisconnexion(final String id) {
+        if (!connecteds.containsKey(id)) {
+            return;
+        }
+        synchronized (counterLock) {
+            counters.put(id, Integer.valueOf(counters.get(id).intValue() + 1));
+        }
+    }
+
+    /** Get a new identifier for connexion.
+     *
+     * @return a new ID */
+    private String newID() {
+        return "Client " + count++; //$NON-NLS-1$
+    }
+
+    /* (non-Javadoc)
+     * @see
+     * fr.bigeon.gclc.socket.ConnexionManager#releaseDisconnexionLock(java.lang.
+     * String) */
+    @Override
+    public void releaseDisconnexionLock(final String id) {
+        synchronized (counterLock) {
+            counters.put(id, Integer
+                    .valueOf(Math.max(counters.get(id).intValue() - 1, 0)));
+            counterLock.notifyAll();
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see
+     * fr.bigeon.gclc.socket.ConnexionManager#waitDisconnexion(java.lang.String) */
+    @Override
+    public void waitDisconnexion(final String id) throws InterruptedException {
+        final Object lock = locks.get(id);
+        while (connecteds.containsKey(id)) {
+            synchronized (lock) {
+                lock.wait();
+            }
+        }
+    }
+}

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

@@ -0,0 +1,279 @@
+/*
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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-socket:fr.bigeon.gclc.socket.PlugableConsoleInput.java
+ * Created on: Nov 18, 2017
+ */
+package fr.bigeon.gclc.socket;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import fr.bigeon.gclc.manager.ConsoleInput;
+import fr.bigeon.gclc.manager.ReadingRunnable;
+
+/** A console input where the stream can be plugged.
+ * <p>
+ * This pluggable console input accepts an input and output to be connected to
+ * it. The connexion cannot be concurrent, which mean that any connected stream
+ * must be disconnected before a new call to
+ * {@link #connect(InputStream, PrintStream)} is done.
+ *
+ * @author Emmanuel Bigeon */
+public final class PluggableConsoleInput implements ConsoleInput {
+    /** The ten constant. */
+    private static final int TENTH = 10;
+    /** Class logger. */
+    private static final Logger LOGGER = Logger
+            .getLogger(PluggableConsoleInput.class.getName());
+    /** The default time out. */
+    private static final long TIMEOUT = 100;
+    /** The prompting. */
+    private boolean prompting = false;
+    /** If the element is closed. */
+    private boolean closed = false;
+    /** The default prompt. */
+    private String prompt = "> "; //$NON-NLS-1$
+    /** If the input is plugged or buffering. */
+    private boolean connected = false;
+    /** The current connexion (if any). */
+    private ReadingRunnable connexion;
+    /** The interrupted status for prompts. */
+    private boolean interrupted = false;
+    /** The last hint hint. */
+    private String hint;
+    /** The output for hints. */
+    private PrintStream output;
+
+    // Locks
+    /** The lock for connexion and disconnexion of actual streams. */
+    private final Object connexionLock = new Object();
+
+    /** Create the pluggable console input. */
+    public PluggableConsoleInput() {
+        // do nothing
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleInput#close() */
+    @Override
+    public void close() {
+        closed = true;
+    }
+
+    /** Connect the given input stream to the input and output to the hints
+     * writing.
+     *
+     * @param stream the input stream
+     * @param out the output for hints.
+     * @throws IOException if the input is already connected. */
+    public void connect(final InputStream stream,
+                        final PrintStream out) throws IOException {
+        synchronized (connexionLock) {
+            if (connected) {
+                throw new IOException(
+                        "Input already connected to an input stream"); //$NON-NLS-1$
+            }
+
+            output = out;
+            if (prompting) {
+                out.print(hint);
+                out.flush();
+            }
+
+            final InputStreamReader streamReader = new InputStreamReader(
+                    stream, StandardCharsets.UTF_8);
+            final BufferedReader reader = new BufferedReader(streamReader);
+            connexion = new ReadingRunnable(reader);
+            final Thread th = new Thread(connexion, "GCLC Socket - Read input"); //$NON-NLS-1$
+            th.start();
+            connexionLock.notifyAll();
+            connected = true;
+        }
+    }
+
+    /** Disconnect the current input and hint output. */
+    public synchronized void disconnect() {
+        synchronized (connexionLock) {
+            if (!connected) {
+                return;
+            }
+            connected = false;
+            connexion.setRunning(false);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleInput#getPrompt() */
+    @Override
+    public String getPrompt() {
+        return prompt;
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleInput#interruptPrompt() */
+    @Override
+    public void interruptPrompt() {
+        interrupted = true;
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleInput#isClosed() */
+    @Override
+    public boolean isClosed() {
+        return closed;
+    }
+
+    /** Test if a prompt is occuring.
+     *
+     * @return the prompting */
+    public boolean isPrompting() {
+        return prompting;
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleInput#prompt() */
+    @Override
+    public String prompt() throws IOException {
+        return prompt(prompt);
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(long) */
+    @Override
+    public String prompt(final long timeout) throws IOException {
+        return prompt(prompt, timeout);
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(java.lang.String) */
+    @Override
+    public String prompt(final String message) throws IOException {
+        if (closed) {
+            throw new IOException();
+        }
+        prompting = true;
+        hint = message;
+        synchronized (connexionLock) {
+            hint = message;
+            if (connected) {
+                output.print(message);
+                output.flush();
+            }
+        }
+
+        String res = null;
+        while (res == null && !interrupted) {
+            try {
+                res = waitMessageOrConnexion(TIMEOUT, TIMEOUT / TENTH);
+            } catch (final InterruptedException e) {
+                LOGGER.log(Level.FINE, "Interruption of thread", e); //$NON-NLS-1$
+                Thread.currentThread().interrupt();
+            }
+            if (closed) {
+                throw new IOException();
+            }
+        }
+        prompting = false;
+        return res;
+    }
+
+    /* (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 {
+        if (closed) {
+            throw new IOException();
+        }
+        prompting = true;
+        synchronized (connexionLock) {
+            hint = message;
+            if (connected) {
+                output.print(message);
+                output.flush();
+            }
+        }
+
+        String res = null;
+        final long tic = System.currentTimeMillis();
+        long time = System.currentTimeMillis() - tic;
+        while (res == null && !interrupted && time < timeout) {
+            try {
+                res = waitMessageOrConnexion(timeout - time,
+                        (timeout - time) / TENTH);
+            } catch (final InterruptedException e) {
+                LOGGER.log(Level.FINE, "Interruption of thread", e); //$NON-NLS-1$
+                Thread.currentThread().interrupt();
+            }
+            time = System.currentTimeMillis() - tic;
+            if (closed) {
+                throw new IOException();
+            }
+        }
+        prompting = false;
+        return res;
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleInput#setPrompt(java.lang.String) */
+    @Override
+    public void setPrompt(final String prompt) {
+        this.prompt = prompt;
+    }
+
+    /** Wait for a hint or connexion.
+     *
+     * @param messageTimeout the timeout on the current connexion hint waiting
+     * @param connexionTimeout the timeout on the new connexion wait
+     * @return the hint, or null if not connected or timed out.
+     * @throws IOException if the reading failed.
+     * @throws InterruptedException if the wait was interrupted */
+    private String waitMessageOrConnexion(final long messageTimeout,
+                                          final long connexionTimeout) throws IOException,
+                                                                       InterruptedException {
+        synchronized (connexionLock) {
+            if (connected) {
+                return connexion.getNextMessage(messageTimeout);
+            }
+            connexionLock.wait(connexionTimeout);
+        }
+        return null;
+    }
+}

gclc-socket/src/main/java/fr/bigeon/gclc/socket/PluggableConsoleOutput.java

@@ -0,0 +1,126 @@
+/*
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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-socket:fr.bigeon.gclc.socket.PluggableConsoleOutput.java
+ * Created on: Nov 18, 2017
+ */
+package fr.bigeon.gclc.socket;
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+import fr.bigeon.gclc.manager.ConsoleOutput;
+
+/** An output that can be hotplugged to an actual output.
+ *
+ * @author Emmanuel Bigeon */
+public final class PluggableConsoleOutput implements ConsoleOutput {
+
+    /** The actual output. */
+    private PrintStream out;
+    /** The buffered messages. */
+    private final Deque<String> messages = new ArrayDeque<>();
+    /** If this output is closed. */
+    private boolean closed = false;
+
+    /** Default constructor. */
+    public PluggableConsoleOutput() {
+        //
+    }
+    /* (non-Javadoc)
+     * @see java.lang.AutoCloseable#close() */
+    @Override
+    public void close() {
+        closed = true;
+    }
+
+    /** Set the output to write to.
+     *
+     * @param output the output to set */
+    public synchronized void connect(final PrintStream output) {
+        out = output;
+        while (!messages.isEmpty()) {
+            output.print(messages.pop());
+        }
+    }
+
+    /** Disconnects the output. */
+    public synchronized void disconnect() {
+        out = null;
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleOutput#isClosed() */
+    @Override
+    public boolean isClosed() {
+        return closed;
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleOutput#print(java.lang.String) */
+    @Override
+    public synchronized void print(final String text) throws IOException {
+        if (closed) {
+            throw new IOException("Closed output"); //$NON-NLS-1$
+        }
+        if (out == null) {
+            messages.add(text);
+        } else {
+            out.print(text);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleOutput#println() */
+    @Override
+    public synchronized void println() throws IOException {
+        if (closed) {
+            throw new IOException("Closed output"); //$NON-NLS-1$
+        }
+        if (out == null) {
+            messages.add("\n"); //$NON-NLS-1$
+        } else {
+            out.println();
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleOutput#println(java.lang.String) */
+    @Override
+    public synchronized void println(final String message) throws IOException {
+        print(message);
+        println();
+    }
+
+}

gclc-socket/src/main/java/fr/bigeon/gclc/socket/RemoteDisconnectCommand.java

@@ -0,0 +1,132 @@
+/*
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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-socket:fr.bigeon.gclc.socket.RemoteDisconnectCommand.java
+ * Created on: Nov 18, 2017
+ */
+package fr.bigeon.gclc.socket;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.Collection;
+
+import fr.bigeon.gclc.command.Command;
+import fr.bigeon.gclc.exception.CommandRunException;
+import fr.bigeon.gclc.exception.CommandRunExceptionType;
+import fr.bigeon.gclc.manager.ConsoleInput;
+import fr.bigeon.gclc.manager.ConsoleOutput;
+
+/** A {@link Command} to disconnect elements from a {@link ConnexionManager}.
+ *
+ * @author Emmanuel Bigeon
+ * @param <T> the type of connected object */
+public final class RemoteDisconnectCommand<T> extends Command {
+
+    /** The connexion manager. */
+    private final ConnexionManager<T> manager;
+    /** If all connexion should be disconnected when no argument have been
+     * specified. */
+    private final boolean all;
+
+    /** Create the disconnection command.
+     *
+     * @param name the command name
+     * @param manager the manager
+     * @param all if all elements should be disconnected when no argument is
+     *            provided */
+    public RemoteDisconnectCommand(final String name,
+            final ConnexionManager<T> manager, final boolean all) {
+        super(name);
+        this.manager = manager;
+        this.all = all;
+    }
+
+    /* (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 {
+        if (args.length == 0 && all) {
+            final Collection<String> coll = manager.getConnected();
+            for (final String string : coll) {
+                manager.disconnect(string);
+            }
+        }
+        for (final String string : args) {
+            if (manager.isConnected(string)) {
+                manager.disconnect(string);
+            } else {
+                print(out, MessageFormat
+                        .format("[WARNING] {0} is not connected", string)); //$NON-NLS-1$
+            }
+        }
+    }
+
+    /** Print a message if the output is defined.
+     *
+     * @param out the output
+     * @param string the message
+     * @throws CommandRunException if the output exists but cannot be printed
+     *             to */
+    private void print(final ConsoleOutput out,
+                       final String string) throws CommandRunException {
+        if (out != null) {
+            try {
+                out.println(string);
+            } catch (final IOException e) {
+                throw new CommandRunException(
+                        CommandRunExceptionType.INTERACTION,
+                        "Unable to print to existing output", e, this); //$NON-NLS-1$
+            }
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.command.ICommand#tip() */
+    @Override
+    public String tip() {
+        return "Close a connexion."; //$NON-NLS-1$
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.command.Command#usageDetail() */
+    @SuppressWarnings("nls")
+    @Override
+    protected String usageDetail() {
+        return MessageFormat.format(
+                "  If arguments are provided the corresponding connexions are closed, " +
+                                    "otherwise{0}{1} are.",
+                System.lineSeparator(), all ? "all connexions" : "none");
+    }
+}

gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleApplicationShell.java

@@ -1,10 +1,7 @@
 /*
- * Copyright E. Bigeon (2014)
- *
- * emmanuel@bigeon.fr
- *
- * This software is a computer program whose purpose is to
- * Socket implementation of GCLC.
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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,
@@ -34,24 +31,17 @@
  */
 package fr.bigeon.gclc.socket;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
+import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
-import java.nio.charset.Charset;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import fr.bigeon.gclc.ConsoleApplication;
-import fr.bigeon.gclc.manager.ConsoleManager;
-import fr.bigeon.gclc.manager.PipedConsoleManager;
-import fr.bigeon.gclc.manager.ReadingRunnable;
 
-/** This is a socket communicating console consoleManager
+/** This is a socket communicating console consoleManager.
  * <p>
  * To use this application, the following flow should be used:
  *
@@ -69,115 +59,60 @@ import fr.bigeon.gclc.manager.ReadingRunnable;
  * end of the execution.
  *
  * @author Emmanuel Bigeon */
-public class SocketConsoleApplicationShell implements Runnable, AutoCloseable {
+public final class SocketConsoleApplicationShell implements Runnable {
 
-    /** The runnable to forward output of application to socket.
-     *
-     * @author Emmanuel Bigeon */
-    private final class OutputForwardRunnable implements Runnable {
-        /**
-         * 
-         */
-        private final PrintWriter writer;
-        /**
-         * 
-         */
-        private final Socket socket;
-
-        /** @param writer the writer
-         * @param socket the socket */
-        protected OutputForwardRunnable(PrintWriter writer, Socket socket) {
-            this.writer = writer;
-            this.socket = socket;
-        }
-
-        @SuppressWarnings("synthetic-access")
-        @Override
-        public void run() {
-            try {
-                while (!socket.isClosed()) {
-                    while (!socket.isClosed() && !consoleManager.available()) {
-                        waitASec();
-                    }
-                    if (socket.isClosed()) {
-                        return;
-                    }
-                    String m = consoleManager.readNextLine();
-                    writer.println(m);
-                }
-            } catch (IOException e) {
-                LOGGER.log(Level.SEVERE, "Unexpected problem in manager", //$NON-NLS-1$
-                        e);
-            }
-        }
-
-    }
-
-    /** The end of line character */
-    protected static final String EOL = "\n"; //$NON-NLS-1$
-    /** The class logger */
+    /** The class logger. */
     private static final Logger LOGGER = Logger
             .getLogger(SocketConsoleApplicationShell.class.getName());
-    /** Time of wait */
-    protected static final long ONE_TENTH_OF_SECOND = 100;
-    /** The listening port */
+    /** The listening port. */
     private final int port;
-    /** The application */
-    private ConsoleApplication app;
-    /** The session closing command */
-    private final String close;
-    /** The running status */
+    /** The running status. */
     private boolean running;
+    /** The socket console interface. */
+    private SocketConsoleInterface sci;
+    /** The remote disconnection command. */
+    private ConnexionManager<Socket> rdc;
+    /** The application. */
+    private ConsoleApplication app;
 
-    /** The console manager implementation */
-    private final PipedConsoleManager consoleManager;
-    /** The auto close flag. if this is true, every request closes the session
-     * after its call */
-    private final boolean autoClose;
-    /** The server socket */
+    /** The server socket. */
     private ServerSocket serverSocket;
-    /** The application shutdown string */
-    private final String applicationShutdown;
-    /** The charset for the communication. */
-    private final Charset charset;
+    /** THe server address. */
+    private final InetAddress addr;
 
     /** Create a socket application shell which will listen on the given port
-     * and close session upon the provided string reception by client
+     * and network interface.
      *
-     * @param port the port to listen to
-     * @param close the session closing command
-     * @param applicationShutdown the appication shut down command
-     * @param charset the charset for communication
-     * @throws IOException if the manager could not be created */
-    public SocketConsoleApplicationShell(int port, String close,
-            String applicationShutdown, Charset charset) throws IOException {
+     * @param port the part
+     * @param addr the inet address */
+    public SocketConsoleApplicationShell(final int port,
+            final InetAddress addr) {
+        super();
         this.port = port;
-        this.close = close;
-        this.applicationShutdown = applicationShutdown;
-        this.autoClose = false;
-        this.charset = charset;
-        //
-        consoleManager = new PipedConsoleManager();
+        this.addr = addr;
     }
 
-    /** Create a socket application shell which will listen on the given port
-     * and auto close session after one instruction
+    /** Wait for the identified connection to disconnect.
      *
-     * @param port the port to listen to
-     * @param autoClose if the session must be closed once the request has been
-     *            sent
-     * @param applicationShutdown the appication shut down command
-     * @param charset the charset for communication
-     * @throws IOException if the manager could not be created */
-    public SocketConsoleApplicationShell(int port, boolean autoClose,
-            String applicationShutdown, Charset charset) throws IOException {
-        this.port = port;
-        this.autoClose = autoClose;
-        this.applicationShutdown = applicationShutdown;
-        this.close = autoClose ? null : "close"; //$NON-NLS-1$
-        this.charset = charset;
-        //
-        consoleManager = new PipedConsoleManager();
+     * @param id the connexion id. */
+    private void awaitDisconnexion(final String id) {
+        while (rdc.isConnected(id)) {
+            try {
+                rdc.waitDisconnexion(id);
+            } catch (final InterruptedException e) {
+                LOGGER.log(Level.SEVERE, "Unexpected interruption", e); //$NON-NLS-1$
+                Thread.currentThread().interrupt();
+            }
+        }
+        sci.disconnect();
+    }
+
+    /** If the port provided was 0, this allows to get the actual port.
+     * @return the local port
+     * @see java.net.ServerSocket#getLocalPort()
+     */
+    public int getLocalPort() {
+        return serverSocket.getLocalPort();
     }
 
     /* (non-Javadoc)
@@ -185,8 +120,9 @@ public class SocketConsoleApplicationShell implements Runnable, AutoCloseable {
     @Override
     public void run() {
         // Create the server
-        try (ServerSocket actualServerSocket = new ServerSocket(port)) {
-            this.serverSocket = actualServerSocket;
+        try (ServerSocket actualServerSocket = new ServerSocket(port, 1,
+                addr)) {
+            serverSocket = actualServerSocket;
             running = true;
             // Create the streams
             runSokectServer();
@@ -197,176 +133,56 @@ public class SocketConsoleApplicationShell implements Runnable, AutoCloseable {
         }
     }
 
-    /** @throws IOException if the communication with the client failed */
+    /** Acctually run the server loop on connexion.
+     *
+     * @throws IOException if the communication with the client failed */
     private void runSokectServer() throws IOException {
-        final ConsoleRunnable runnable = new ConsoleRunnable(app);
-        Thread appThNext = new Thread(runnable, "gclc-ctrl"); //$NON-NLS-1$
-        appThNext.start();
-        while (running) {
+        while (running && app.isRunning()) {
             LOGGER.info("Waiting client"); //$NON-NLS-1$
-            try (Socket clientSocket = serverSocket.accept();
-                 PrintWriter out = new PrintWriter(new OutputStreamWriter(
-                         clientSocket.getOutputStream(), charset), true);
-                 InputStreamReader isr = new InputStreamReader(
-                         clientSocket.getInputStream(), charset);
-                 BufferedReader in = new BufferedReader(isr);) {
-                // this is not threaded to avoid several clients at the same
-                // time
-                LOGGER.info("Opening client"); //$NON-NLS-1$
+            try (Socket clientSocket = serverSocket.accept();) {
 
-                // Initiate application
-                if (!runnable.isApplicationRunning()) {
-                    LOGGER.info("Start application"); //$NON-NLS-1$
-                    startApplication(runnable);
-                } else {
-                    LOGGER.info("Reconnect to application"); //$NON-NLS-1$
-                    out.println("Reconnected"); //$NON-NLS-1$
-                    out.println(consoleManager.getPrompt());
-                }
-                communicate(clientSocket, out, in);
-            } catch (SocketException e) {
+                sci.connect(clientSocket);
+
+                final String id = rdc.addConnexion(clientSocket);
+                rdc.lockDisconnexion(id);
+                awaitDisconnexion(id);
+                rdc.releaseDisconnexionLock(id);
+            } catch (final SocketException e) {
                 LOGGER.log(Level.INFO, "Socket closed"); //$NON-NLS-1$
                 LOGGER.log(Level.FINE,
                         "Socket closed with exception (probably due to server interruption)", //$NON-NLS-1$
                         e);
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 throw e;
             }
             LOGGER.info("Closing client"); //$NON-NLS-1$
         }
-        runnable.setRunning(false);
-        try {
-            closeManager(appThNext);
-        } catch (IOException e) {
-            LOGGER.warning("Unable to close application correctly"); //$NON-NLS-1$
-            LOGGER.log(Level.FINE, "Application closing caused an exception", //$NON-NLS-1$
-                    e);
-        }
         LOGGER.info("Closing Server"); //$NON-NLS-1$
     }
 
-    /** Close the console manager after writing the application shutdown
-     * command.
-     * 
-     * @param appThNext the thread containing the application
-     * @throws IOException if the typyng or closing failed */
-    private void closeManager(Thread appThNext) throws IOException {
-        consoleManager.type(applicationShutdown);
-        try {
-            appThNext.join(ONE_TENTH_OF_SECOND);
-        } catch (InterruptedException e) {
-            LOGGER.warning("Application thread was interrupted!"); //$NON-NLS-1$
-            LOGGER.log(Level.FINE,
-                    "Application thread was interrupted while closing", //$NON-NLS-1$
-                    e);
-        }
-        consoleManager.close();
-    }
-
-    /** @param runnable the runnable */
-    private void startApplication(ConsoleRunnable runnable) {
-        runnable.restart();
-        synchronized (this) {
-            try {
-                wait(ONE_TENTH_OF_SECOND);
-            } catch (InterruptedException e) {
-                LOGGER.log(Level.SEVERE, "Interruption in application start", //$NON-NLS-1$
-                        e);
-            }
-        }
-    }
-
-    /** active communication between server and client
-     * 
-     * @param socket the socket
-     * @param writer the writer to the application
-     * @param in the input from the client
-     * @throws IOException if the communication failed */
-    private void communicate(final Socket socket, final PrintWriter writer,
-                             BufferedReader in) throws IOException {
-        OutputForwardRunnable cc = new OutputForwardRunnable(writer, socket);
-        Thread th = new Thread(cc, "ClientComm"); //$NON-NLS-1$
-        th.start();
-        if (autoClose) {
-            communicateOnce(in);
-        } else {
-            communicateLoop(in);
-        }
-    }
-
-    /** @param in the input from the client
-     * @throws IOException if the communication failed */
-    private void communicateOnce(BufferedReader in) throws IOException {
-        ReadingRunnable reading = new ReadingRunnable(in);
-        Thread th = new Thread(reading, "gclcToApp"); //$NON-NLS-1$
-        th.start();
-        communicationContent(reading);
-        doEndCommunication(reading);
-    }
-
-    /** @param reading the reading runnable
-     * @throws IOException if the end of communication failed */
-    private void doEndCommunication(ReadingRunnable reading) throws IOException {
-        reading.setRunning(false);
-        Thread wait = consoleManager.getWaitForDelivery("Bye."); //$NON-NLS-1$
-        consoleManager.println("Bye."); //$NON-NLS-1$
-        try {
-            wait.join();
-        } catch (InterruptedException e) {
-            LOGGER.warning("The Bye wait was interrupted."); //$NON-NLS-1$
-            LOGGER.log(Level.FINE, "An interruption occured", e); //$NON-NLS-1$
-        }
-    }
-
-    /** @param in the input from the client
-     * @throws IOException if the communication failed */
-    private void communicateLoop(BufferedReader in) throws IOException {
-        ReadingRunnable reading = new ReadingRunnable(in);
-        Thread th = new Thread(reading, "gclcToApp"); //$NON-NLS-1$
-        th.start();
-        while (app.isRunning() && communicationContent(reading)) {
-            // keep on going
-        }
-        doEndCommunication(reading);
-    }
-
-    /** @param reading the reading
-     * @return if the communication should be stopped.
-     * @throws IOException if the reading failed */
-    private boolean communicationContent(ReadingRunnable reading) throws IOException {
-        try {
-            while (app.isRunning() && !reading.hasMessage()) {
-                synchronized (this) {
-                    waitASec();
-                }
-            }
-        } catch (IOException e) {
-            LOGGER.warning("Client seems dead. Closing communication"); //$NON-NLS-1$
-            LOGGER.log(Level.FINE, "Wait on message from client failed", e); //$NON-NLS-1$
-            return false;
-        }
-        if (!app.isRunning()) {
-            return false;
-        }
-        String ln = reading.getMessage();
-        if (ln.equals(close)) {
-            return false;
-        }
-        // Pass command to application
-        consoleManager.type(ln);
-        return true;
-    }
-
-    /** @return the consoleManager */
-    public synchronized ConsoleManager getConsoleManager() {
-        return consoleManager;
-    }
-
-    /** @param app the application to set */
-    public synchronized void setApplication(ConsoleApplication app) {
+    /** Set the application.
+     * <p>
+     * If the application is closed, the server will also close.
+     *
+     * @param app the app to set */
+    public void setApplication(final ConsoleApplication app) {
         this.app = app;
     }
 
+    /** Set the connexion manager.
+     *
+     * @param rdc the rdc to set */
+    public void setConnexionManager(final ConnexionManager<Socket> rdc) {
+        this.rdc = rdc;
+    }
+
+    /** Set the socket console interface.
+     *
+     * @param sci the console interface to set */
+    public void setInterface(final SocketConsoleInterface sci) {
+        this.sci = sci;
+    }
+
     /** This method will request the server to stop.
      * <p>
      * In most cases, this will terminate communication on every client. On some
@@ -375,29 +191,8 @@ public class SocketConsoleApplicationShell implements Runnable, AutoCloseable {
         running = false;
         try {
             serverSocket.close();
-        } catch (IOException e) {
+        } catch (final IOException e) {
             LOGGER.log(Level.SEVERE, "Exception in closing socket server", e); //$NON-NLS-1$
         }
-        app.exit();
-    }
-
-    /** a method to wait some time */
-    protected void waitASec() {
-        try {
-            synchronized (this) {
-                wait(ONE_TENTH_OF_SECOND);
-            }
-        } catch (InterruptedException e) {
-            LOGGER.log(Level.SEVERE, "Interrupted wait", //$NON-NLS-1$
-                    e);
-            return;
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see java.lang.AutoCloseable#close() */
-    @Override
-    public void close() throws IOException {
-        consoleManager.close();
     }
 }

gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleInterface.java

@@ -0,0 +1,82 @@
+/*
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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-socket:fr.bigeon.gclc.socket.SocketConsoleInterface.java
+ * Created on: Nov 18, 2017
+ */
+package fr.bigeon.gclc.socket;
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
+
+/** The interface for socket based access to console application.
+ *
+ * @author Emmanuel Bigeon */
+public final class SocketConsoleInterface {
+
+    /** The application's input. */
+    private final PluggableConsoleInput input;
+    /** The application's output. */
+    private final PluggableConsoleOutput output;
+
+    /** Create the interfacing object.
+     *
+     * @param input the input
+     * @param output the output */
+    public SocketConsoleInterface(final PluggableConsoleInput input,
+            final PluggableConsoleOutput output) {
+        super();
+        this.input = input;
+        this.output = output;
+    }
+
+    /** Connect the application's input and outputs to the socket's.
+     *
+     * @param socket the socket
+     * @throws IOException if the connection failed */
+    public void connect(final Socket socket) throws IOException {
+        final PrintStream printStream = new PrintStream(
+                socket.getOutputStream(), true,
+                StandardCharsets.UTF_8.name());
+        output.connect(printStream);
+        input.connect(socket.getInputStream(),
+                printStream);
+    }
+
+    /** Disconnect the input and output of the application from the socket's. */
+    public void disconnect() {
+        input.disconnect();
+        output.disconnect();
+    }
+}

gclc-socket/src/main/java/fr/bigeon/gclc/socket/package-info.java

@@ -0,0 +1,40 @@
+/*
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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-socket:fr.bigeon.gclc.socket.package-info.java
+ * Created on: Nov 18, 2017
+ */
+/** This package define a framework to access
+ * {@link fr.bigeon.gclc.ConsoleApplication} through a socket.
+ *
+ * @author Emmanuel Bigeon */
+package fr.bigeon.gclc.socket;

gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleRunnableTest.java

@@ -1,197 +0,0 @@
-/*
- * Copyright E. Bigeon (2014)
- *
- * emmanuel@bigeon.fr
- *
- * This software is a computer program whose purpose is to
- * Socket implementation of GCLC.
- *
- * 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-socket:fr.bigeon.gclc.socket.ConsoleRunnableTest.java
- * Created on: Jun 1, 2016
- */
-package fr.bigeon.gclc.socket;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-import fr.bigeon.gclc.manager.ConsoleManager;
-
-/** Test class for {@link ConsoleRunnable}
- *
- * @author Emmanuel Bigeon */
-@SuppressWarnings({"unused", "javadoc"})
-public class ConsoleRunnableTest {
-
-    /** <p>
-     * TODO
-     *
-     * @author Emmanuel Bigeon */
-    private static final class ConsoleManagerTestImplementation
-            implements ConsoleManager {
-        int i = 0;
-        String[] cmds;
-
-        /** @param cmds the commands to run */
-        public ConsoleManagerTestImplementation(String[] cmds) {
-            super();
-            this.cmds = cmds;
-        }
-
-        @Override
-        public void setPrompt(String prompt) {
-            // do nothing
-        }
-
-        @Override
-        public String getPrompt() {
-            // Not used in test
-            return ""; //$NON-NLS-1$
-        }
-
-        @Override
-        public String prompt() {
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) { // NOSONAR
-                // do nothing
-            }
-            i++;
-            if (i == cmds.length) {
-                i = 0;
-            }
-            return cmds[i];
-        }
-
-        @Override
-        public String prompt(String message) {
-            return prompt();
-        }
-
-        @Override
-        public void println(String message) {
-            // do nothing
-        }
-
-        @Override
-        public void println() {
-            // do nothing
-        }
-
-        @Override
-        public void print(String text) {
-            // do nothing
-        }
-
-        @Override
-        public void close() throws IOException {
-            // do nothing
-        }
-
-        /* (non-Javadoc)
-         * @see fr.bigeon.gclc.manager.ConsoleManager#isClosed() */
-        @Override
-        public boolean isClosed() {
-            return i == cmds.length;
-        }
-
-        /* (non-Javadoc)
-         * @see fr.bigeon.gclc.manager.ConsoleManager#interruptPrompt() */
-        @Override
-        public void interruptPrompt() {
-            //
-        }
-
-        /* (non-Javadoc)
-         * @see fr.bigeon.gclc.manager.ConsoleManager#prompt(long) */
-        @Override
-        public String prompt(long timeout) throws IOException {
-            return prompt();
-        }
-
-        /* (non-Javadoc)
-         * @see fr.bigeon.gclc.manager.ConsoleManager#prompt(java.lang.String,
-         * long) */
-        @Override
-        public String prompt(String message, long timeout) throws IOException {
-            return prompt(message);
-        }
-    }
-
-    /** Test method for
-     * {@link fr.bigeon.gclc.socket.ConsoleRunnable#ConsoleRunnable(fr.bigeon.gclc.ConsoleApplication)}
-     * . */
-    @Test
-    public void testConsoleRunnable() {
-//        ConsoleApplication app = new ConsoleTestApplication(
-//                new SystemConsoleManager());
-//        ConsoleRunnable runnable = new ConsoleRunnable(app);
-
-    }
-
-    /** Test method for {@link fr.bigeon.gclc.socket.ConsoleRunnable#run()}. */
-    @Test
-    public void testRunFlow() {
-//        ConsoleApplication app = new ConsoleTestApplication(
-//                new ConsoleManagerTestImplementation(
-//                        new String[] {"test", ConsoleTestApplication.EXIT})); //$NON-NLS-1$
-//        ConsoleRunnable runnable = new ConsoleRunnable(app);
-//
-//        Thread th = new Thread(runnable);
-//        th.start();
-//
-//        runnable.stop();
-    }
-
-    /** Test method for {@link fr.bigeon.gclc.socket.ConsoleRunnable#stop()}. */
-    @Test
-    public void testStop() {
-//        ConsoleApplication app = new ConsoleTestApplication(
-//                new ConsoleManagerTestImplementation(
-//                        new String[] {"test", ConsoleTestApplication.EXIT})); //$NON-NLS-1$
-//        ConsoleRunnable runnable = new ConsoleRunnable(app);
-//        runnable.stop();
-//        Thread th = new Thread(runnable);
-//        th.start();
-//        runnable.stop();
-//        runnable.stop();
-    }
-
-    /** Test method for {@link fr.bigeon.gclc.socket.ConsoleRunnable#stop()}. */
-    @Test
-    public void testRun() {
-//        ConsoleApplication app = new ConsoleTestApplication(
-//                new ConsoleManagerTestImplementation(
-//                        new String[] {"test", ConsoleTestApplication.EXIT})); //$NON-NLS-1$
-//        ConsoleRunnable runnable = new ConsoleRunnable(app);
-//        runnable.run();
-    }
-
-}

gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleTestApplication.java

@@ -1,10 +1,7 @@
 /*
- * Copyright E. Bigeon (2014)
- *
- * emmanuel@bigeon.fr
- *
- * This software is a computer program whose purpose is to
- * Socket implementation of GCLC.
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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,
@@ -35,6 +32,8 @@
 package fr.bigeon.gclc.socket;
 
 import java.io.IOException;
+import java.net.Socket;
+import java.util.Collection;
 
 import fr.bigeon.gclc.ConsoleApplication;
 import fr.bigeon.gclc.command.Command;
@@ -42,62 +41,114 @@ import fr.bigeon.gclc.command.ExitCommand;
 import fr.bigeon.gclc.command.HelpExecutor;
 import fr.bigeon.gclc.exception.CommandRunException;
 import fr.bigeon.gclc.exception.InvalidCommandName;
-import fr.bigeon.gclc.manager.ConsoleManager;
+import fr.bigeon.gclc.manager.ConsoleInput;
+import fr.bigeon.gclc.manager.ConsoleOutput;
 
 /** A test-purpose application
- * 
+ *
  * @author Emmanuel Bigeon */
 public class ConsoleTestApplication {
 
     /** Exit command */
     public static final String EXIT = "exit"; //$NON-NLS-1$
 
-    /** @param manager the manager
+    /** Create the test application.
+     * 
+     * @param output the output
+     * @param input the input
+     * @param manager the manager
      * @return create the application */
     @SuppressWarnings("nls")
-    public static ConsoleApplication create(final ConsoleManager manager) {
+    public static ConsoleApplication create(final ConsoleOutput output,
+                                            final ConsoleInput input,
+                                            final ConnexionManager<Socket> manager) {
         try {
-            ConsoleApplication application = new ConsoleApplication(manager,
+            final ConsoleApplication application = new ConsoleApplication(
+                    output, input,
                     "Welcome to the test application. Type help or test.",
                     "See you");
-            application.add(new ExitCommand(EXIT, application));
-            application.add(
-                    new HelpExecutor("help", manager, application.root));
+            application.add(new ExitCommand(EXIT, application) {
+                /* (non-Javadoc)
+                 * @see fr.bigeon.gclc.command.ExitCommand#beforeExit() */
+                @Override
+                protected void beforeExit() {
+                    final Collection<String> coll = manager.getConnected();
+                    for (final String string : coll) {
+                        manager.disconnect(string);
+                    }
+                }
+            });
+            application
+                    .add(new HelpExecutor("help", application.root));
             application.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 {
+                        output.println("Test command ran fine");
+                    } catch (final IOException e) {
+                        throw new CommandRunException("manager closed", e,
+                                this);
+                    }
+                }
+
                 @Override
                 public String tip() {
                     return "A test command";
                 }
 
+                /* (non-Javadoc)
+                 * @see fr.bigeon.gclc.command.Command#usageDetail()
+                 */
                 @Override
-                public void execute(String... args) throws CommandRunException {
+                protected String usageDetail() {
+                    // TODO Auto-generated method stub
+                    // return null;
+                    throw new RuntimeException("Not implemented yet");
+                }
+            });
+            application.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 {
-                        manager.println("Test command ran fine");
-                    } catch (IOException e) {
+                        Thread.sleep(2000);
+                        output.println("Test command ran fine");
+                    } catch (IOException | InterruptedException e) {
                         throw new CommandRunException("manager closed", e,
                                 this);
                     }
                 }
-            });
-            application.add(new Command("long") {
 
                 @Override
                 public String tip() {
                     return "A long run test command";
                 }
 
+                /* (non-Javadoc)
+                 * @see fr.bigeon.gclc.command.Command#usageDetail()
+                 */
                 @Override
-                public void execute(String... args) throws CommandRunException {
-                    try {
-                        Thread.sleep(2000);
-                        manager.println("Test command ran fine");
-                    } catch (IOException | InterruptedException e) {
-                        throw new CommandRunException("manager closed", e,
-                                this);
-                    }
+                protected String usageDetail() {
+                    // TODO Auto-generated method stub
+                    // return null;
+                    throw new RuntimeException("Not implemented yet");
                 }
             });
+            application.add(
+                    new RemoteDisconnectCommand<>("out", manager, true));
             return application;
         } catch (final InvalidCommandName e) {
             e.printStackTrace();

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

@@ -0,0 +1,200 @@
+/*
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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-socket:fr.bigeon.gclc.socket.PluggableConsoleInputTest.java
+ * Created on: Nov 18, 2017
+ */
+package fr.bigeon.gclc.socket;
+
+import static org.junit.Assert.assertEquals;
+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.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintStream;
+
+import org.junit.Test;
+
+/**
+ * <p>
+ * TODO
+ *
+ * @author Emmanuel Bigeon */
+public class PluggableConsoleInputTest {
+
+    /** Test method for
+     * {@link fr.bigeon.gclc.socket.PluggableConsoleInput#close()}. */
+    @Test
+    public final void testClose() {
+        final PluggableConsoleInput input = new PluggableConsoleInput();
+        assertFalse("Input should not be initially closed", input.isClosed());
+        input.close();
+        assertTrue("Close should close the input", input.isClosed());
+
+        try {
+            input.prompt();
+            fail("Closed prompt should cause an IO");
+        } catch (final IOException e) {
+            // ok
+        }
+        try {
+            input.prompt(10);
+            fail("Closed prompt should cause an IO");
+        } catch (final IOException e) {
+            // ok
+        }
+
+        final PluggableConsoleInput input2 = new PluggableConsoleInput();
+
+        final Thread th = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                while (!input2.isPrompting()) {
+
+                }
+                try {
+                    Thread.sleep(100);
+                } catch (final InterruptedException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                input2.close();
+            }
+        });
+        th.start();
+        try {
+            input.prompt();
+            fail("Closed prompt should cause an IO");
+        } catch (final IOException e) {
+            // ok
+        }
+        final PluggableConsoleInput input3 = new PluggableConsoleInput();
+
+        final Thread th2 = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                try {
+                    Thread.sleep(200);
+                } catch (final InterruptedException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                input3.close();
+            }
+        });
+        th2.start();
+        try {
+            input.prompt(2000);
+            fail("Closed prompt should cause an IO");
+        } catch (final IOException e) {
+            // ok
+        }
+    }
+
+    @Test
+    public final void testConnect() throws IOException, InterruptedException {
+        final PluggableConsoleInput input = new PluggableConsoleInput();
+
+        input.disconnect();
+        try (final PipedInputStream pis = new PipedInputStream();
+             final PipedOutputStream pos = new PipedOutputStream();
+             final PipedInputStream inner = new PipedInputStream(pos);
+             final PipedOutputStream innerPos = new PipedOutputStream(pis);
+             final PrintStream testIn = new PrintStream(innerPos, true, "UTF8");
+             final PrintStream out = new PrintStream(pos)) {
+            input.connect(pis, out);
+            try {
+                input.connect(pis, out);
+                fail("Should not be able to connect already connected");
+            } catch (final IOException e) {
+                // ok
+            }
+            input.disconnect();
+
+            final Thread th = new Thread(new Runnable() {
+
+                @Override
+                public void run() {
+                    try {
+                        input.prompt("Test", 5000);
+                    } catch (final IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+            th.start();
+
+            while (!input.isPrompting()) {
+                Thread.sleep(10);
+            }
+
+            input.connect(pis, out);
+            testIn.println("tac");
+
+            final Thread th2 = new Thread(new Runnable() {
+
+                @Override
+                public void run() {
+                    try {
+                        input.prompt("Test", 5000);
+                        fail("Prompt should io");
+                    } catch (final IOException e) {
+                        // ok
+                    }
+                }
+            });
+            th2.start();
+            while (!input.isPrompting()) {
+                Thread.sleep(10);
+            }
+
+            input.close();
+
+
+        }
+    }
+
+    /** Test method for
+     * {@link fr.bigeon.gclc.socket.PluggableConsoleInput#getPrompt()}. */
+    @Test
+    public final void testGetPrompt() {
+        final PluggableConsoleInput input = new PluggableConsoleInput();
+        assertEquals("Default prompt invalid", "> ", input.getPrompt());
+        input.setPrompt("test");
+        assertEquals("Prompt setting failed", "test", input.getPrompt());
+    }
+}

gclc-socket/src/test/java/fr/bigeon/gclc/socket/RemoteDisconnectCommandTest.java

@@ -0,0 +1,105 @@
+/*
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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-socket:fr.bigeon.gclc.socket.RemoteDisconnectCommandTest.java
+ * Created on: Nov 18, 2017
+ */
+package fr.bigeon.gclc.socket;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import fr.bigeon.gclc.exception.CommandRunException;
+import fr.bigeon.gclc.manager.PipedConsoleOutput;
+
+/**
+ * <p>
+ * TODO
+ *
+ * @author Emmanuel Bigeon */
+public class RemoteDisconnectCommandTest {
+
+    /** Test method for
+     * {@link fr.bigeon.gclc.socket.RemoteDisconnectCommand#execute(fr.bigeon.gclc.manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput, java.lang.String[])}.
+     *
+     * @throws CommandRunException if the command unexpectedly failed.
+     * @throws IOException if the output could not be written to */
+    @Test
+    public final void testExecute() throws CommandRunException, IOException {
+        final DConnexionManager<String> manager = new DConnexionManager<>();
+        final RemoteDisconnectCommand<String> cmd = new RemoteDisconnectCommand<>(
+                "quit", manager, true);
+        final RemoteDisconnectCommand<String> cmd2 = new RemoteDisconnectCommand<>(
+                "quit", manager, false);
+        manager.addConnexion("test");
+
+        cmd2.execute(null, null);
+        assertFalse("No arguemnt should remova no connections",
+                manager.getConnected().isEmpty());
+        cmd.execute(null, null);
+        assertTrue("No arguemnt should remova all connections",
+                manager.getConnected().isEmpty());
+
+        final String name1 = manager.addConnexion("test");
+        final String name2 = manager.addConnexion("test");
+
+        cmd.execute(null, null, name1);
+        assertFalse("With argument shuld remove specified name",
+                manager.getConnected().contains(name1));
+        assertTrue("With argument shuld remove only specified name",
+                manager.getConnected().contains(name2));
+
+        cmd.execute(null, null, name1);
+        assertTrue("With argument shuld remove only specified name",
+                manager.getConnected().contains(name2));
+
+        try (PipedConsoleOutput out = new PipedConsoleOutput()) {
+            cmd.execute(out, null, name1);
+            assertTrue("With argument shuld remove only specified name",
+                    manager.getConnected().contains(name2));
+
+            out.close();
+            try {
+                cmd.execute(out, null, name1);
+                fail("Closed stream should cause error in printing");
+            } catch (final CommandRunException e) {
+                // ok
+            }
+        }
+    }
+
+}

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

@@ -1,10 +1,7 @@
 /*
- * Copyright E. Bigeon (2014)
- *
- * emmanuel@bigeon.fr
- *
- * This software is a computer program whose purpose is to
- * Socket implementation of GCLC.
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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,
@@ -39,9 +36,6 @@
 package fr.bigeon.gclc.socket;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -53,28 +47,34 @@ import java.util.logging.Logger;
 import org.junit.Test;
 
 /** Test class for {@link SocketConsoleApplicationShell}
- * 
+ *
  * @author Emmanuel Bigeon */
-@SuppressWarnings({"static-method", "unused", "javadoc", "nls"})
+@SuppressWarnings({"static-method", "javadoc", "nls"})
 public class SocketConsoleApplicationTest {
 
     private static final Logger LOGGER = Logger
             .getLogger(SocketConsoleApplicationTest.class.getName());
 
+    /** @param in the input
+     * @return the string
+     * @throws IOException if the input reading failed */
+    private String consumeToPrompt(final String server,
+                                   final BufferedReader in) throws IOException {
+        String fromServer = server;
+        LOGGER.fine("Server: \n" + fromServer);
+        while (fromServer != null && !fromServer.equals("Bye.") &&
+               !fromServer.equals("> ")) {
+            fromServer = in.readLine();
+            LOGGER.fine("Server: \n" + fromServer);
+        }
+        return fromServer;
+    }
+
     @Test
-    public void integrationTest() {
+    public void testIntegration() throws IOException, InterruptedException {
         Thread server;
-        try {
-            server = TestServer.startServer("bye");
-        } catch (IOException e3) {
-            assertNull(e3);
-            fail("unable to start server");
-        }
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e1) {
-            e1.printStackTrace();
-        }
+        server = TestServer.getServer();
+        Thread.sleep(1000);
         final String hostName = "127.0.0.1";
         final int portNumber = 3300;
 
@@ -86,7 +86,7 @@ public class SocketConsoleApplicationTest {
 
             String fromServer;
             int i = -1;
-            String[] cmds = {"help", "toto", "test", "bye"};
+            final String[] cmds = {"help", "toto", "test", "out"};
             while ((fromServer = in.readLine()) != null) {
                 i++;
                 fromServer = consumeToPrompt(fromServer, in);
@@ -100,9 +100,7 @@ public class SocketConsoleApplicationTest {
                     out.println(fromUser);
                 }
             }
-            assertEquals(4, i);
-        } catch (final IOException e) {
-            e.printStackTrace();
+            assertEquals("Disconnection command should close connection", 3, i);
         }
 
         try (Socket kkSocket = new Socket(hostName, portNumber);
@@ -113,7 +111,7 @@ public class SocketConsoleApplicationTest {
 
             String fromServer;
             int i = 0;
-            String[] cmds = {"help", "toto", "test",
+            final String[] cmds = {"help", "toto", "test",
                     ConsoleTestApplication.EXIT};
             while ((fromServer = in.readLine()) != null) {
                 fromServer = consumeToPrompt(fromServer, in);
@@ -129,15 +127,15 @@ public class SocketConsoleApplicationTest {
                 }
                 i++;
             }
-            assertEquals(4, i);
-        } catch (final IOException e) {
-            e.printStackTrace();
-        }
-        try {
-            Thread.sleep(100);
-        } catch (InterruptedException e1) {
-            e1.printStackTrace();
+            assertEquals("Application exit command should close connection", 4,
+                    i);
         }
+        Thread.sleep(100);
+        TestServer.closeServer();
+        server.join();
+        server = TestServer.getServer();
+        Thread.sleep(1000);
+
 
         try (Socket kkSocket = new Socket(hostName, portNumber);
              PrintWriter out = new PrintWriter(kkSocket.getOutputStream(),
@@ -147,7 +145,7 @@ public class SocketConsoleApplicationTest {
 
             String fromServer;
             int i = 0;
-            String[] cmds = {"help", "toto", "test",
+            final String[] cmds = {"help", "toto", "test",
                     ConsoleTestApplication.EXIT};
             while ((fromServer = in.readLine()) != null) {
                 fromServer = consumeToPrompt(fromServer, in);
@@ -162,80 +160,10 @@ public class SocketConsoleApplicationTest {
                 }
                 i++;
             }
-            assertEquals(4, i);
-        } catch (final IOException e) {
-            e.printStackTrace();
+            assertEquals("Application exit command should close connection", 4,
+                    i);
         }
         TestServer.closeServer();
-        try {
-            Thread.sleep(100);
-        } catch (InterruptedException e2) {
-            e2.printStackTrace();
-        }
-        try {
-            server = TestServer.startServer(true);
-        } catch (IOException e2) {
-            assertNull(e2);
-        }
-        try {
-            Thread.sleep(100);
-        } catch (InterruptedException e1) {
-            e1.printStackTrace();
-        }
-
-        try (Socket kkSocket = new Socket(hostName, portNumber);
-             PrintWriter out = new PrintWriter(kkSocket.getOutputStream(),
-                     true);
-             BufferedReader in = new BufferedReader(
-                     new InputStreamReader(kkSocket.getInputStream()));) {
-
-            String fromServer;
-            int i = 0;
-            String[] cmds = {"help", "test", "close"};
-            while ((fromServer = in.readLine()) != null) {
-                fromServer = consumeToPrompt(fromServer, in);
-                if (fromServer == null || fromServer.equals("Bye.")) {
-                    break;
-                }
-                assertTrue(i < 1);
-                final String fromUser = cmds[i];
-                if (fromUser != null) {
-                    LOGGER.fine("Client: " + fromUser);
-                    out.println(fromUser);
-                }
-                i++;
-            }
-            assertEquals(1, i);
-        } catch (final IOException e) {
-            e.printStackTrace();
-        }
-        Thread srv = null;
-        try {
-            srv = TestServer.getServer();
-        } catch (IOException e1) {
-            assertNull(e1);
-        }
-        TestServer.closeServer();
-        try {
-            srv.join();
-        } catch (InterruptedException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-    }
-
-    /** @param in the input
-     * @return the string
-     * @throws IOException if the input reading failed */
-    private String consumeToPrompt(String server,
-                                   BufferedReader in) throws IOException {
-        String fromServer = server;
-        LOGGER.fine("Server: \n" + fromServer);
-        while (fromServer != null && !fromServer.equals("Bye.") &&
-               !fromServer.equals("> ")) {
-            fromServer = in.readLine();
-            LOGGER.fine("Server: \n" + fromServer);
-        }
-        return fromServer;
+        server.join();
     }
 }

gclc-socket/src/test/java/fr/bigeon/gclc/socket/TestConsoleClient.java

@@ -1,10 +1,7 @@
 /*
- * Copyright E. Bigeon (2014)
- *
- * emmanuel@bigeon.fr
- *
- * This software is a computer program whose purpose is to
- * Socket implementation of GCLC.
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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,

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

@@ -1,10 +1,7 @@
 /*
- * Copyright E. Bigeon (2014)
- *
- * emmanuel@bigeon.fr
- *
- * This software is a computer program whose purpose is to
- * Socket implementation of GCLC.
+ * GCLC Socket, Socket implementation of GCLC
+ * Copyright (C) 2014-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,
@@ -35,30 +32,34 @@
 package fr.bigeon.gclc.socket;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
 
 import fr.bigeon.gclc.ConsoleApplication;
 
 /** A test server
- * 
+ *
  * @author Emmanuel Bigeon */
 @SuppressWarnings({"javadoc", "nls"})
 public class TestServer {
 
     private static SocketConsoleApplicationShell SHELL;
-    private static Thread server;
+    private static ConnexionManager<Socket> manager;
 
-    /** @param args no argument
-     * @throws IOException if the server starting failed */
-    public static void main(String... args) throws IOException {
-        try {
-            startServer(false).join();
-        } catch (final InterruptedException e) {
-            e.printStackTrace();
-        }
+    private static Thread server;
+    private static PluggableConsoleInput input;
+    private static PluggableConsoleOutput output;
+
+    public static synchronized void closeServer() {
+        SHELL.stop();
+        input.close();
+        output.close();
+        SHELL = null;
+        server = null;
     }
 
-    public static Thread getServer() throws IOException {
+    public static synchronized Thread getServer() throws IOException {
         if (server == null) {
             server = new Thread(getShell(), "gclcServer");
             server.start();
@@ -66,43 +67,39 @@ public class TestServer {
         return server;
     }
 
-    private static SocketConsoleApplicationShell getShell() throws IOException {
+    private static SocketConsoleApplicationShell getShell() throws UnknownHostException {
         if (SHELL == null) {
-            SHELL = new SocketConsoleApplicationShell(3300, "close",
-                    ConsoleTestApplication.EXIT, Charset.forName("UTF-8"));
+            input = new PluggableConsoleInput();
+            input.setPrompt("> \n");
+            output = new PluggableConsoleOutput();
+            manager = new DConnexionManager<>();
+            SHELL = new SocketConsoleApplicationShell(3300,
+                    InetAddress.getByName("127.0.0.1"));
             final ConsoleApplication app = ConsoleTestApplication
-                    .create(SHELL.getConsoleManager());
+                    .create(output, input, manager);
+            SHELL.setInterface(new SocketConsoleInterface(input, output));
+            SHELL.setConnexionManager(manager);
             SHELL.setApplication(app);
+            final Thread th = new Thread(new Runnable() {
+
+                @Override
+                public void run() {
+                    app.start();
+                }
+            });
+            th.start();
         }
         return SHELL;
     }
 
-    public static Thread startServer(boolean autoClose) throws IOException {
-        if (SHELL == null) {
-            SHELL = new SocketConsoleApplicationShell(3300, autoClose,
-                    ConsoleTestApplication.EXIT, Charset.forName("UTF-8"));
-            final ConsoleApplication app = ConsoleTestApplication
-                    .create(SHELL.getConsoleManager());
-            SHELL.setApplication(app);
-            server = null;
+    /** @param args no argument
+     * @throws IOException if the server starting failed */
+    public static void main(final String... args) throws IOException {
+        try {
+            getServer().join();
+        } catch (final InterruptedException e) {
+            e.printStackTrace();
         }
-        return getServer();
     }
 
-    public static Thread startServer(String closeConnection) throws IOException {
-        if (SHELL == null) {
-            SHELL = new SocketConsoleApplicationShell(3300, closeConnection,
-                    ConsoleTestApplication.EXIT, Charset.forName("UTF-8"));
-            final ConsoleApplication app = ConsoleTestApplication
-                    .create(SHELL.getConsoleManager());
-            SHELL.setApplication(app);
-            server = null;
-        }
-        return getServer();
-    }
-
-    public static void closeServer() {
-        SHELL.stop();
-        SHELL = null;
-    }
 }

gclc-swt/pom.xml

@@ -51,12 +51,12 @@
     <dependency>
       <groupId>fr.bigeon</groupId>
       <artifactId>gclc</artifactId>
-      <version>1.3.6</version>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
       <groupId>fr.bigeon</groupId>
       <artifactId>collections</artifactId>
-      <version>1.0.1</version>
+      <version>1.1.0</version>
     </dependency>
   </dependencies>
   <inceptionYear>2015</inceptionYear>

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

@@ -51,14 +51,15 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
 import fr.bigeon.gclc.ConsoleApplication;
-import fr.bigeon.gclc.manager.ConsoleManager;
+import fr.bigeon.gclc.manager.ConsoleInput;
+import fr.bigeon.gclc.manager.ConsoleOutput;
 
 /** A SWT component to connect to gclc {@link ConsoleApplication}
  * <p>
  *
  * @author Emmanuel Bigeon */
 public class SWTConsole extends Composite
-        implements ConsoleDelayIO, ConsoleManager {
+        implements ConsoleDelayIO, ConsoleInput, ConsoleOutput {
     /**
      *
      */
@@ -89,7 +90,7 @@ public class SWTConsole extends Composite
      *
      * @param parent the prent composite
      * @param style the composite style */
-    public SWTConsole(Composite parent, int style) {
+    public SWTConsole(final Composite parent, final int style) {
         super(parent, style);
 
         setLayout(new GridLayout(LAYOUT_NB_COLUMNS, false));
@@ -110,47 +111,32 @@ public class SWTConsole extends Composite
 
     }
 
-    /**
-     * 
-     */
-    @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 (InterruptedException e) {
-                    LOGGER.log(Level.SEVERE,
-                            "Interruption while waiting prompt", e); //$NON-NLS-1$
-                }
-            }
-            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();
-        }
-    }
-
     @Override
     protected void checkSubclass() {
         // Disable the check that prevents subclassing of SWT components
     }
 
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleManager#close() */
+    @Override
+    public void close() {
+        synchronized (promptLock) {
+            promptLock.notify();
+        }
+        if (consoleInput.isDisposed()) {
+            return;
+        }
+        consoleInput.setEnabled(false);
+        consoleOutput.setEnabled(false);
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.swt.ConsoleDelayIO#getInput() */
+    @Override
+    public String getInput() {
+        return consoleInput.getText();
+    }
+
     /* (non-Javadoc)
      * @see fr.bigeon.gclc.ConsoleManager#getPrompt() */
     @Override
@@ -158,6 +144,22 @@ public class SWTConsole extends Composite
         return prompt;
     }
 
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleManager#interruptPrompt() */
+    @Override
+    public void interruptPrompt() {
+        synchronized (promptLock) {
+            promptLock.notify();
+        }
+    }
+
+    /* (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
@@ -238,6 +240,16 @@ public class SWTConsole extends Composite
         return command;
     }
 
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(long)
+     */
+    @Override
+    public String prompt(final long timeout) throws IOException {
+        // TODO Auto-generated method stub
+        // return null;
+        throw new RuntimeException("Not implemented yet");
+    }
+
     /* (non-Javadoc)
      * @see fr.bigeon.gclc.ConsoleManager#prompt(java.lang.String) */
     @Override
@@ -286,6 +298,16 @@ public class SWTConsole extends Composite
         return command;
     }
 
+    /* (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 {
+        // TODO Auto-generated method stub
+        // return null;
+        throw new RuntimeException("Not implemented yet");
+    }
+
     /* (non-Javadoc)
      * @see org.eclipse.swt.widgets.Composite#setFocus() */
     @Override
@@ -293,6 +315,14 @@ public class SWTConsole extends Composite
         return consoleInput.setFocus();
     }
 
+    /* (non-Javadoc)
+     * @see fr.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 fr.bigeon.gclc.ConsoleManager#setPrompt(java.lang.String) */
     @Override
@@ -311,60 +341,51 @@ public class SWTConsole extends Composite
         });
     }
 
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.manager.ConsoleManager#close() */
-    @Override
-    public void close() {
-        synchronized (promptLock) {
-            promptLock.notify();
-        }
-        if (consoleInput.isDisposed()) {
-            return;
-        }
-        consoleInput.setEnabled(false);
-        consoleOutput.setEnabled(false);
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.manager.ConsoleManager#isClosed() */
-    @Override
-    public boolean isClosed() {
-        return isDisposed();
-    }
-
     /** @param string the text */
-    public void setText(String string) {
+    public void setText(final String string) {
         consoleInput.setText(string);
     }
 
     /**
-     * 
+     *
      */
     public void validateCommand() {
         validateInput();
     }
 
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.swt.ConsoleDelayIO#setInput(java.lang.String) */
+    /**
+     *
+     */
     @Override
-    public void setInput(String input) {
-        consoleInput.setText(input);
-        consoleInput.setSelection(input.length());
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.swt.ConsoleDelayIO#getInput() */
-    @Override
-    public String getInput() {
-        return consoleInput.getText();
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.manager.ConsoleManager#interruptPrompt() */
-    @Override
-    public void interruptPrompt() {
+    public void validateInput() {
+        Display.getDefault().syncExec(new Runnable() {
+            @SuppressWarnings("synthetic-access")
+            @Override
+            public void run() {
+                consoleInput.setEnabled(false);
+            }
+        });
         synchronized (promptLock) {
-            promptLock.notify();
+            while (!prompting) {
+                try {
+                    promptLock.wait();
+                } catch (final InterruptedException e) {
+                    LOGGER.log(Level.SEVERE,
+                            "Interruption while waiting prompt", e); //$NON-NLS-1$
+                }
+            }
+            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/fr/bigeon/gclc/swt/SWTConsoleShell.java

@@ -43,8 +43,6 @@ import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
-import fr.bigeon.gclc.manager.ConsoleManager;
-
 /** A shell containing a {@link SWTConsole}
  * <p>
  *
@@ -57,7 +55,7 @@ public class SWTConsoleShell extends Shell {
     /** Create the shell.
      *
      * @param display the display */
-    public SWTConsoleShell(Display display) {
+    public SWTConsoleShell(final Display display) {
         super(display, SWT.SHELL_TRIM);
         setLayout(new FillLayout(SWT.HORIZONTAL));
 
@@ -75,11 +73,6 @@ public class SWTConsoleShell extends Shell {
         setText("Console Application"); //$NON-NLS-1$
     }
 
-    /** @return the console manager */
-    public ConsoleManager getManager() {
-        return console;
-    }
-
     /* (non-Javadoc)
      * @see org.eclipse.swt.widgets.Shell#dispose() */
     @Override
@@ -87,4 +80,9 @@ public class SWTConsoleShell extends Shell {
         super.dispose();
         console.close();
     }
+
+    /** @return the input and output. */
+    public SWTConsole getManager() {
+        return console;
+    }
 }

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

@@ -50,7 +50,8 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Text;
 
 import fr.bigeon.gclc.ConsoleApplication;
-import fr.bigeon.gclc.manager.PipedConsoleManager;
+import fr.bigeon.gclc.manager.PipedConsoleInput;
+import fr.bigeon.gclc.manager.PipedConsoleOutput;
 import fr.bigeon.gclc.tools.AOutputForwardRunnable;
 
 /** A SWT component to connect to gclc {@link ConsoleApplication}
@@ -59,7 +60,7 @@ import fr.bigeon.gclc.tools.AOutputForwardRunnable;
  * @author Emmanuel Bigeon */
 public class SWTConsoleView extends Composite implements ConsoleDelayIO {
     /** The local implementation of the forwarding runnable
-     * 
+     *
      * @author Emmanuel Bigeon */
     private final class ToSWTConsoleForwardRunnable
             extends AOutputForwardRunnable {
@@ -67,12 +68,12 @@ public class SWTConsoleView extends Composite implements ConsoleDelayIO {
         private boolean running = true;
 
         /** @param manager the manager */
-        public ToSWTConsoleForwardRunnable(PipedConsoleManager manager) {
+        public ToSWTConsoleForwardRunnable(final PipedConsoleOutput manager) {
             super(manager);
         }
 
         @Override
-        protected void forwardLine(String m) {
+        protected void forwardLine(final String m) {
             appendConsoleOutput(m);
         }
 
@@ -82,7 +83,7 @@ public class SWTConsoleView extends Composite implements ConsoleDelayIO {
         }
 
         /** @param running the running to set */
-        public void setRunning(boolean running) {
+        public void setRunning(final boolean running) {
             this.running = running;
         }
     }
@@ -95,7 +96,8 @@ public class SWTConsoleView extends Composite implements ConsoleDelayIO {
     /** The console input text field */
     private final Text consoleInput;
     /** The actual manager */
-    private PipedConsoleManager manager;
+    private PipedConsoleOutput manager;
+    private PipedConsoleInput input;
     /** The forwarding runnable */
     private ToSWTConsoleForwardRunnable forward;
 
@@ -103,7 +105,7 @@ public class SWTConsoleView extends Composite implements ConsoleDelayIO {
      *
      * @param parent the prent composite
      * @param style the composite style */
-    public SWTConsoleView(Composite parent, int style) {
+    public SWTConsoleView(final Composite parent, final int style) {
         super(parent, style);
 
         setLayout(new GridLayout(1, false));
@@ -120,17 +122,6 @@ public class SWTConsoleView extends Composite implements ConsoleDelayIO {
         consoleInput.addKeyListener(new HistoryTextKeyListener(this));
     }
 
-    /** @param manager the manager to set */
-    public void setManager(PipedConsoleManager manager) {
-        this.manager = manager;
-        if (forward != null) {
-            forward.setRunning(false);
-        }
-        forward = new ToSWTConsoleForwardRunnable(manager);
-        Thread th = new Thread(forward, "gclcToSWT"); //$NON-NLS-1$
-        th.start();
-    }
-
     /** @param next the next message */
     protected void appendConsoleOutput(final String next) {
         Display.getDefault().syncExec(new Runnable() {
@@ -142,23 +133,18 @@ public class SWTConsoleView extends Composite implements ConsoleDelayIO {
         });
     }
 
-    /**
-     * 
-     */
-    @Override
-    public void validateInput() {
-        try {
-            manager.type(getInput());
-        } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Unable to input value to console", e); //$NON-NLS-1$
-        }
-    }
-
     @Override
     protected void checkSubclass() {
         // Disable the check that prevents subclassing of SWT components
     }
 
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.swt.ConsoleDelayIO#getInput() */
+    @Override
+    public String getInput() {
+        return consoleInput.getText();
+    }
+
     /* (non-Javadoc)
      * @see org.eclipse.swt.widgets.Composite#setFocus() */
     @Override
@@ -166,23 +152,41 @@ public class SWTConsoleView extends Composite implements ConsoleDelayIO {
         return consoleInput.setFocus();
     }
 
-    /** @param string the text */
-    public void setText(String string) {
-        consoleInput.setText(string);
-    }
-
     /* (non-Javadoc)
      * @see fr.bigeon.gclc.swt.ConsoleDelayIO#setInput(java.lang.String) */
     @Override
-    public void setInput(String input) {
+    public void setInput(final String input) {
         consoleInput.setText(input);
         consoleInput.setSelection(input.length());
     }
 
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.swt.ConsoleDelayIO#getInput() */
+    /** @param manager the manager to set */
+    public void setManager(final PipedConsoleOutput manager,
+                           final PipedConsoleInput input) {
+        this.manager = manager;
+        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();
+    }
+
+    /** @param string the text */
+    public void setText(final String string) {
+        consoleInput.setText(string);
+    }
+
+    /**
+     *
+     */
     @Override
-    public String getInput() {
-        return consoleInput.getText();
+    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$
+        }
     }
 }

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

@@ -53,8 +53,11 @@ import fr.bigeon.gclc.command.Command;
 import fr.bigeon.gclc.command.ExitCommand;
 import fr.bigeon.gclc.exception.CommandRunException;
 import fr.bigeon.gclc.exception.InvalidCommandName;
+import fr.bigeon.gclc.manager.ConsoleInput;
+import fr.bigeon.gclc.manager.ConsoleOutput;
 
-/** <p>
+/**
+ * <p>
  * TODO
  *
  * @author Emmanuel Bigeon */
@@ -65,64 +68,192 @@ public class SWTConsoleShellTest {
     private static final Display DISPLAY = Display.getDefault();
 
     @Test
-    public void testConsoleClose() {
+    public void test() {
         final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY);
-        final SWTConsole swtConsole = (SWTConsole) shell.getManager();
-        swtConsole.close();
-        swtConsole.setPrompt(":");
+        final SWTConsole swtConsole = shell.getManager();
         try {
             final ConsoleApplication appl = new ConsoleApplication(swtConsole,
-                    "Hello", "See you");
+                    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
-                public void execute(String... args) {
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                }
-            });
-            appl.add(new Command("test") {
-
-                @Override
-                public String tip() {
-                    return "a prompting running command";
-                }
-
-                @Override
-                public void execute(String... args) throws CommandRunException {
-                    try {
-                        appl.getManager().prompt("Test");
-                    } catch (IOException e) {
-                        throw new CommandRunException("No input", e, this);
-                    }
+                protected String usageDetail() {
+                    // TODO Auto-generated method stub
+                    // return null;
+                    throw new RuntimeException("Not implemented yet");
                 }
             });
 //            shell.pack();
             shell.open();
-            Thread applThread = new Thread(new Runnable() {
+            final Thread applThread = new Thread(new Runnable() {
 
                 @Override
                 public void run() {
                     appl.start();
                 }
             });
-            Thread testThread = new Thread(new Runnable() {
+            final Thread testThread = new Thread(new Runnable() {
 
                 @Override
                 public void run() {
                     try {
                         Thread.sleep(TWO_SECONDS);
-                    } catch (InterruptedException e) {
+                    } 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.validateCommand();
+                        }
+                    });
+                    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();
+        }
+    }
+
+    @Test
+    public void testConsoleClose() {
+        final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY);
+        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, this);
+                    }
+                }
+
+                @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();
+            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();
                     }
@@ -163,7 +294,7 @@ public class SWTConsoleShellTest {
                     swtConsole.validateCommand();
                     try {
                         Thread.sleep(TWO_SECONDS);
-                    } catch (InterruptedException e) {
+                    } catch (final InterruptedException e) {
                         // TODO Auto-generated catch block
                         e.printStackTrace();
                     }
@@ -187,102 +318,17 @@ public class SWTConsoleShellTest {
             try {
                 swtConsole.prompt();
                 fail("Prompting when closed should fail!");
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 assertNotNull(e);
             }
 //            DISPLAY.dispose();
-            assertTrue(appl.getManager().isClosed());
+            assertTrue(swtConsole.isClosed());
             Thread.sleep(TWO_SECONDS);
             assertFalse(appl.isRunning());
-        } catch (InvalidCommandName e) {
+        } catch (final InvalidCommandName e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
-        } catch (InterruptedException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void test() {
-        final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY);
-        final SWTConsole swtConsole = (SWTConsole) shell.getManager();
-        try {
-            final ConsoleApplication appl = new ConsoleApplication(swtConsole,
-                    "Hello", "See you");
-            appl.add(new ExitCommand("exit", appl));
-            appl.add(new Command("long") {
-
-                @Override
-                public String tip() {
-                    return "a long running command";
-                }
-
-                @Override
-                public void execute(String... args) {
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                }
-            });
-//            shell.pack();
-            shell.open();
-            Thread applThread = new Thread(new Runnable() {
-
-                @Override
-                public void run() {
-                    appl.start();
-                }
-            });
-            Thread testThread = new Thread(new Runnable() {
-
-                @Override
-                public void run() {
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (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.validateCommand();
-                        }
-                    });
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (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(appl.getManager().isClosed());
-            Thread.sleep(TWO_SECONDS);
-            assertFalse(appl.isRunning());
-        } catch (InvalidCommandName e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (InterruptedException e) {
+        } catch (final InterruptedException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }

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

@@ -50,8 +50,12 @@ import org.junit.Test;
 import fr.bigeon.gclc.ConsoleApplication;
 import fr.bigeon.gclc.command.Command;
 import fr.bigeon.gclc.command.ExitCommand;
+import fr.bigeon.gclc.exception.CommandRunException;
 import fr.bigeon.gclc.exception.InvalidCommandName;
-import fr.bigeon.gclc.manager.PipedConsoleManager;
+import fr.bigeon.gclc.manager.ConsoleInput;
+import fr.bigeon.gclc.manager.ConsoleOutput;
+import fr.bigeon.gclc.manager.PipedConsoleInput;
+import fr.bigeon.gclc.manager.PipedConsoleOutput;
 
 /** <p>
  * TODO
@@ -67,49 +71,65 @@ public class SWTConsoleViewTest {
     public void test() {
         final Shell shell = new Shell(DISPLAY);
         final SWTConsoleView swtConsole = new SWTConsoleView(shell, SWT.NONE);
-        try (PipedConsoleManager manager = new PipedConsoleManager()) {
-            swtConsole.setManager(manager);
-        } catch (IOException e2) {
+        try (PipedConsoleOutput manager = new PipedConsoleOutput();
+             PipedConsoleInput input = new PipedConsoleInput()) {
+            swtConsole.setManager(manager, input);
+        } catch (final IOException e2) {
             assertNull(e2);
         }
-        try (PipedConsoleManager manager = new PipedConsoleManager()) {
-            swtConsole.setManager(manager);
+        try (PipedConsoleOutput manager = new PipedConsoleOutput();
+             PipedConsoleInput input = new PipedConsoleInput()) {
+            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") {
 
+                /* (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
-                public void execute(String... args) {
-                    try {
-                        Thread.sleep(TWO_SECONDS);
-                    } catch (InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
+                protected String usageDetail() {
+                    // TODO Auto-generated method stub
+                    // return null;
+                    throw new RuntimeException("Not implemented yet");
                 }
             });
 //            shell.pack();
             shell.open();
-            Thread applThread = new Thread(new Runnable() {
+            final Thread applThread = new Thread(new Runnable() {
 
                 @Override
                 public void run() {
                     appl.start();
                 }
             });
-            Thread testThread = new Thread(new Runnable() {
+            final Thread testThread = new Thread(new Runnable() {
 
                 @Override
                 public void run() {
                     try {
                         Thread.sleep(TWO_SECONDS);
-                    } catch (InterruptedException e) {
+                    } catch (final InterruptedException e) {
                         // TODO Auto-generated catch block
                         e.printStackTrace();
                     }
@@ -122,7 +142,7 @@ public class SWTConsoleViewTest {
                     });
                     try {
                         Thread.sleep(TWO_SECONDS);
-                    } catch (InterruptedException e) {
+                    } catch (final InterruptedException e) {
                         // TODO Auto-generated catch block
                         e.printStackTrace();
                     }
@@ -141,10 +161,10 @@ public class SWTConsoleViewTest {
                     DISPLAY.sleep();
                 }
             }
-        } catch (InvalidCommandName e) {
+        } catch (final InvalidCommandName e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
-        } catch (IOException e1) {
+        } catch (final IOException e1) {
             // TODO Auto-generated catch block
             e1.printStackTrace();
         }

gclc.system/pom.xml

@@ -23,7 +23,7 @@
     <dependency>
       <groupId>fr.bigeon</groupId>
       <artifactId>gclc</artifactId>
-      <version>1.3.1</version>
+      <version>2.0.0</version>
     </dependency>
   </dependencies>
   <name>GCLC system command</name>

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

@@ -15,7 +15,8 @@ import java.util.logging.Logger;
 import fr.bigeon.gclc.command.Command;
 import fr.bigeon.gclc.exception.CommandRunException;
 import fr.bigeon.gclc.exception.CommandRunExceptionType;
-import fr.bigeon.gclc.manager.ConsoleManager;
+import fr.bigeon.gclc.manager.ConsoleInput;
+import fr.bigeon.gclc.manager.ConsoleOutput;
 
 /** A command that will execute a system command.
  *
@@ -29,71 +30,68 @@ public class ExecSystemCommand extends Command {
     /** The class logger */
     private static final Logger LOGGER = Logger
             .getLogger(ExecSystemCommand.class.getName());
-    /** The manager for the application's user interface */
-    private final ConsoleManager manager;
 
-    /** @param name the name of the command (the input from the manager that
-     *            should trigger this command)
-     * @param manager the console manager for input and outputs */
-    public ExecSystemCommand(String name, ConsoleManager manager) {
-        super(name);
-        this.manager = manager;
+    /***/
+    public ExecSystemCommand() {
+        super(COMMAND_DEFAULT_NAME);
     }
 
-    /** @param manager the console manager for input and outputs */
-    public ExecSystemCommand(ConsoleManager manager) {
-        super(COMMAND_DEFAULT_NAME);
-        this.manager = manager;
+    /** @param name the name of the command (the input from the manager that
+     *            should trigger this command) */
+    public ExecSystemCommand(final String name) {
+        super(name);
     }
 
     /* (non-Javadoc)
-     * @see fr.bigeon.gclc.command.ICommand#execute(java.lang.String[]) */
-    @SuppressWarnings("resource")
+     * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.manager.
+     * ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput,
+     * java.lang.String[]) */
     @Override
-    public void execute(String... args) throws CommandRunException {
+    public void execute(final ConsoleOutput out, final ConsoleInput in,
+                        final String... args) throws CommandRunException {
         Process proc;
         try {
             proc = Runtime.getRuntime().exec(args);
-        } catch (IOException e2) {
+        } catch (final IOException e2) {
             LOGGER.log(Level.SEVERE, "Unable to run process", e2); //$NON-NLS-1$
             return;
         }
 
         final InputStream is = proc
                 .getInputStream();
-        Thread th = new Thread(new Runnable() {
+        final Thread th = new Thread(new Runnable() {
 
             @SuppressWarnings("synthetic-access")
             @Override
             public void run() {
                 try {
-                    readToEnd(is);
+                    readToEnd(out, is);
                     is.close();
-                } catch (CommandRunException e) {
+                } catch (final CommandRunException e) {
                     LOGGER.log(Level.WARNING,
                             "Manager was closed in the meantime...", e); //$NON-NLS-1$
-                } catch (IOException e) {
+                } catch (final IOException e) {
                     LOGGER.log(Level.WARNING, "Input stream was closed...", e); //$NON-NLS-1$
                 }
             }
         });
         th.start();
-        manager.setPrompt(""); //$NON-NLS-1$
+        in.setPrompt(""); //$NON-NLS-1$
         final OutputStream os = proc.getOutputStream();
         try (BufferedWriter writer = new BufferedWriter(
                 new OutputStreamWriter(os))) {
             while (th.isAlive()) {
                 String user;
                 try {
-                    user = manager.prompt();
-                } catch (IOException e) {
+                    user = in.prompt();
+                } catch (final IOException e) {
                     throw new CommandRunException(
                             CommandRunExceptionType.INTERACTION,
                             "manager was closed", e, this); //$NON-NLS-1$
                 }
                 writer.write(user + EOL);
             }
-        } catch (IOException e1) {
+        } catch (final IOException e1) {
             throw new CommandRunException(CommandRunExceptionType.INTERACTION,
                     "manager was closed", e1, this); //$NON-NLS-1$
         }
@@ -102,23 +100,31 @@ public class ExecSystemCommand extends Command {
     /** @param is the input stream
      * @throws CommandRunException if the manager was closed while writing the
      *             stream */
-    protected void readToEnd(InputStream is) throws CommandRunException {
+    protected void readToEnd(final ConsoleOutput out,
+                             final InputStream is) throws CommandRunException {
         int c;
         try {
             while ((c = is.read()) != -1) {
                 try {
-                    manager.print(Character.valueOf((char) c).toString());
-                } catch (IOException e) {
+                    out.print(Character.valueOf((char) c).toString());
+                } catch (final IOException e) {
                     throw new CommandRunException(
                             CommandRunExceptionType.INTERACTION,
                             "manager was closed", e, this); //$NON-NLS-1$
                 }
             }
-        } catch (IOException e) {
+        } catch (final IOException e) {
             LOGGER.log(Level.INFO, "input stream reading failed", e); //$NON-NLS-1$
         }
     }
 
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.command.ICommand#tip() */
+    @Override
+    public String tip() {
+        return "Execute a system command"; //$NON-NLS-1$
+    }
+
     /* (non-Javadoc)
      * @see fr.bigeon.gclc.command.Command#usageDetail() */
     @Override
@@ -139,11 +145,4 @@ public class ExecSystemCommand extends Command {
         return "  CMD <system command>"; //$NON-NLS-1$
     }
 
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.command.ICommand#tip() */
-    @Override
-    public String tip() {
-        return "Execute a system command"; //$NON-NLS-1$
-    }
-
 }

gclc/pom.xml

@@ -35,7 +35,7 @@
 <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>
 	<artifactId>gclc</artifactId>
-	<version>2.0.0</version>
+	<version>2.0.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<url>http://www.bigeon.fr/emmanuel</url>
 	<properties>
@@ -83,6 +83,6 @@
   <scm>
   
     <developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
-	<tag>gclc-2.0.0</tag>
+	<tag>gclc-1.3.5</tag>
   </scm>
 </project>

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

@@ -38,9 +38,7 @@
  */
 package fr.bigeon.gclc.manager;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.io.PrintStream;
@@ -56,67 +54,35 @@ import java.nio.charset.StandardCharsets;
 public final class PipedConsoleInput
         implements ConsoleInput {
 
-    /** The encoding between streams. */
-    private static final String UTF_8 = "UTF-8"; //$NON-NLS-1$
     /** THe inner manager. */
     private final StreamConsoleInput innerManager;
     /** The stream to pipe commands into. */
     private final PipedOutputStream commandInput;
-    /** The reader to get application return from. */
-    private final BufferedReader commandBuffOutput;
-    /** The stream to get application return from. */
-    private final PipedInputStream commandOutput;
-    /** The print writer for application to write return to. */
-    private final PrintStream outPrint;
     /** The stream for the application to read commands from. */
     private final PipedInputStream in;
     /** The writing thread. */
     private final WritingRunnable writing;
-    /** The reading thread. */
-    private final ReadingRunnable reading;
 
     /** Create a manager that will write and read through piped stream.
      *
+     * @param outPrint the stream to write the prompting messages to
      * @throws IOException if the piping failed for streams */
-    public PipedConsoleInput() throws IOException {
+    public PipedConsoleInput(final PrintStream outPrint) throws IOException {
         commandInput = new PipedOutputStream();
         in = new PipedInputStream(commandInput);
-        commandOutput = new PipedInputStream();
-        final PipedOutputStream out = new PipedOutputStream(commandOutput);
-        commandBuffOutput = new BufferedReader(
-                new InputStreamReader(commandOutput, StandardCharsets.UTF_8));
-        outPrint = new PrintStream(out, true, UTF_8);
         innerManager = new StreamConsoleInput(outPrint, in,
                 StandardCharsets.UTF_8);
         writing = new WritingRunnable(commandInput, StandardCharsets.UTF_8);
-        reading = new ReadingRunnable(commandBuffOutput);
-        Thread th = new Thread(writing, "write"); //$NON-NLS-1$
+        final Thread th = new Thread(writing,
+                "GCLC console piped input stream"); //$NON-NLS-1$
         th.start();
-        th = new Thread(reading, "read"); //$NON-NLS-1$
-        th.setDaemon(true);
-        th.start();
-    }
-
-    /** Test if a content is available on the reading head.
-     * <p>
-     * If this method returns true, the next {@link #prompt()} operation should
-     * return immediatly.
-     *
-     * @return the content of the next line written by the application
-     * @throws IOException if the reading failed */
-    public boolean available() throws IOException {
-        return reading.hasMessage();
     }
 
     @Override
     public void close() throws IOException {
-        reading.setRunning(false);
         writing.setRunning(false);
         in.close();
         innerManager.close();
-        outPrint.close();
-        commandBuffOutput.close();
-        commandOutput.close();
         commandInput.close();
     }
 
@@ -125,18 +91,6 @@ public final class PipedConsoleInput
         return innerManager.getPrompt();
     }
 
-    /** Wait for a specific message to arrive.
-     * <p>
-     * When this method returns, the message was appended to the data, it
-     * <em>may or may not</em> be the next line of data.
-     *
-     * @param message the message
-     * @return the thread to join to wait for message delivery
-     * @see fr.bigeon.gclc.manager.ReadingRunnable#getWaitForDelivery(java.lang.String) */
-    public Thread getWaitForDelivery(final String message) {
-        return reading.getWaitForDelivery(message);
-    }
-
     /* (non-Javadoc)
      * @see fr.bigeon.gclc.manager.ConsoleManager#interruptPrompt() */
     @Override
@@ -181,16 +135,6 @@ public final class PipedConsoleInput
         return innerManager.prompt(message + System.lineSeparator(), timeout);
     }
 
-    /** Read the next line in the input printed content.
-     * <p>
-     * This corresponds to the {@link #prompt(String)} messages.
-     *
-     * @return the content of the next line written by the application
-     * @throws IOException if the reading failed */
-    public String readNextLine() throws IOException {
-        return reading.getMessage();
-    }
-
     /* (non-Javadoc)
      * @see fr.bigeon.gclc.manager.ConsoleInput#setPrompt(java.lang.String) */
     @Override

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

@@ -79,7 +79,7 @@ public final class PipedConsoleOutput
         outPrint = new PrintStream(out, true, UTF_8);
         innerManager = new StreamConsoleOutput(outPrint);
         reading = new ReadingRunnable(commandBuffOutput);
-        final Thread th = new Thread(reading, "read"); //$NON-NLS-1$
+        final Thread th = new Thread(reading, "GCLC console output forward"); //$NON-NLS-1$
         th.setDaemon(true);
         th.start();
     }

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

@@ -154,7 +154,10 @@ public final class StreamConsoleInput implements ConsoleInput {
     @Override
     public String prompt(final String message) throws IOException {
         checkOpen();
-        out.print(message);
+        if (out != null) {
+            out.print(message);
+            out.flush();
+        }
         return reading.getMessage();
     }
 
@@ -164,7 +167,10 @@ public final class StreamConsoleInput implements ConsoleInput {
     public String prompt(final String message,
                          final long timeout) throws IOException {
         checkOpen();
-        out.print(message);
+        if (out != null) {
+            out.print(message);
+            out.flush();
+        }
         return reading.getNextMessage(timeout);
     }
 

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

@@ -63,7 +63,7 @@ public class CommandTestingApplication implements AutoCloseable {
     /** @throws IOException if the streams cannot be build */
     public CommandTestingApplication() throws IOException {
         out = new PipedConsoleOutput();
-        in = new PipedConsoleInput();
+        in = new PipedConsoleInput(null);
         application = new ConsoleApplication(out, in, "", "");
         new ConsoleTestApplication().attach(application);
         th = new Thread(new Runnable() {

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

@@ -44,7 +44,13 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 
 import org.junit.Test;
 
@@ -72,8 +78,13 @@ public class ConsoleApplicationTest {
     @Test
     public void testConsoleApplication() {
 
-        try (PipedConsoleInput manager = new PipedConsoleInput()) {
-            final ConsoleApplication app = new ConsoleApplication(null, manager,
+        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 ConsoleApplication app = new ConsoleApplication(null, in,
                     "", "");
             app.exit();
         } catch (final IOException e) {
@@ -146,7 +157,12 @@ public class ConsoleApplicationTest {
 
         ConsoleApplication appli = null;
         try (PipedConsoleOutput manager = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 ConsoleApplication app = new ConsoleApplication(manager, in,
                     null, null);
             appli = app;
@@ -176,7 +192,7 @@ public class ConsoleApplicationTest {
 
     @Test
     public void testInterpretCommand() throws InvalidCommandName, IOException {
-        try (PipedConsoleInput test = new PipedConsoleInput();
+        try (PipedConsoleInput test = new PipedConsoleInput(null);
              PipedConsoleOutput out = new PipedConsoleOutput()) {
             final ConsoleApplication appl = new ConsoleApplication(out, test,
                     "", "");

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

@@ -44,7 +44,13 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 
 import org.junit.Test;
 
@@ -424,59 +430,79 @@ public class ParametrizedCommandTest {
             // ok
         }
         // TODO Test of interactive not providing and providing all needed
+    }
+
+    @Test
+    public void testExecuteInteractive() throws IOException,
+                                         CommandRunException,
+                                         InterruptedException {
+        ParametrizedCommand cmd;
+        final String addParam = "additional";
+        final String str1 = "str1";
+        final String str2 = "str2";
+        final String bool1 = "bool1";
+        final String bool2 = "bool2";
+
+        cmd = new ParametrizedCommand("name", false) {
+            {
+                try {
+                    addStringParameter(str1, true);
+                    addStringParameter(str2, false);
+                    addBooleanParameter(bool1);
+                    addBooleanParameter(bool2);
+                } catch (final InvalidParameterException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            protected void doExecute(final ConsoleOutput out,
+                                     final ConsoleInput in,
+                                     final CommandParameters parameters) throws CommandRunException {
+                if (!str2.equals(parameters.get(str1))) {
+                    throw new CommandRunException("Expected other argument",
+                            this);
+                }
+            }
+
+            @Override
+            public String tip() {
+                return "";
+            }
+
+            @Override
+            protected String usageDetail() {
+                return null;
+            }
+        };
         try (PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
-            cmd = new ParametrizedCommand("name", false) {
-                {
-                    try {
-                        addStringParameter(str1, true);
-                        addStringParameter(str2, false);
-                        addBooleanParameter(bool1);
-                        addBooleanParameter(bool2);
-                    } catch (final InvalidParameterException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                }
-
-                @Override
-                protected void doExecute(final ConsoleOutput out,
-                                         final ConsoleInput in,
-                                         final CommandParameters parameters) {
-                    assertEquals(str2, parameters.get(str1));
-                }
-
-                @Override
-                public String tip() {
-                    return "";
-                }
-
-                @Override
-                protected String usageDetail() {
-                    return null;
-                }
-            };
+             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))) {
             cmd.execute(out, in, "-" + str1, str2);
             cmd.execute(out, in, "-" + str1, str2, "-" + bool1);
             cmd.execute(out, in, "-" + str1, str2, addParam);
             cmd.execute(out, in, "-" + str1, str2, "-" + addParam);
             cmd.execute(out, in, "-" + str1, str2, "-" + addParam, addParam);
 
-            Thread th = new Thread(new Runnable() {
+            final Thread th = new Thread(new Runnable() {
 
                 @Override
                 public void run() {
                     try {
-                        assertEquals("value of " + str1 + "? ",
-                                in.readNextLine());
+                        assertEquals("value of " + str1 + "? ", buf.readLine());
                         in.type("");
                         assertEquals(
                                 "value of " + str1 + "? (cannot be empty) ",
-                                in.readNextLine());
+                                buf.readLine());
                         in.type("");
                         assertEquals(
                                 "value of " + str1 + "? (cannot be empty) ",
-                                in.readNextLine());
+                                buf.readLine());
                         in.type(str2);
                     } catch (final IOException e) {
                         assertNull(e);
@@ -488,14 +514,21 @@ public class ParametrizedCommandTest {
             cmd.execute(out, in);
 
             th.join();
+        }
+        try (PipedConsoleOutput out = new PipedConsoleOutput();
+             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))) {
 
-            th = new Thread(new Runnable() {
+            final Thread th = new Thread(new Runnable() {
 
                 @Override
                 public void run() {
                     try {
-                        assertEquals("value of " + str1 + "? ",
-                                in.readNextLine());
+                        assertEquals("value of " + str1 + "? ", buf.readLine());
                         in.type(str2);
                     } catch (final IOException e) {
                         assertNull(e);
@@ -510,37 +543,7 @@ public class ParametrizedCommandTest {
         }
         try {
             final PipedConsoleOutput out = new PipedConsoleOutput();
-            final PipedConsoleInput test = new PipedConsoleInput();
-            cmd = new ParametrizedCommand("name") {
-                {
-                    try {
-                        addStringParameter(str1, true);
-                        addStringParameter(str2, false);
-                        addBooleanParameter(bool1);
-                        addBooleanParameter(bool2);
-                    } catch (final InvalidParameterException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                }
-
-                @Override
-                protected void doExecute(final ConsoleOutput out,
-                                         final ConsoleInput in,
-                                         final CommandParameters parameters) {
-                    assertEquals(str2, parameters.get(str1));
-                }
-
-                @Override
-                public String tip() {
-                    return "";
-                }
-
-                @Override
-                protected String usageDetail() {
-                    return null;
-                }
-            };
+            final PipedConsoleInput test = new PipedConsoleInput(null);
             test.close();
             out.close();
             cmd.execute(out, test, "-" + str1, str2);
@@ -549,7 +552,6 @@ public class ParametrizedCommandTest {
         } catch (final CommandRunException e) {
             // ok
         }
-
     }
 
     /** Test method for

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

@@ -69,7 +69,7 @@ public class ScriptExecutionTest {
         PipedConsoleOutput test;
         PipedConsoleInput in;
         try {
-            in = new PipedConsoleInput();
+            in = new PipedConsoleInput(null);
             test = new PipedConsoleOutput();
         } catch (final IOException e2) {
             fail("creation of console manager failed"); //$NON-NLS-1$

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

@@ -43,7 +43,13 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -80,7 +86,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptBoolean() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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() {
 
                 @Override
@@ -101,16 +112,16 @@ public class CLIPrompterTest {
                 }
             });
             th.start();
-            assertTrue(in.readNextLine().startsWith("My message")); //$NON-NLS-1$
+            assertTrue(buf.readLine().startsWith("My message")); //$NON-NLS-1$
             in.type(""); //$NON-NLS-1$
             out.readNextLine();
-            assertTrue(in.readNextLine().startsWith("My message")); //$NON-NLS-1$
+            assertTrue(buf.readLine().startsWith("My message")); //$NON-NLS-1$
             in.type("Y"); //$NON-NLS-1$
-            assertTrue(in.readNextLine().startsWith("My message")); //$NON-NLS-1$
+            assertTrue(buf.readLine().startsWith("My message")); //$NON-NLS-1$
             in.type("yes"); //$NON-NLS-1$
-            assertTrue(in.readNextLine().startsWith("My message")); //$NON-NLS-1$
+            assertTrue(buf.readLine().startsWith("My message")); //$NON-NLS-1$
             in.type("N"); //$NON-NLS-1$
-            assertTrue(in.readNextLine().startsWith("My message")); //$NON-NLS-1$
+            assertTrue(buf.readLine().startsWith("My message")); //$NON-NLS-1$
             in.type("nO"); //$NON-NLS-1$
             th.join();
         } catch (IOException | InterruptedException e) {
@@ -125,7 +136,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptChoiceConsoleManagerListOfStringListOfUStringString() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 List<String> keys = new ArrayList<>();
             final List<Object> choices = new ArrayList<>();
             keys.add("A choice"); //$NON-NLS-1$
@@ -140,12 +156,15 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertEquals(choices.get(0), CLIPrompter.promptChoice(
-                                out, in, keys, choices, message, cancel));
-                        assertEquals(choices.get(0), CLIPrompter.promptChoice(
-                                out, in, keys, choices, message, null));
-                        assertEquals(null, 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, 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();
@@ -158,7 +177,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(1)));
             assertTrue(out.readNextLine().contains(cancel));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("yoyo"); //$NON-NLS-1$
             // fail, reprompt
             final String msg = CLIPrompterMessages.getString(
@@ -171,14 +190,14 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(1)));
             assertTrue(out.readNextLine().contains(cancel));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0"); //$NON-NLS-1$
             // Sucess, reprompt without cancel
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0)));
             assertTrue(out.readNextLine().contains(keys.get(1)));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("2"); //$NON-NLS-1$
             // fail, reprompt
             assertEquals(
@@ -188,7 +207,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0)));
             assertTrue(out.readNextLine().contains(keys.get(1)));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0"); //$NON-NLS-1$
             // Sucess, prompt with cancel
             assertTrue(out.readNextLine().startsWith(message));
@@ -196,7 +215,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(1)));
             assertTrue(out.readNextLine().contains(cancel));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("2"); //$NON-NLS-1$
             th.join();
         } catch (IOException | InterruptedException e) {
@@ -208,7 +227,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptChoiceConsoleManagerListOfUMapOfUTStringString() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 List<Object> keys = new ArrayList<>();
             final Map<Object, Object> choices = new HashMap<>();
             keys.add("A choice"); //$NON-NLS-1$
@@ -223,14 +247,17 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertEquals(choices.get(keys.get(0)),
-                                CLIPrompter.promptChoice(out, in, keys,
+                        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));
-                        assertEquals(choices.get(keys.get(0)),
-                                CLIPrompter.promptChoice(out, in, keys,
-                                        choices, message, null));
-                        assertEquals(null, CLIPrompter.promptChoice(out, in,
-                                keys, choices, message, cancel));
                     } catch (final IOException e) {
                         fail("Unexpected io excpetion"); //$NON-NLS-1$
                         e.printStackTrace();
@@ -243,7 +270,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertTrue(out.readNextLine().contains(cancel));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("yoyo"); //$NON-NLS-1$
             // fail, reprompt
             final String msg = CLIPrompterMessages.getString(
@@ -256,14 +283,14 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertTrue(out.readNextLine().contains(cancel));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0"); //$NON-NLS-1$
             // Sucess, reprompt without cancel
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("2"); //$NON-NLS-1$
             // fail, reprompt
             assertEquals(
@@ -273,7 +300,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0"); //$NON-NLS-1$
             // Sucess, prompt with cancel
             assertTrue(out.readNextLine().startsWith(message));
@@ -281,7 +308,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertTrue(out.readNextLine().contains(cancel));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("2"); //$NON-NLS-1$
             th.join();
         } catch (IOException | InterruptedException e) {
@@ -293,7 +320,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptChoiceConsoleManagerListOfUStringString() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 List<Object> keys = new ArrayList<>();
             keys.add("A choice"); //$NON-NLS-1$
             keys.add("An other"); //$NON-NLS-1$
@@ -305,15 +337,18 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertEquals(Integer.valueOf(0),
-                                CLIPrompter.promptChoice(out, in, keys,
+                        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));
-                        assertEquals(Integer.valueOf(0), CLIPrompter
-                                .promptChoice(out, in, keys, message, null));
-                        assertEquals(Integer.valueOf(1), CLIPrompter
-                                .promptChoice(out, in, keys, message, null));
-                        assertEquals(null, CLIPrompter.promptChoice(out, in,
-                                keys, message, cancel));
                     } catch (final IOException e) {
                         fail("Unexpected io excpetion"); //$NON-NLS-1$
                         e.printStackTrace();
@@ -326,7 +361,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertTrue(out.readNextLine().contains(cancel));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("yoyo"); //$NON-NLS-1$
             // fail, reprompt
             final String msg = CLIPrompterMessages.getString(
@@ -339,14 +374,14 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertTrue(out.readNextLine().contains(cancel));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0"); //$NON-NLS-1$
             // Sucess, reprompt without cancel
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("2"); //$NON-NLS-1$
             // fail, reprompt
             assertEquals(
@@ -356,14 +391,14 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0"); //$NON-NLS-1$
             // Success do it again
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("1"); //$NON-NLS-1$
             // Sucess, prompt with cancel
             assertTrue(out.readNextLine().startsWith(message));
@@ -371,7 +406,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertTrue(out.readNextLine().contains(cancel));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("2"); //$NON-NLS-1$
             th.join();
         } catch (IOException | InterruptedException e) {
@@ -385,7 +420,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptChoiceConsoleManagerMapOfUTStringString() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 List<Object> keys = new ArrayList<>();
             final Map<Object, Object> choices = new HashMap<>();
             keys.add("A choice"); //$NON-NLS-1$
@@ -400,14 +440,17 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertEquals(choices.get(keys.get(0)),
-                                CLIPrompter.promptChoice(out, in, keys,
+                        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));
-                        assertEquals(choices.get(keys.get(0)),
-                                CLIPrompter.promptChoice(out, in, keys,
-                                        choices, message, null));
-                        assertEquals(null, CLIPrompter.promptChoice(out, in,
-                                keys, choices, message, cancel));
                     } catch (final IOException e) {
                         fail("Unexpected io excpetion"); //$NON-NLS-1$
                         e.printStackTrace();
@@ -422,7 +465,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertTrue(out.readNextLine().contains(cancel));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("yoyo"); //$NON-NLS-1$
             // fail, reprompt
             final String msg = CLIPrompterMessages.getString(
@@ -435,14 +478,14 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertTrue(out.readNextLine().contains(cancel));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0"); //$NON-NLS-1$
             // Sucess, reprompt without cancel
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("2"); //$NON-NLS-1$
             // fail, reprompt
             assertEquals(
@@ -452,7 +495,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0"); //$NON-NLS-1$
             // Sucess, prompt with cancel
             assertTrue(out.readNextLine().startsWith(message));
@@ -460,7 +503,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertTrue(out.readNextLine().contains(cancel));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("2"); //$NON-NLS-1$
             th.join();
         } catch (IOException | InterruptedException e) {
@@ -473,16 +516,23 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptInteger(fr.bigeon.gclc.manager.ConsoleManager, java.lang.String)}. */
     @Test
     public final void testPromptInteger() {
-        try (final PipedConsoleInput test = new PipedConsoleInput()) {
+        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() {
 
                 @Override
                 public void run() {
                     try {
-                        assertEquals(10,
-                                CLIPrompter.promptInteger(test, "My message")); //$NON-NLS-1$
-                        assertEquals(-15,
-                                CLIPrompter.promptInteger(test, "My message")); //$NON-NLS-1$
+                        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();
@@ -490,14 +540,14 @@ public class CLIPrompterTest {
                 }
             });
             th.start();
-            assertTrue(test.readNextLine().startsWith("My message")); //$NON-NLS-1$
-            test.type(""); //$NON-NLS-1$
-            assertTrue(test.readNextLine().startsWith("My message")); //$NON-NLS-1$
-            test.type("Y"); //$NON-NLS-1$
-            assertTrue(test.readNextLine().startsWith("My message")); //$NON-NLS-1$
-            test.type("10"); //$NON-NLS-1$
-            assertTrue(test.readNextLine().startsWith("My message")); //$NON-NLS-1$
-            test.type("-15"); //$NON-NLS-1$
+            assertTrue(buf.readLine().startsWith("My message")); //$NON-NLS-1$
+            in.type(""); //$NON-NLS-1$
+            assertTrue(buf.readLine().startsWith("My message")); //$NON-NLS-1$
+            in.type("Y"); //$NON-NLS-1$
+            assertTrue(buf.readLine().startsWith("My message")); //$NON-NLS-1$
+            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) {
@@ -511,7 +561,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptListConsoleManagerString() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 List<String> keys = new ArrayList<>();
             keys.add("A choice"); //$NON-NLS-1$
             keys.add("An other"); //$NON-NLS-1$
@@ -522,10 +577,11 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertEquals(new ArrayList<String>(),
-                                CLIPrompter.promptList(out, in, message));
-                        assertEquals(keys,
+                        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();
@@ -539,7 +595,7 @@ public class CLIPrompterTest {
                     .getString("promptlist.exit.dispkey", CLIPrompterMessages //$NON-NLS-1$
                             .getString("promptlist.exit.defaultkey")))); //$NON-NLS-1$
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type(CLIPrompterMessages
                     .getString("promptlist.exit.defaultkey")); //$NON-NLS-1$
             // enter keys list
@@ -549,11 +605,11 @@ public class CLIPrompterTest {
                     .getString("promptlist.exit.dispkey", CLIPrompterMessages //$NON-NLS-1$
                             .getString("promptlist.exit.defaultkey")))); //$NON-NLS-1$
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             for (int i = 0; i < keys.size(); i++) {
                 in.type(keys.get(i));
                 assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                        in.readNextLine());
+                        buf.readLine());
             }
             in.type(CLIPrompterMessages
                     .getString("promptlist.exit.defaultkey")); //$NON-NLS-1$
@@ -569,7 +625,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptListConsoleManagerStringString() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 List<String> keys = new ArrayList<>();
             keys.add("A choice"); //$NON-NLS-1$
             keys.add("An other"); //$NON-NLS-1$
@@ -581,10 +642,12 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertEquals(new ArrayList<String>(), CLIPrompter
-                                .promptList(out, in, message, ender));
-                        assertEquals(keys, CLIPrompter.promptList(out, in,
-                                message, ender));
+                        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();
@@ -597,7 +660,7 @@ public class CLIPrompterTest {
             assertTrue(nLine.endsWith(CLIPrompterMessages
                     .getString("promptlist.exit.dispkey", ender))); //$NON-NLS-1$
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type(ender);
             // enter keys list
             nLine = out.readNextLine();
@@ -605,11 +668,11 @@ public class CLIPrompterTest {
             assertTrue(nLine.endsWith(CLIPrompterMessages
                     .getString("promptlist.exit.dispkey", ender))); //$NON-NLS-1$
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             for (int i = 0; i < keys.size(); i++) {
                 in.type(keys.get(i));
                 assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                        in.readNextLine());
+                        buf.readLine());
             }
             in.type(ender);
             th.join();
@@ -624,7 +687,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptLongTextConsoleManagerString() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 String message = "My message";
             final String longText = "Some text with" + System.lineSeparator() +
                                     "line feeds and other" +
@@ -637,11 +705,12 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertEquals("", CLIPrompter.promptLongText(out, in,
-                                message));
-                        assertEquals(longText + System.lineSeparator(),
-                                CLIPrompter.promptLongText(out, in,
-                                        message));
+                        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();
@@ -655,7 +724,7 @@ public class CLIPrompterTest {
                     "promptlongtext.exit.dispkey", CLIPrompterMessages
                             .getString("promptlongtext.exit.defaultkey"))));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"),
-                    in.readNextLine());
+                    buf.readLine());
             in.type(CLIPrompterMessages
                     .getString("promptlongtext.exit.defaultkey"));
             // enter long text
@@ -665,12 +734,12 @@ public class CLIPrompterTest {
                     "promptlongtext.exit.dispkey", CLIPrompterMessages
                             .getString("promptlongtext.exit.defaultkey"))));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"),
-                    in.readNextLine());
+                    buf.readLine());
             final String[] text = longText.split(System.lineSeparator());
             for (final String element : text) {
                 in.type(element);
                 assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"),
-                        in.readNextLine());
+                        buf.readLine());
             }
             in.type(CLIPrompterMessages
                     .getString("promptlongtext.exit.defaultkey"));
@@ -686,7 +755,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptLongTextConsoleManagerStringString() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 String message = "My message";
             final String ender = "\\quit";
             final String[] text = new String[] {"Some text with",
@@ -699,10 +773,11 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertEquals("", //$NON-NLS-1$
-                                CLIPrompter.promptLongText(out, in, message,
+                        assertEquals("Asserted provided value to be retrieved", //$NON-NLS-1$
+                                "", CLIPrompter.promptLongText(out, in, message,
                                         ender));
-                        assertEquals(longText + System.lineSeparator(),
+                        assertEquals("Asserted provided value to be retrieved",
+                                longText + System.lineSeparator(),
                                 CLIPrompter.promptLongText(out, in, message,
                                         ender));
                     } catch (final IOException e) {
@@ -717,7 +792,7 @@ public class CLIPrompterTest {
             assertTrue(nLine.endsWith(CLIPrompterMessages
                     .getString("promptlongtext.exit.dispkey", ender)));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"),
-                    in.readNextLine());
+                    buf.readLine());
             in.type(ender);
             // enter long text
             nLine = out.readNextLine();
@@ -725,11 +800,11 @@ public class CLIPrompterTest {
             assertTrue(nLine.endsWith(CLIPrompterMessages
                     .getString("promptlongtext.exit.dispkey", ender)));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"),
-                    in.readNextLine());
+                    buf.readLine());
             for (final String element : text) {
                 in.type(element);
                 assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"),
-                        in.readNextLine());
+                        buf.readLine());
             }
             in.type(ender);
             th.join();
@@ -744,7 +819,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptMultiChoiceConsoleManagerListOfStringListOfUString() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 List<String> keys = new ArrayList<>();
             final List<Object> choices = new ArrayList<>();
             keys.add("A choice"); //$NON-NLS-1$
@@ -758,15 +838,18 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertTrue(CLIPrompter.promptMultiChoice(out, in,
-                                keys, choices, message).isEmpty());
+                        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(l, CLIPrompter.promptMultiChoice(out, in,
-                                keys, choices, message));
+                        assertEquals("Asserted provided value to be retrieved",
+                                l, CLIPrompter.promptMultiChoice(out, in, keys,
+                                        choices, message));
                         l.add(choices.get(1));
-                        assertEquals(l, CLIPrompter.promptMultiChoice(out, in,
-                                keys, choices, message));
+                        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();
@@ -778,7 +861,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0)));
             assertTrue(out.readNextLine().contains(keys.get(1)));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("yoyo"); //$NON-NLS-1$
             // fail, reprompt
             final String msg = CLIPrompterMessages.getString(
@@ -790,14 +873,14 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0)));
             assertTrue(out.readNextLine().contains(keys.get(1)));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type(""); //$NON-NLS-1$
             // Sucess, reprompt without cancel
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0)));
             assertTrue(out.readNextLine().contains(keys.get(1)));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("2"); //$NON-NLS-1$
             // fail, reprompt
             assertEquals(
@@ -807,14 +890,14 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0)));
             assertTrue(out.readNextLine().contains(keys.get(1)));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0"); //$NON-NLS-1$
             // Sucess, prompt with cancel
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0)));
             assertTrue(out.readNextLine().contains(keys.get(1)));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0 1"); //$NON-NLS-1$
             th.join();
         } catch (IOException | InterruptedException e) {
@@ -828,7 +911,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptMultiChoiceConsoleManagerListOfUMapOfUTString() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 List<Object> keys = new ArrayList<>();
             final Map<Object, Object> choices = new HashMap<>();
             keys.add("A choice"); //$NON-NLS-1$
@@ -842,15 +930,18 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertTrue(CLIPrompter.promptMultiChoice(out, in,
-                                keys, choices, message).isEmpty());
+                        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(l, CLIPrompter.promptMultiChoice(out, in,
-                                keys, choices, message));
+                        assertEquals("Asserted provided value to be retrieved",
+                                l, CLIPrompter.promptMultiChoice(out, in, keys,
+                                        choices, message));
                         l.add(choices.get(keys.get(1)));
-                        assertEquals(l, CLIPrompter.promptMultiChoice(out, in,
-                                keys, choices, message));
+                        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();
@@ -862,7 +953,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("yoyo"); //$NON-NLS-1$
             // fail, reprompt
             final String msg = CLIPrompterMessages.getString(
@@ -874,14 +965,14 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type(""); //$NON-NLS-1$
             // Sucess, reprompt without cancel
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("2"); //$NON-NLS-1$
             // fail, reprompt
             assertEquals(
@@ -891,14 +982,14 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0"); //$NON-NLS-1$
             // Sucess, prompt with cancel
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0 1"); //$NON-NLS-1$
             th.join();
         } catch (IOException | InterruptedException e) {
@@ -912,7 +1003,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptMultiChoiceConsoleManagerListOfUString() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 List<Object> keys = new ArrayList<>();
             keys.add("A choice"); //$NON-NLS-1$
             keys.add("An other"); //$NON-NLS-1$
@@ -923,16 +1019,18 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertTrue(CLIPrompter
-                                .promptMultiChoice(out, in, keys, message)
-                                .isEmpty());
+                        assertTrue("Asserted provided value to be retrieved",
+                                CLIPrompter.promptMultiChoice(out, in, keys,
+                                        message).isEmpty());
                         final ArrayList<Integer> l = new ArrayList<>();
                         l.add(0);
-                        assertEquals(l, CLIPrompter.promptMultiChoice(out, in,
-                                keys, message));
+                        assertEquals("Asserted provided value to be retrieved",
+                                l, CLIPrompter.promptMultiChoice(out, in, keys,
+                                        message));
                         l.add(1);
-                        assertEquals(l, CLIPrompter.promptMultiChoice(out, in,
-                                keys, message));
+                        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();
@@ -944,7 +1042,7 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("yoyo"); //$NON-NLS-1$
             // fail, reprompt
             final String msg = CLIPrompterMessages.getString(
@@ -956,14 +1054,14 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type(""); //$NON-NLS-1$
             // Sucess, reprompt without cancel
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("2"); //$NON-NLS-1$
             // fail, reprompt
             assertEquals(
@@ -973,14 +1071,14 @@ public class CLIPrompterTest {
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0"); //$NON-NLS-1$
             // Sucess, prompt with cancel
             assertTrue(out.readNextLine().startsWith(message));
             assertTrue(out.readNextLine().contains(keys.get(0).toString()));
             assertTrue(out.readNextLine().contains(keys.get(1).toString()));
             assertEquals(CLIPrompterMessages.getString("prompt.lineprompt"), //$NON-NLS-1$
-                    in.readNextLine());
+                    buf.readLine());
             in.type("0 1"); //$NON-NLS-1$
             th.join();
         } catch (IOException | InterruptedException e) {
@@ -994,7 +1092,12 @@ public class CLIPrompterTest {
     @Test
     public final void testPromptMultiChoiceConsoleManagerMapOfUTString() {
         try (final PipedConsoleOutput out = new PipedConsoleOutput();
-             PipedConsoleInput in = new PipedConsoleInput()) {
+             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 List<Object> keys = new ArrayList<>();
             final Map<Object, Object> choices = new HashMap<>();
             keys.add("A choice"); //$NON-NLS-1$
@@ -1008,15 +1111,18 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertTrue(CLIPrompter.promptMultiChoice(out, in, keys,
-                                choices, message).isEmpty());
+                        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(l, CLIPrompter.promptMultiChoice(out, in,
-                                keys, choices, message));
+                        assertEquals("Asserted provided value to be retrieved",
+                                l, CLIPrompter.promptMultiChoice(out, in, keys,
+                                        choices, message));
                         l.add(choices.get(keys.get(1)));
-                        assertEquals(l, CLIPrompter.promptMultiChoice(out, in,
-                                keys, choices, message));
+                        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();
@@ -1069,15 +1175,21 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptNonEmpty(fr.bigeon.gclc.manager.ConsoleManager, java.lang.String, java.lang.String)}. */
     @Test
     public final void testPromptNonEmpty() {
-        try (final PipedConsoleInput test = new PipedConsoleInput()) {
+        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 String res = "some content"; //$NON-NLS-1$
             final Thread th = new Thread(new Runnable() {
 
                 @Override
                 public void run() {
                     try {
-                        assertEquals(res, CLIPrompter.promptNonEmpty(test,
-                                "My message", "my reprompt")); //$NON-NLS-1$ //$NON-NLS-2$
+                        assertEquals("Expected provided message to be returned",
+                                res, CLIPrompter.promptNonEmpty(in,
+                                        "My message", "my reprompt")); //$NON-NLS-1$ //$NON-NLS-2$
                     } catch (final IOException e) {
                         fail("Unexpected io excpetion"); //$NON-NLS-1$
                         e.printStackTrace();
@@ -1085,10 +1197,10 @@ public class CLIPrompterTest {
                 }
             });
             th.start();
-            assertTrue(test.readNextLine().startsWith("My message")); //$NON-NLS-1$
-            test.type(""); //$NON-NLS-1$
-            assertTrue(test.readNextLine().startsWith("my reprompt")); //$NON-NLS-1$
-            test.type(res);
+            assertTrue(buf.readLine().startsWith("My message")); //$NON-NLS-1$
+            in.type(""); //$NON-NLS-1$
+            assertTrue(buf.readLine().startsWith("my reprompt")); //$NON-NLS-1$
+            in.type(res);
             th.join();
 
         } catch (IOException | InterruptedException e) {