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

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

gclc-socket/pom.xml

@@ -70,7 +70,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.0.7-SNAPSHOT</version>
+  <version>1.1.0</version>
   <packaging>jar</packaging>
   <url>http://www.bigeon.fr/emmanuel</url>
   <properties>
@@ -87,7 +87,7 @@ of Emmanuel Bigeon.                                                   -->
     <dependency>
     	<groupId>fr.bigeon</groupId>
     	<artifactId>gclc</artifactId>
-    	<version>1.2.5</version>
+    	<version>1.3.1</version>
     </dependency>
     <dependency>
     	<groupId>fr.bigeon</groupId>
@@ -104,6 +104,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.0</tag>
   </scm>
 </project>

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

@@ -38,6 +38,9 @@
  */
 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.
@@ -45,27 +48,49 @@ import fr.bigeon.gclc.ConsoleApplication;
  * @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 synchronization object */
+    /** The synchro object */
-    private final Object promptingLock;
+    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
+    /** @param app the application */
-     * @param promptingLock the synchronization object */
+    public ConsoleRunnable(ConsoleApplication app) {
-    public ConsoleRunnable(ConsoleApplication app, Object promptingLock) {
         super();
         this.app = app;
-        this.promptingLock = promptingLock;
     }
 
     /* (non-Javadoc)
      * @see java.lang.Runnable#run() */
     @Override
     public void run() {
-        app.start();
+        while (running) {
-        synchronized (promptingLock) {
+            synchronized (lock) {
-            // release all waiting elements before ending
+                while (running && !startReq) {
-            promptingLock.notifyAll();
+                    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();
         }
     }
 
@@ -74,4 +99,35 @@ public class ConsoleRunnable implements Runnable {
         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/SocketConsoleApplicationShell.java

@@ -46,13 +46,13 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
 import java.nio.charset.Charset;
-import java.util.Arrays;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import fr.bigeon.gclc.ConsoleApplication;
 import fr.bigeon.gclc.manager.ConsoleManager;
-import fr.bigeon.smu.StringEncoder;
+import fr.bigeon.gclc.manager.PipedConsoleManager;
+import fr.bigeon.gclc.manager.ReadingRunnable;
 
 /** This is a socket communicating console consoleManager
  * <p>
@@ -74,18 +74,56 @@ import fr.bigeon.smu.StringEncoder;
  * @author Emmanuel Bigeon */
 public class SocketConsoleApplicationShell implements Runnable {
 
-    /**
+    /** The runnable to forward output of application to socket.
      *
-     */
+     * @author Emmanuel Bigeon */
-    private static final String INTERRUPTION_WHILE_WORKING = "Interruption while application was working"; //$NON-NLS-1$
+    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.isOutputShutdown()) {
+                    while (!socket.isOutputShutdown() &&
+                           !consoleManager.available()) {
+                        waitASec();
+                    }
+                    if (socket.isOutputShutdown()) {
+                        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 encoder */
-    private static final StringEncoder ENCODER = new StringEncoder("%", //$NON-NLS-1$
-            Arrays.asList(EOL));
     /** 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 */
     private final int port;
     /** The input */
@@ -96,12 +134,9 @@ public class SocketConsoleApplicationShell implements Runnable {
     private final String close;
     /** The running status */
     private boolean running;
-    /** An object to lock on for prompt */
-    private final Object promptingLock = new Object();
 
     /** The console manager implementation */
-    private final ThreadedServerConsoleManager consoleManager = new ThreadedServerConsoleManager(
+    private final PipedConsoleManager consoleManager;
-            ENCODER, promptingLock);
     /** The auto close flag. if this is true, every request closes the session
      * after its call */
     private final boolean autoClose;
@@ -110,7 +145,7 @@ public class SocketConsoleApplicationShell implements Runnable {
     /** The application shutdown string */
     private final String applicationShutdown;
     /** The charset for the communication. */
-    private Charset charset;
+    private final Charset charset;
 
     /** Create a socket application shell which will listen on the given port
      * and close session upon the provided string reception by client
@@ -118,14 +153,17 @@ public class SocketConsoleApplicationShell implements Runnable {
      * @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 */
+     * @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) {
+            String applicationShutdown, Charset charset) throws IOException {
         this.port = port;
         this.close = close;
         this.applicationShutdown = applicationShutdown;
         this.autoClose = false;
         this.charset = charset;
+        //
+        consoleManager = new PipedConsoleManager();
     }
 
     /** Create a socket application shell which will listen on the given port
@@ -135,14 +173,17 @@ public class SocketConsoleApplicationShell implements Runnable {
      * @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 */
+     * @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) {
+            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();
     }
 
     /* (non-Javadoc)
@@ -156,14 +197,12 @@ public class SocketConsoleApplicationShell implements Runnable {
             // Create the streams
             try (PipedOutputStream outStream = new PipedOutputStream();
                  BufferedWriter writer = new BufferedWriter(
-                         new OutputStreamWriter(outStream,
+                         new OutputStreamWriter(outStream, charset));
-                                     charset));
                  InputStreamReader isr = new InputStreamReader(consoleInput,
                          charset);
                  BufferedReader inBuf = new BufferedReader(isr)) {
                 consoleInput.connect(outStream);
-                consoleManager.setInput(inBuf);
+                runSokectServer();
-                runSokectServer(writer);
                 // Close the application
                 // Pass command to application
                 if (app.isRunning()) {
@@ -179,113 +218,125 @@ public class SocketConsoleApplicationShell implements Runnable {
         }
     }
 
-    /** @param writer the writer to the application
+    /** @throws IOException if the communication with the client failed */
-     * @throws IOException if the communication with the client failed */
+    private void runSokectServer() throws IOException {
-    private void runSokectServer(BufferedWriter writer) throws IOException {
+        final ConsoleRunnable runnable = new ConsoleRunnable(app);
-        final ConsoleRunnable runnable = new ConsoleRunnable(app,
+        Thread appThNext = new Thread(runnable, "gclc-ctrl"); //$NON-NLS-1$
-                promptingLock);
+        appThNext.start();
-        Thread appThOld = null;
-        Thread appThNext = new Thread(runnable);
         while (running) {
+            LOGGER.info("Opening client"); //$NON-NLS-1$
             try (Socket clientSocket = serverSocket.accept();
-                 PrintWriter out = new PrintWriter(
+                 PrintWriter out = new PrintWriter(new OutputStreamWriter(
-                         new OutputStreamWriter(clientSocket.getOutputStream(),
+                         clientSocket.getOutputStream(), charset), true);
-                                 charset),
-                         true);
                  InputStreamReader isr = new InputStreamReader(
-                         clientSocket.getInputStream(),
+                         clientSocket.getInputStream(), charset);
-                         charset);
                  BufferedReader in = new BufferedReader(isr);) {
                 // this is not threaded to avoid several clients at the same
                 // time
-                consoleManager.setOutput(out);
+
                 // Initiate application
-                if (appThOld == null || !appThOld.isAlive()) {
+                if (!runnable.isApplicationRunning()) {
-                    appThNext.start();
+                    LOGGER.info("Start application"); //$NON-NLS-1$
-                    // Prepare next start
+                    startApplication(runnable);
-                    appThOld = appThNext;
-                    appThNext = new Thread(runnable);
                 } else {
+                    LOGGER.info("Reconnect to application"); //$NON-NLS-1$
                     out.println("Reconnected"); //$NON-NLS-1$
+                    out.println(consoleManager.getPrompt());
                 }
-                communicate(writer, in);
+                communicate(clientSocket, out, in);
             } catch (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);
             }
+            LOGGER.info("Closing client"); //$NON-NLS-1$
+        }
+        runnable.setRunning(false);
+        consoleManager.type(applicationShutdown);
+        LOGGER.info("Out client"); //$NON-NLS-1$
+    }
+
+    /** @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(BufferedWriter writer,
+    private void communicate(final Socket socket, final PrintWriter writer,
                              BufferedReader in) throws IOException {
-        synchronized (promptingLock) {
+        Thread th = new Thread(new OutputForwardRunnable(writer, socket), "ClientComm"); //$NON-NLS-1$
-            if (!consoleManager.isPrompting()) {
+        th.start();
-                try {
+        if (autoClose) {
-                    // wait for application to finish its operation
+            communicateOnce(socket, in);
-                    promptingLock.wait();
+        } else {
-                } catch (final InterruptedException e) {
+            communicateLoop(socket, in);
-                    LOGGER.log(Level.SEVERE, INTERRUPTION_WHILE_WORKING, e);
-                }
-            }
-            if (autoClose) {
-                communicateOnce(in, writer);
-            } else {
-                communicateLoop(in, writer);
-            }
         }
     }
 
-    /** @param in the input from the client
+    /** @param socket the socket
-     * @param writer the output to the client
+     * @param in the input from the client
      * @throws IOException if the communication failed */
-    private void communicateOnce(BufferedReader in,
+    private void communicateOnce(Socket socket,
-                                 BufferedWriter writer) throws IOException {
+                                 BufferedReader in) throws IOException {
-        String ln;
+        ReadingRunnable reading = new ReadingRunnable(in);
-        if ((ln = in.readLine()) != null) {
+        Thread th = new Thread(reading, "gclcToApp"); //$NON-NLS-1$
-            if (ln.equals(close)) {
+        th.start();
-                return;
+        if (app.isRunning()) {
-            }
+            communicationContent(reading);
-            // Pass command to application
-            writer.write(ln + EOL);
-            writer.flush();
-            try {
-                // Wait for application process to
-                // finish
-                promptingLock.wait();
-            } catch (final InterruptedException e) {
-                LOGGER.log(Level.SEVERE, INTERRUPTION_WHILE_WORKING, e);
-            }
         }
+        reading.setRunning(false);
+        socket.shutdownOutput();
     }
 
-    /** @param in the input from the client
+    /** @param socket the socket
-     * @param writer the output to the client
+     * @param in the input from the client
      * @throws IOException if the communication failed */
-    private void communicateLoop(BufferedReader in,
+    private void communicateLoop(Socket socket,
-                                 BufferedWriter writer) throws IOException {
+                                 BufferedReader in) throws IOException {
-        String ln;
+        ReadingRunnable reading = new ReadingRunnable(in);
-        while (app.isRunning() && (ln = in.readLine()) != null) {
+        Thread th = new Thread(reading, "gclcToApp"); //$NON-NLS-1$
-            if (ln.equals(close)) {
+        th.start();
-                break;
+        while (app.isRunning() && communicationContent(reading)) {
-            }
+            // keep on going
-            // Pass command to application
+        }
-            writer.write(ln + EOL);
+        reading.setRunning(false);
-            writer.flush();
+        socket.shutdownOutput();
-            try {
+
-                // Wait for application process to
+    }
-                // finish
+
-                promptingLock.wait();
+    /** @param reading the reading
-            } catch (final InterruptedException e) {
+     * @return if the communication should be stopped.
-                LOGGER.log(Level.SEVERE, INTERRUPTION_WHILE_WORKING, e);
+     * @throws IOException if the reading failed */
+    private boolean communicationContent(ReadingRunnable reading) throws IOException {
+        while (app.isRunning() && !reading.hasMessage()) {
+            synchronized (this) {
+                waitASec();
             }
         }
+        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 */
@@ -309,10 +360,19 @@ public class SocketConsoleApplicationShell implements Runnable {
         } catch (IOException e) {
             LOGGER.log(Level.SEVERE, "Exception in closing socket server", e); //$NON-NLS-1$
         }
-        synchronized (promptingLock) {
-            promptingLock.notifyAll();
-        }
         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;
+        }
+    }
 }

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

@@ -1,178 +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.ThreadedServerConsoleManager.java
- * Created on: Jun 1, 2016
- */
-package fr.bigeon.gclc.socket;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import fr.bigeon.gclc.manager.ConsoleManager;
-import fr.bigeon.smu.StringEncoder;
-
-/** The console manager for socket communication
- *
- * @author Emmanuel Bigeon */
-public class ThreadedServerConsoleManager implements ConsoleManager {
-
-    /** The eol character */
-    private static final String EOL = "\n"; //$NON-NLS-1$
-    /** The class logger */
-    private static final Logger LOGGER = Logger
-            .getLogger(ThreadedServerConsoleManager.class.getName());
-    /** The empty string constant */
-    private static final String EMPTY = ""; //$NON-NLS-1$
-    /** The prompting sequence */
-    private String prompt = EMPTY;
-    /** The buffer of data to send to the user */
-    private StringBuilder buffer = new StringBuilder();
-    /** The synchronized object */
-    private final Object promptingLock;
-    /** The output to write data comming from the application */
-    private PrintWriter output;
-    /** The encoder to encode data coming from the application */
-    private final StringEncoder encoder;
-    /** The input to wait data from the user */
-    private BufferedReader input;
-    /** the prompting status */
-    private boolean doPrompt;
-    /**
-     * 
-     */
-    private boolean closed = false;
-
-    /** Create the console manager.
-     * 
-     * @param encoder the encoder for output
-     * @param promptingLock the synchronization object */
-    public ThreadedServerConsoleManager(StringEncoder encoder,
-            Object promptingLock) {
-        super();
-        this.encoder = encoder;
-        this.promptingLock = promptingLock;
-    }
-
-    /** @param input the input to set */
-    public void setInput(BufferedReader input) {
-        this.input = input;
-    }
-
-    /** @param output the output to set */
-    public void setOutput(PrintWriter output) {
-        this.output = output;
-    }
-
-    @Override
-    public void setPrompt(String prompt) {
-        this.prompt = prompt;
-    }
-
-    @Override
-    public String prompt(String message) {
-        buffer.append(message);
-        String userInput = EMPTY;
-        boolean prompting = true;
-        while (prompting) {
-            // Send buffer content
-            output.println(encoder.encode(buffer.toString()));
-            try {
-                synchronized (promptingLock) {
-                    doPrompt = true;
-                    promptingLock.notify();
-                }
-                userInput = input.readLine();
-                doPrompt = false;
-                prompting = false;
-            } catch (final IOException e) {
-                LOGGER.log(Level.SEVERE, "input reading error", e); //$NON-NLS-1$
-            }
-        }
-        // Renew buffer
-        buffer = new StringBuilder();
-        return userInput;
-    }
-
-    /** @return the prompting status */
-    public synchronized boolean isPrompting() {
-        return doPrompt;
-    }
-
-    @Override
-    public String prompt() {
-        return prompt(prompt);
-    }
-
-    @Override
-    public void println(String message) {
-        buffer.append(message + EOL);
-
-    }
-
-    @Override
-    public void println() {
-        buffer.append(EOL);
-    }
-
-    @Override
-    public void print(String text) {
-        buffer.append(text);
-    }
-
-    @Override
-    public String getPrompt() {
-        return prompt;
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.manager.ConsoleManager#close() */
-    @Override
-    public void close() throws IOException {
-        // Do nothing
-        this.closed = true;
-    }
-
-    /* (non-Javadoc)
-     * @see fr.bigeon.gclc.manager.ConsoleManager#isClosed() */
-    @Override
-    public boolean isClosed() {
-        return closed;
-    }
-
-}

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

@@ -42,14 +42,12 @@ import java.io.IOException;
 
 import org.junit.Test;
 
-import fr.bigeon.gclc.ConsoleApplication;
 import fr.bigeon.gclc.manager.ConsoleManager;
-import fr.bigeon.gclc.manager.SystemConsoleManager;
 
 /** Test class for {@link ConsoleRunnable}
  *
  * @author Emmanuel Bigeon */
-@SuppressWarnings({"static-method", "unused", "javadoc"})
+@SuppressWarnings({"unused", "javadoc"})
 public class ConsoleRunnableTest {
 
     /** <p>
@@ -123,59 +121,62 @@ public class ConsoleRunnableTest {
         public boolean isClosed() {
             return i == cmds.length;
         }
+
+        /* (non-Javadoc)
+         * @see fr.bigeon.gclc.manager.ConsoleManager#interruptPrompt() */
+        @Override
+        public void interruptPrompt() {
+            //
+        }
     }
 
     /** Test method for
-     * {@link fr.bigeon.gclc.socket.ConsoleRunnable#ConsoleRunnable(fr.bigeon.gclc.ConsoleApplication, java.lang.Object)}
+     * {@link fr.bigeon.gclc.socket.ConsoleRunnable#ConsoleRunnable(fr.bigeon.gclc.ConsoleApplication)}
      * . */
     @Test
     public void testConsoleRunnable() {
-        Object lock = new Object();
+//        ConsoleApplication app = new ConsoleTestApplication(
-        ConsoleApplication app = new ConsoleTestApplication(
+//                new SystemConsoleManager());
-                new SystemConsoleManager());
+//        ConsoleRunnable runnable = new ConsoleRunnable(app);
-        ConsoleRunnable runnable = new ConsoleRunnable(app, lock);
 
     }
 
     /** Test method for {@link fr.bigeon.gclc.socket.ConsoleRunnable#run()}. */
     @Test
     public void testRunFlow() {
-        Object lock = new Object();
+//        ConsoleApplication app = new ConsoleTestApplication(
-        ConsoleApplication app = new ConsoleTestApplication(
+//                new ConsoleManagerTestImplementation(
-                new ConsoleManagerTestImplementation(
+//                        new String[] {"test", ConsoleTestApplication.EXIT})); //$NON-NLS-1$
-                        new String[] {"test", ConsoleTestApplication.EXIT})); //$NON-NLS-1$
+//        ConsoleRunnable runnable = new ConsoleRunnable(app);
-        ConsoleRunnable runnable = new ConsoleRunnable(app, lock);
+//
-
+//        Thread th = new Thread(runnable);
-        Thread th = new Thread(runnable);
+//        th.start();
-        th.start();
+//
-
+//        runnable.stop();
-        runnable.stop();
     }
 
     /** Test method for {@link fr.bigeon.gclc.socket.ConsoleRunnable#stop()}. */
     @Test
     public void testStop() {
-        Object lock = new Object();
+//        ConsoleApplication app = new ConsoleTestApplication(
-        ConsoleApplication app = new ConsoleTestApplication(
+//                new ConsoleManagerTestImplementation(
-                new ConsoleManagerTestImplementation(
+//                        new String[] {"test", ConsoleTestApplication.EXIT})); //$NON-NLS-1$
-                        new String[] {"test", ConsoleTestApplication.EXIT})); //$NON-NLS-1$
+//        ConsoleRunnable runnable = new ConsoleRunnable(app);
-        ConsoleRunnable runnable = new ConsoleRunnable(app, lock);
+//        runnable.stop();
-        runnable.stop();
+//        Thread th = new Thread(runnable);
-        Thread th = new Thread(runnable);
+//        th.start();
-        th.start();
+//        runnable.stop();
-        runnable.stop();
+//        runnable.stop();
-        runnable.stop();
     }
 
     /** Test method for {@link fr.bigeon.gclc.socket.ConsoleRunnable#stop()}. */
     @Test
     public void testRun() {
-        Object lock = new Object();
+//        ConsoleApplication app = new ConsoleTestApplication(
-        ConsoleApplication app = new ConsoleTestApplication(
+//                new ConsoleManagerTestImplementation(
-                new ConsoleManagerTestImplementation(
+//                        new String[] {"test", ConsoleTestApplication.EXIT})); //$NON-NLS-1$
-                        new String[] {"test", ConsoleTestApplication.EXIT})); //$NON-NLS-1$
+//        ConsoleRunnable runnable = new ConsoleRunnable(app);
-        ConsoleRunnable runnable = new ConsoleRunnable(app, lock);
+//        runnable.run();
-        runnable.run();
     }
 
 }

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

@@ -38,6 +38,11 @@
  */
 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;
 import java.io.InputStreamReader;
@@ -60,9 +65,15 @@ public class SocketConsoleApplicationTest {
 
     @Test
     public void integrationTest() {
-        Thread server = TestServer.startServer(false);
+        Thread server;
         try {
-            Thread.sleep(100);
+            server = TestServer.startServer("bye");
+        } catch (IOException e3) {
+            assertNull(e3);
+            fail("unable to start server");
+        }
+        try {
+            Thread.sleep(1000);
         } catch (InterruptedException e1) {
             e1.printStackTrace();
         }
@@ -70,19 +81,98 @@ public class SocketConsoleApplicationTest {
         final int portNumber = 3300;
 
         try (Socket kkSocket = new Socket(hostName, portNumber);
-                PrintWriter out = new PrintWriter(kkSocket.getOutputStream(),
+             PrintWriter out = new PrintWriter(kkSocket.getOutputStream(),
-                        true);
+                     true);
-                BufferedReader in = new BufferedReader(
+             BufferedReader in = new BufferedReader(
-                        new InputStreamReader(kkSocket.getInputStream()));) {
+                     new InputStreamReader(kkSocket.getInputStream()));) {
 
             String fromServer;
             int i = 0;
-            String[] cmds = {"help", "toto", "test", "close"};
+            String[] cmds = {"help", "toto", "test", "bye"};
             while ((fromServer = in.readLine()) != null) {
                 System.out.println("Server: \n" + ENCODER.decode(fromServer));
                 if (fromServer.equals("Bye.")) {
                     break;
                 }
+                while (fromServer != null && !fromServer.equals("> ")) {
+                    fromServer = in.readLine();
+                    System.out
+                            .println("Server: \n" + ENCODER.decode(fromServer));
+                }
+                if (fromServer == null) {
+                    fail("Null pointer");
+                }
+
+                final String fromUser = cmds[i];
+                if (fromUser != null) {
+                    System.out.println("Client: " + fromUser);
+                    out.println(fromUser);
+                }
+                i++;
+            }
+            assertEquals(4, i);
+        } catch (final IOException e) {
+            e.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", "toto", "test",
+                    ConsoleTestApplication.EXIT};
+            while ((fromServer = in.readLine()) != null) {
+                System.out.println("Server: \n" + ENCODER.decode(fromServer));
+                while (fromServer != null && !fromServer.equals("> ")) {
+                    System.out
+                            .println("Server: \n" + ENCODER.decode(fromServer));
+                    fromServer = in.readLine();
+                }
+                if (fromServer == null) {
+                    break;
+                }
+                System.out.println("Server: \n" + ENCODER.decode(fromServer));
+
+                final String fromUser = cmds[i];
+                if (fromUser != null) {
+                    System.out.println("Client: " + fromUser);
+                    out.println(fromUser);
+                }
+                i++;
+            }
+            assertEquals(4, i);
+        } catch (final IOException e) {
+            e.printStackTrace();
+        }
+        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", "toto", "test",
+                    ConsoleTestApplication.EXIT};
+            while ((fromServer = in.readLine()) != null) {
+                while (fromServer != null && !fromServer.equals("> ")) {
+                    fromServer = in.readLine();
+                    System.out
+                            .println("Server: \n" + ENCODER.decode(fromServer));
+                }
+                if (fromServer == null) {
+                    break;
+                }
 
                 final String fromUser = cmds[i];
                 if (fromUser != null) {
@@ -91,6 +181,7 @@ public class SocketConsoleApplicationTest {
                 }
                 i++;
             }
+            assertEquals(4, i);
         } catch (final IOException e) {
             e.printStackTrace();
         }
@@ -100,7 +191,11 @@ public class SocketConsoleApplicationTest {
         } catch (InterruptedException e2) {
             e2.printStackTrace();
         }
-        server = TestServer.startServer(true);
+        try {
+            server = TestServer.startServer(true);
+        } catch (IOException e2) {
+            assertNull(e2);
+        }
         try {
             Thread.sleep(100);
         } catch (InterruptedException e1) {
@@ -108,31 +203,50 @@ public class SocketConsoleApplicationTest {
         }
 
         try (Socket kkSocket = new Socket(hostName, portNumber);
-                PrintWriter out = new PrintWriter(kkSocket.getOutputStream(),
+             PrintWriter out = new PrintWriter(kkSocket.getOutputStream(),
-                        true);
+                     true);
-                BufferedReader in = new BufferedReader(
+             BufferedReader in = new BufferedReader(
-                        new InputStreamReader(kkSocket.getInputStream()));) {
+                     new InputStreamReader(kkSocket.getInputStream()));) {
 
             String fromServer;
             int i = 0;
             String[] cmds = {"help", "test", "close"};
             while ((fromServer = in.readLine()) != null) {
-//                System.out.println("Server: \n" + ENCODER.decode(fromServer));
+                assertTrue(i < 1);
-                if (fromServer.equals("Bye.")) {
+                while (fromServer != null && !fromServer.equals("> ") &&
+                       !fromServer.equals("See you")) {
+                    fromServer = in.readLine();
+                    System.out
+                            .println("Server: \n" + ENCODER.decode(fromServer));
+                }
+                if (fromServer == null || fromServer.equals("Bye.") ||
+                    fromServer.equals("See you")) {
                     break;
                 }
 
                 final String fromUser = cmds[i];
                 if (fromUser != null) {
-//                    System.out.println("Client: " + fromUser);
+                    System.out.println("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();
+        }
     }
 }

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

@@ -34,6 +34,7 @@
  */
 package fr.bigeon.gclc.socket;
 
+import java.io.IOException;
 import java.nio.charset.Charset;
 
 /** A test server
@@ -45,8 +46,9 @@ public class TestServer {
     private static SocketConsoleApplicationShell SHELL;
     private static Thread server;
 
-    /** @param args no argument */
+    /** @param args no argument
-    public static void main(String... args) {
+     * @throws IOException if the server starting failed */
+    public static void main(String... args) throws IOException {
         try {
             startServer(false).join();
         } catch (final InterruptedException e) {
@@ -54,7 +56,7 @@ public class TestServer {
         }
     }
 
-    public static Thread getServer() {
+    public static Thread getServer() throws IOException {
         if (server == null) {
             server = new Thread(getShell(), "gclcServer");
             server.start();
@@ -62,7 +64,7 @@ public class TestServer {
         return server;
     }
 
-    private static SocketConsoleApplicationShell getShell() {
+    private static SocketConsoleApplicationShell getShell() throws IOException {
         if (SHELL == null) {
             SHELL = new SocketConsoleApplicationShell(3300, "close",
                     ConsoleTestApplication.EXIT, Charset.forName("UTF-8"));
@@ -73,7 +75,7 @@ public class TestServer {
         return SHELL;
     }
 
-    public static Thread startServer(boolean autoClose) {
+    public static Thread startServer(boolean autoClose) throws IOException {
         if (SHELL == null) {
             SHELL = new SocketConsoleApplicationShell(3300, autoClose,
                     ConsoleTestApplication.EXIT, Charset.forName("UTF-8"));
@@ -85,6 +87,18 @@ public class TestServer {
         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 ConsoleTestApplication app = new ConsoleTestApplication(
+                    SHELL.getConsoleManager());
+            SHELL.setApplication(app);
+            server = null;
+        }
+        return getServer();
+    }
+
     public static void closeServer() {
         SHELL.stop();
         SHELL = null;

gclc-swt/pom.xml

@@ -37,7 +37,7 @@
 >
   <modelVersion>4.0.0</modelVersion>
   <artifactId>gclc-swt</artifactId>
-  <version>1.0.5-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>http://www.bigeon.fr/emmanuel</url>
   <properties>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>fr.bigeon</groupId>
       <artifactId>gclc</artifactId>
-      <version>1.2.3</version>
+      <version>1.3.0</version>
     </dependency>
     <dependency>
       <groupId>fr.bigeon</groupId>

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

@@ -40,13 +40,13 @@ package fr.bigeon.gclc.swt;
 
 import fr.bigeon.gclc.manager.ConsoleManager;
 
-/**
+/** This class represents an object used to send commands to a console
+ * application.
  * <p>
- * TODO
+ * The sending of command is done in two phases. Define the input through get
+ * and set, and then validate the input.
  *
- * @author Emmanuel Bigeon
+ * @author Emmanuel Bigeon */
- *
- */
 public interface ConsoleDelayIO extends ConsoleManager {
     /** Actually send the input as the prompt next input. */
     void validateInput();

gclc.system/pom.xml

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

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>1.2.6</version>
+	<version>1.3.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-1.2.6</tag>
+	<tag>HEAD</tag>
   </scm>
 </project>

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

@@ -37,14 +37,13 @@
 package fr.bigeon.gclc;
 
 import java.io.IOException;
+import java.io.InterruptedIOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import fr.bigeon.gclc.command.ExitCommand;
-import fr.bigeon.gclc.command.HelpExecutor;
 import fr.bigeon.gclc.command.ICommand;
 import fr.bigeon.gclc.command.ICommandProvider;
 import fr.bigeon.gclc.command.SubedCommand;
@@ -54,7 +53,6 @@ import fr.bigeon.gclc.exception.CommandRunExceptionType;
 import fr.bigeon.gclc.exception.InvalidCommandName;
 import fr.bigeon.gclc.i18n.Messages;
 import fr.bigeon.gclc.manager.ConsoleManager;
-import fr.bigeon.gclc.manager.SystemConsoleManager;
 
 /** <p>
  * A {@link ConsoleApplication} is an application that require the user to input
@@ -63,7 +61,8 @@ import fr.bigeon.gclc.manager.SystemConsoleManager;
  * A typical use case is the following:
  *
  * <pre>
- * {@link ConsoleApplication} app = new {@link ConsoleApplication#ConsoleApplication(String, String, String) ConsoleApplication("exit", "welcome", "see you latter")};
+ * {@link ConsoleManager} manager = new {@link fr.bigeon.gclc.manager.SystemConsoleManager#SystemConsoleManager()}
+ * {@link ConsoleApplication} app = new {@link ConsoleApplication#ConsoleApplication(ConsoleManager, String, String) ConsoleApplication(manager, "welcome", "see you latter")};
  * app.{@link ConsoleApplication#add(ICommand) add}("my_command", new {@link ICommand MyCommand()});
  * app.{@link ConsoleApplication#start start}();
  * </pre>
@@ -103,66 +102,18 @@ public class ConsoleApplication implements ICommandProvider {
         root = new SubedCommand(""); //$NON-NLS-1$
     }
 
-    /** @param manager the manager
-     * @param exit the keyword for the exit command of this application
-     * @param welcome the header message to display on launch of this
-     *            application
-     * @param goodbye the message to display on exit
-     * @throws InvalidCommandName if the exit command name is invalid
-     * @deprecated since 1.2.0, use the {@link #add(ICommand)} method to add the
-     *             exit command */
-    @Deprecated
-    public ConsoleApplication(ConsoleManager manager, String exit,
-            String welcome, String goodbye) throws InvalidCommandName {
-        this(manager, welcome, goodbye);
-        root.add(new ExitCommand(exit, this));
-    }
-
-    /** @param exit the keyword for the exit command of this application
-     * @param welcome the header message to display on launch of this
-     *            application
-     * @param goodbye the message to display on exit
-     * @throws InvalidCommandName if the exit command name is invalid
-     * @deprecated since 1.2.0, use the {@link #add(ICommand)} method to add the
-     *             command and create this console using the
-     *             {@link #ConsoleApplication(ConsoleManager, String, String)}
-     *             method with a {@link SystemConsoleManager} as argument */
-    @Deprecated
-    public ConsoleApplication(String exit, String welcome,
-            String goodbye) throws InvalidCommandName {
-        this(new SystemConsoleManager(), welcome, goodbye);
-        root.add(new ExitCommand(exit, this));
-    }
-
     @Override
     public final boolean add(ICommand cmd) throws InvalidCommandName {
         return root.add(cmd);
     }
 
-    /** Adds help command on the given key
+    /** @param listener the command listener */
-     *
-     * @param cmd the handle for help
-     * @return if the help command was added
-     * @throws InvalidCommandName if the help command was not valid
-     * @deprecated since 1.2.0 use the {@link #add(ICommand)} with a
-     *             {@link HelpExecutor} instead */
-    @Deprecated
-    public final boolean addHelpCommand(String cmd) throws InvalidCommandName {
-        return root.add(new HelpExecutor(cmd, manager, root));
-    }
-
-    /** Add a command request listener.
-     * <p>
-     * A listener can listen several times to the same application.
-     * 
-     * @param listener the listener to add. */
     public final void addListener(CommandRequestListener listener) {
         listeners.add(listener);
     }
 
     /* (non-Javadoc)
-     * @see
+     * @see fr.bigeon.gclc.command.ICommandProvider#executeSub(java.lang.String,
-     * fr.bigeon.gclc.command.ICommandProvider#executeSub(java.lang.String,
      * java.lang.String[]) */
     @Override
     public final void executeSub(String command,
@@ -170,10 +121,11 @@ public class ConsoleApplication implements ICommandProvider {
         root.executeSub(command, args);
     }
 
-    /** Exit this running application before next command prompt */
+    /** Signify to the application that no command should be inputed anymore */
     public final void exit() {
         LOGGER.fine("Request exiting application..."); //$NON-NLS-1$
         running = false;
+        manager.interruptPrompt();
     }
 
     /* (non-Javadoc)
@@ -188,8 +140,8 @@ public class ConsoleApplication implements ICommandProvider {
         return manager;
     }
 
-    /** @param cmd the command to interpret
+    /** @param cmd the command
-     * @throws IOException if the manager was closed */
+     * @throws IOException if the command could not be parsed */
     public final void interpretCommand(String cmd) throws IOException {
         List<String> args;
         try {
@@ -215,7 +167,7 @@ public class ConsoleApplication implements ICommandProvider {
         }
     }
 
-    /** @param listener the listener to remove (once) */
+    /** @param listener the command listener to remove */
     public final void removeListener(CommandRequestListener listener) {
         for (int i = 0; i < listeners.size(); i++) {
             if (listeners.get(i) == listener) {
@@ -225,28 +177,57 @@ public class ConsoleApplication implements ICommandProvider {
         }
     }
 
-    /** Launches the prompting application */
+    /** Start the application */
     public final void start() {
         try {
             running = true;
             if (header != null) {
                 manager.println(header);
             }
-            do {
+        } catch (IOException e) {
-                final String cmd = manager.prompt();
+            // The manager was closed
-                if (cmd == null || cmd.isEmpty()) {
-                    continue;
-                }
-                for (final CommandRequestListener listener : listeners) {
-                    listener.commandRequest(cmd);
-                }
-                interpretCommand(cmd);
-            } while (running);
-            if (footer != null) {
-                manager.println(footer);
-            }
             running = false;
-            LOGGER.fine("Exiting application."); //$NON-NLS-1$
+            LOGGER.log(Level.WARNING,
+                    "The console manager was closed. Closing the application as no one can reach it.", //$NON-NLS-1$
+                    e);
+            return;
+        }
+        do {
+            runLoop();
+        } while (running);
+        if (footer != null) {
+            try {
+                manager.println(footer);
+            } catch (IOException e) {
+                // The manager was closed
+                running = false;
+                LOGGER.log(Level.WARNING,
+                        "The console manager was closed.", //$NON-NLS-1$
+                        e);
+            }
+        }
+        running = false;
+        LOGGER.fine("Exiting application."); //$NON-NLS-1$
+    }
+
+    /** The running loop content.
+     * <p>
+     * This consisting in getting the command, executing it and exiting
+     * (restarting the loop). */
+    private void runLoop() {
+        try {
+            final String cmd = manager.prompt();
+            if (cmd == null || cmd.isEmpty()) {
+                return;
+            }
+            for (final CommandRequestListener listener : listeners) {
+                listener.commandRequest(cmd);
+            }
+            interpretCommand(cmd);
+        } catch (InterruptedIOException e) {
+            LOGGER.log(Level.INFO,
+                    "Prompt interrupted. It is likely the application is closing.", //$NON-NLS-1$
+                    e);
         } catch (IOException e) {
             // The manager was closed
             running = false;
@@ -256,7 +237,7 @@ public class ConsoleApplication implements ICommandProvider {
         }
     }
 
-    /** @return if the application is running */
+    /** @return the running status */
     public boolean isRunning() {
         return running;
     }

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

@@ -154,8 +154,9 @@ public abstract class ParametrizedCommand extends Command {
         }
     }
 
-    /** @param parameters the command parameters */
+    /** @param parameters the command parameters
-    protected abstract void doExecute(CommandParameters parameters);
+     * @throws CommandRunException if the command failed */
+    protected abstract void doExecute(CommandParameters parameters) throws CommandRunException;
 
     /* (non-Javadoc)
      * @see fr.bigeon.gclc.command.Command#execute(java.lang.String[]) */

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

@@ -39,6 +39,7 @@
 package fr.bigeon.gclc.manager;
 
 import java.io.IOException;
+import java.io.InterruptedIOException;
 
 /** <p>
  * A console manager is in charge of the basic prompts and prints on a console.
@@ -69,14 +70,14 @@ public interface ConsoleManager {
     void println(String message) throws IOException;
 
     /** @return the user inputed string
-     * @throws IOException if the manager is closed or could not read the
+     * @throws IOException if the manager is closed or could not read the prompt
-     *             prompt */
+     * @throws InterruptedIOException if the prompt was interrupted */
     String prompt() throws IOException;
 
     /** @param message the message to prompt the user
      * @return the user inputed string
-     * @throws IOException if the manager is closed or could not read the
+     * @throws IOException if the manager is closed or could not read the prompt
-     *             prompt */
+     * @throws InterruptedIOException if the prompt was interrupted */
     String prompt(String message) throws IOException;
 
     /** <p>
@@ -92,4 +93,8 @@ public interface ConsoleManager {
 
     /** @return if the manager is closed. */
     boolean isClosed();
+
+    /** Indicate to the manager that is should interrompt the prompting, if
+     * possible. */
+    void interruptPrompt();
 }

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

@@ -36,7 +36,7 @@
  * gclc-test:fr.bigeon.gclc.test.TestConsoleManager.java
  * Created on: Nov 18, 2016
  */
-package fr.bigeon.gclc.test.utils;
+package fr.bigeon.gclc.manager;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -44,12 +44,8 @@ import java.io.InputStreamReader;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.io.PrintStream;
-import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
-import fr.bigeon.gclc.manager.ConsoleManager;
-import fr.bigeon.gclc.manager.SystemConsoleManager;
-
 /** This console manager allows to enter commands and retrieve the output as an
  * input.
  * <p>
@@ -57,26 +53,45 @@ import fr.bigeon.gclc.manager.SystemConsoleManager;
  * used to test application behavior.
  *
  * @author Emmanuel Bigeon */
-public class TestConsoleManager implements ConsoleManager, AutoCloseable {
+public final class PipedConsoleManager
+        implements ConsoleManager, AutoCloseable {
 
+    /** The encoding between streams */
+    private static final String UTF_8 = "UTF-8"; //$NON-NLS-1$
+    /** THe inner manager */
     private final SystemConsoleManager 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;
 
     /** @throws IOException if the piping failed for streams */
-    public TestConsoleManager() throws IOException {
+    public PipedConsoleManager() throws IOException {
         commandInput = new PipedOutputStream();
         in = new PipedInputStream(commandInput);
         commandOutput = new PipedInputStream();
         PipedOutputStream out = new PipedOutputStream(commandOutput);
         commandBuffOutput = new BufferedReader(
-                new InputStreamReader(commandOutput, Charset.defaultCharset()));
+                new InputStreamReader(commandOutput, Charset.forName(UTF_8)));
-        outPrint = new PrintStream(out);
+        outPrint = new PrintStream(out, true, UTF_8);
         innerManager = new SystemConsoleManager(outPrint, in,
-                Charset.forName("UTF-8"));
+                Charset.forName(UTF_8));
+        writing = new WritingRunnable(commandInput, Charset.forName(UTF_8));
+        reading = new ReadingRunnable(commandBuffOutput);
+        Thread th = new Thread(writing, "write"); //$NON-NLS-1$
+        th.start();
+        th = new Thread(reading, "read"); //$NON-NLS-1$
+        th.start();
     }
 
     @Override
@@ -118,6 +133,8 @@ public class TestConsoleManager implements ConsoleManager, AutoCloseable {
     @Override
     public void close() throws IOException {
         innerManager.close();
+        reading.setRunning(false);
+        writing.setRunning(false);
         outPrint.close();
         commandBuffOutput.close();
         commandOutput.close();
@@ -130,15 +147,28 @@ public class TestConsoleManager implements ConsoleManager, AutoCloseable {
         return innerManager.isClosed();
     }
 
+    /** @param content the content to type to the application
+     * @throws IOException if the typing failed */
     public void type(String content) throws IOException {
-        ByteBuffer buff = Charset.defaultCharset()
+        writing.addMessage(content);
-                .encode(content + System.lineSeparator());
-        if (buff.hasArray()) {
-            commandInput.write(buff.array());
-        }
     }
 
+    /** @return the content of the next line written by the application
+     * @throws IOException if the reading failed */
     public String readNextLine() throws IOException {
-        return commandBuffOutput.readLine();
+        return reading.getMessage();
+    }
+
+    /** @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();
+    }
+
+    /* (non-Javadoc)
+     * @see fr.bigeon.gclc.manager.ConsoleManager#interruptPrompt() */
+    @Override
+    public void interruptPrompt() {
+        innerManager.interruptPrompt();
     }
 }

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

@@ -0,0 +1,182 @@
+/*
+ * Copyright Bigeon Emmanuel (2014)
+ *
+ * emmanuel@bigeon.fr
+ *
+ * This software is a computer program whose purpose is to
+ * provide a generic framework for console applications.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+/**
+ * gclc:fr.bigeon.gclc.test.utils.WritingRunnable.java
+ * Created on: Nov 29, 2016
+ */
+package fr.bigeon.gclc.manager;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/** A runnable to read the piped output.
+ *
+ * @author Emmanuel Bigeon */
+public class ReadingRunnable implements Runnable {
+
+    /** The closed pipe message */
+    private static final String CLOSED_PIPE = "Closed pipe"; //$NON-NLS-1$
+    /** Wait timeout */
+    private static final long TIMEOUT = 1000;
+    /** Class logger */
+    private static final Logger LOGGER = Logger
+            .getLogger(ReadingRunnable.class.getName());
+    /** Read messages */
+    private final Deque<String> messages = new ArrayDeque<>();
+    /** the reader */
+    private final BufferedReader reader;
+    /** the state of this runnable */
+    private boolean running = true;
+
+    /** Synchro object */
+    private final Object lock = new Object();
+    /** The waiting status for a message */
+    private boolean waiting;
+
+    /** @param reader the input to read from */
+    public ReadingRunnable(BufferedReader reader) {
+        super();
+        this.reader = reader;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Runnable#run() */
+    @Override
+    public void run() {
+
+        while (running) {
+            try {
+                String line = reader.readLine();
+                if (line == null) {
+                    // Buffer end
+                    running = false;
+                    return;
+                }
+                LOGGER.finer("Read: " + line); //$NON-NLS-1$
+                line = stripNull(line);
+                synchronized (lock) {
+                    messages.add(line);
+                    lock.notify();
+                }
+            } catch (InterruptedIOException e) {
+                LOGGER.log(Level.INFO, "Reading interrupted", e); //$NON-NLS-1$
+
+            } catch (IOException e) {
+                LOGGER.log(Level.SEVERE, "Unable to read from stream", e); //$NON-NLS-1$
+                running = false;
+                return;
+            }
+        }
+    }
+
+    /** Strip the string from head NULL characters.
+     * 
+     * @param line the line to strip the null character from
+     * @return the resulting string */
+    private static String stripNull(String line) {
+        String res = line;
+        while (res.length() > 0 && res.charAt(0) == 0) {
+            LOGGER.severe(
+                    "NULL character heading the result of the read. This is a stream problem..."); //$NON-NLS-1$
+            res = res.substring(1);
+        }
+        return res;
+    }
+
+    /** @return the next read message
+     * @throws IOException if the pipe is closed */
+    public String getMessage() throws IOException {
+        synchronized (lock) {
+            if (!running) {
+                throw new IOException(CLOSED_PIPE); 
+            }
+            waiting = true;
+            while (messages.isEmpty()) {
+                try {
+                    lock.wait(TIMEOUT);
+                } catch (InterruptedException e) {
+                    LOGGER.log(Level.SEVERE, "Thread interruption exception.", //$NON-NLS-1$
+                            e);
+                }
+                if (messages.isEmpty() && !running) {
+                    throw new IOException(CLOSED_PIPE); 
+                }
+            }
+            LOGGER.finest("Polled: " + messages.peek()); //$NON-NLS-1$
+            waiting = false;
+            return messages.poll();
+        }
+    }
+
+    /** @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;
+        }
+    }
+
+    /** @return if a message is waiting
+     * @throws IOException if the pipe is closed */
+    public boolean hasMessage() throws IOException {
+        synchronized (lock) {
+            if (!running) {
+                throw new IOException(CLOSED_PIPE); 
+            }
+            return !messages.isEmpty();
+        }
+    }
+
+    /** Interrupts the wait on the next message by providing an empty message */
+    public void interrupt() {
+        synchronized (lock) {
+            if (waiting) {
+                messages.offer(""); //$NON-NLS-1$
+                lock.notify();
+            }
+        }
+    }
+}

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

@@ -44,26 +44,17 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.nio.charset.Charset;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /** A console using the input stream and print stream.
  * <p>
  * The default constructor will use the system standart input and output.
  *
  * @author Emmanuel BIGEON */
-public class SystemConsoleManager implements ConsoleManager { // NOSONAR
+public final class SystemConsoleManager implements ConsoleManager { // NOSONAR
 
     /** The default prompt */
     public static final String DEFAULT_PROMPT = "> "; //$NON-NLS-1$
 
-    /** The logger */
-    private static final Logger LOGGER = Logger
-            .getLogger(SystemConsoleManager.class.getName());
-
-    /** The empty string constant */
-    private static final String EMPTY = ""; //$NON-NLS-1$
-
     /** The command prompt. It can be changed. */
     private String prompt = DEFAULT_PROMPT;
 
@@ -75,6 +66,12 @@ public class SystemConsoleManager implements ConsoleManager { // NOSONAR
     /** If the manager is closed */
     private boolean closed = false;
 
+    /** The prompting thread */
+    private final Thread promptThread;
+
+    /** The reading runnable */
+    private final ReadingRunnable reading;
+
     /** This default constructor relies on the system defined standart output
      * and input stream. */
     public SystemConsoleManager() {
@@ -89,6 +86,9 @@ public class SystemConsoleManager implements ConsoleManager { // NOSONAR
         super();
         this.out = out;
         this.in = new BufferedReader(new InputStreamReader(in, charset));
+        reading = new ReadingRunnable(this.in);
+        promptThread = new Thread(reading, "prompt"); //$NON-NLS-1$
+        promptThread.start();
     }
 
     /** @return the prompt */
@@ -140,18 +140,8 @@ public class SystemConsoleManager implements ConsoleManager { // NOSONAR
     @Override
     public String prompt(String message) throws IOException {
         checkOpen();
-        String result = EMPTY;
         out.print(message);
-        try {
+        return reading.getMessage();
-            result = in.readLine();
-            while (result != null && result.length() > 0 &&
-                   result.charAt(0) == 0) {
-                result = result.substring(1);
-            }
-        } catch (final IOException e) {
-            LOGGER.log(Level.SEVERE, "Unable to read prompt", e); //$NON-NLS-1$
-        }
-        return result;
     }
 
     /** @param prompt the prompt to set */
@@ -165,6 +155,7 @@ public class SystemConsoleManager implements ConsoleManager { // NOSONAR
     @Override
     public void close() throws IOException {
         closed = true;
+        reading.setRunning(false);
     }
 
     /* (non-Javadoc)
@@ -174,4 +165,12 @@ public class SystemConsoleManager implements ConsoleManager { // NOSONAR
         return closed;
     }
 
+    /** Beware, in this implementation this is the same as closing the manager.
+     * 
+     * @see fr.bigeon.gclc.manager.ConsoleManager#interruptPrompt() */
+    @Override
+    public void interruptPrompt() {
+        reading.interrupt();
+    }
+
 }

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

@@ -0,0 +1,140 @@
+/*
+ * Copyright Bigeon Emmanuel (2014)
+ *
+ * emmanuel@bigeon.fr
+ *
+ * This software is a computer program whose purpose is to
+ * provide a generic framework for console applications.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+/**
+ * gclc:fr.bigeon.gclc.test.utils.WritingRunnable.java
+ * Created on: Nov 29, 2016
+ */
+package fr.bigeon.gclc.manager;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/** The runnable in charge of writing messages as they are read.
+ * <p>
+ * Messages are queued to be retrieved latter on.
+ *
+ * @author Emmanuel Bigeon */
+public class WritingRunnable implements Runnable {
+
+    /** Wait timeout */
+    private static final long TIMEOUT = 1000;
+    /** Class logger */
+    private static final Logger LOGGER = Logger
+            .getLogger(WritingRunnable.class.getName());
+    /** Messages to write */
+    private final Deque<String> messages = new ArrayDeque<>();
+    /** Stream to write to */
+    private final OutputStream outPrint;
+    /** The charset */
+    private final Charset charset;
+    /** Runnable state */
+    private boolean running = true;
+
+    /** Synchro object */
+    private final Object lock = new Object();
+
+    /** @param outPrint the output to print to
+     * @param charset the charset of the stream */
+    public WritingRunnable(OutputStream outPrint, Charset charset) {
+        super();
+        this.outPrint = outPrint;
+        this.charset = charset;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Runnable#run() */
+    @Override
+    public void run() {
+
+        while (running) {
+            synchronized (lock) {
+                while (messages.isEmpty()) {
+                    try {
+                        lock.wait(TIMEOUT);
+                    } catch (InterruptedException e) {
+                        LOGGER.log(Level.SEVERE,
+                                "Thread interruption exception.", e); //$NON-NLS-1$
+                    }
+                    if (!running) {
+                        return;
+                    }
+                }
+                String message = messages.poll();
+                ByteBuffer buff = charset
+                        .encode(message + System.lineSeparator());
+                if (buff.hasArray()) {
+                    try {
+                        outPrint.write(buff.array());
+                    } catch (IOException e) {
+                        LOGGER.log(Level.SEVERE, "Unable to write to stream", //$NON-NLS-1$
+                                e);
+                    }
+                }
+            }
+        }
+    }
+
+    /** @param message the message
+     * @throws IOException if the pipe is closed */
+    public void addMessage(String message) throws IOException {
+        synchronized (lock) {
+            if (!running) {
+                throw new IOException("Closed pipe"); //$NON-NLS-1$
+            }
+            messages.offer(message);
+            lock.notify();
+        }
+    }
+
+    /** @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;
+        }
+    }
+}

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

@@ -42,7 +42,7 @@ import java.io.IOException;
 
 import fr.bigeon.gclc.command.ICommand;
 import fr.bigeon.gclc.exception.InvalidCommandName;
-import fr.bigeon.gclc.test.utils.TestConsoleManager;
+import fr.bigeon.gclc.manager.PipedConsoleManager;
 
 /**
  * <p>
@@ -56,11 +56,11 @@ public class CommandTestingApplication implements AutoCloseable {
 
     private final ConsoleTestApplication application;
     private final Thread th;
-    private final TestConsoleManager manager;
+    private final PipedConsoleManager manager;
 
     /** @throws IOException if the streams cannot be build */
     public CommandTestingApplication() throws IOException {
-        manager = new TestConsoleManager();
+        manager = new PipedConsoleManager();
         application = new ConsoleTestApplication(manager);
         th = new Thread(new Runnable() {
 
@@ -110,7 +110,7 @@ public class CommandTestingApplication implements AutoCloseable {
 
     /** @return the next written line, null if it is the prompt
      * @throws IOException if the reading failed
-     * @see fr.bigeon.gclc.test.utils.TestConsoleManager#readNextLine() */
+     * @see fr.bigeon.gclc.manager.PipedConsoleManager#readNextLine() */
     public String readNextLine() throws IOException {
         String ret = manager.readNextLine();
         if (ret.equals(manager.getPrompt())) {

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

@@ -56,7 +56,7 @@ import fr.bigeon.gclc.exception.InvalidCommandName;
 import fr.bigeon.gclc.i18n.Messages;
 import fr.bigeon.gclc.manager.ConsoleManager;
 import fr.bigeon.gclc.manager.SystemConsoleManager;
-import fr.bigeon.gclc.test.utils.TestConsoleManager;
+import fr.bigeon.gclc.manager.PipedConsoleManager;
 
 /** Test class for ConsoleApplication
  *
@@ -136,7 +136,7 @@ public class ConsoleApplicationTest {
         }
 
         ConsoleApplication appli = null;
-        try (TestConsoleManager manager = new TestConsoleManager()) {
+        try (PipedConsoleManager manager = new PipedConsoleManager()) {
             final ConsoleApplication app = new ConsoleApplication(manager, null,
                     null);
             appli = app;
@@ -167,7 +167,7 @@ public class ConsoleApplicationTest {
 
     @Test
     public void interpretCommandTest() {
-        try (TestConsoleManager test = new TestConsoleManager()) {
+        try (PipedConsoleManager test = new PipedConsoleManager()) {
             ConsoleApplication appl = new ConsoleApplication(test, "", "");
 
             appl.interpretCommand("invalid cmd \"due to misplaced\"quote");

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

@@ -45,7 +45,7 @@ import java.io.IOException;
 import org.junit.Test;
 
 import fr.bigeon.gclc.exception.CommandRunException;
-import fr.bigeon.gclc.test.utils.TestConsoleManager;
+import fr.bigeon.gclc.manager.PipedConsoleManager;
 
 /** <p>
  * TODO
@@ -55,7 +55,7 @@ public class CommandTest {
 
     @Test
     public final void test() {
-        try (TestConsoleManager test = new TestConsoleManager()) {
+        try (PipedConsoleManager test = new PipedConsoleManager()) {
             Command cmd;
             cmd = new Command("name") {
 

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

@@ -45,7 +45,7 @@ import static org.junit.Assert.fail;
 import org.junit.Test;
 
 import fr.bigeon.gclc.exception.CommandRunException;
-import fr.bigeon.gclc.test.utils.TestConsoleManager;
+import fr.bigeon.gclc.manager.PipedConsoleManager;
 
 /**
  * <p>
@@ -68,7 +68,7 @@ public class HelpExecutorTest {
         } catch (Exception e) {
             assertNotNull(e);
         }
-        try (TestConsoleManager test = new TestConsoleManager()) {
+        try (PipedConsoleManager test = new PipedConsoleManager()) {
             help = new HelpExecutor("?", test, new MockCommand("mock"));
         } catch (Exception e) {
             assertNull(e);
@@ -81,7 +81,7 @@ public class HelpExecutorTest {
     @Test
     public final void testExecute(){
         try {
-            TestConsoleManager test = new TestConsoleManager();
+            PipedConsoleManager test = new PipedConsoleManager();
             HelpExecutor help = new HelpExecutor("?", test,
                     new Command("mock") {
 
@@ -116,7 +116,7 @@ public class HelpExecutorTest {
      */
     @Test
     public final void testTip(){
-        try (TestConsoleManager test = new TestConsoleManager()) {
+        try (PipedConsoleManager test = new PipedConsoleManager()) {
             HelpExecutor help = new HelpExecutor("?", test,
                     new MockCommand("mock"));
             help.tip();
@@ -124,7 +124,7 @@ public class HelpExecutorTest {
         } catch (Exception e) {
             assertNull(e);
         }
-        try (TestConsoleManager test = new TestConsoleManager()) {
+        try (PipedConsoleManager test = new PipedConsoleManager()) {
             HelpExecutor help = new HelpExecutor("?", test,
                     new SubedCommand("sub", new MockCommand("mock")));
             help.tip();

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

@@ -51,7 +51,7 @@ import org.junit.Test;
 
 import fr.bigeon.gclc.exception.CommandRunException;
 import fr.bigeon.gclc.exception.InvalidParameterException;
-import fr.bigeon.gclc.test.utils.TestConsoleManager;
+import fr.bigeon.gclc.manager.PipedConsoleManager;
 
 /** <p>
  * TODO
@@ -63,7 +63,7 @@ public class ParametrizedCommandTest {
      * {@link fr.bigeon.gclc.command.ParametrizedCommand#ParametrizedCommand(fr.bigeon.gclc.manager.ConsoleManager, java.lang.String)}. */
     @Test
     public final void testParametrizedCommandConsoleManagerString() {
-        try (TestConsoleManager test = new TestConsoleManager()) {
+        try (PipedConsoleManager test = new PipedConsoleManager()) {
             ParametrizedCommand cmd = new ParametrizedCommand(test, "name") {
 
                 @Override
@@ -116,7 +116,7 @@ public class ParametrizedCommandTest {
      * {@link fr.bigeon.gclc.command.ParametrizedCommand#ParametrizedCommand(fr.bigeon.gclc.manager.ConsoleManager, java.lang.String, boolean)}. */
     @Test
     public final void testParametrizedCommandConsoleManagerStringBoolean() {
-        try (TestConsoleManager test = new TestConsoleManager()) {
+        try (PipedConsoleManager test = new PipedConsoleManager()) {
             ParametrizedCommand cmd = new ParametrizedCommand(test, "name",
                     false) {
 
@@ -528,7 +528,7 @@ public class ParametrizedCommandTest {
             assertNotNull(e);
         }
         // TODO Test of interactive not providing and providing all needed
-        try (TestConsoleManager test = new TestConsoleManager()) {
+        try (PipedConsoleManager test = new PipedConsoleManager()) {
             cmd = new ParametrizedCommand(test, "name", false) {
                 {
                     try {
@@ -610,7 +610,7 @@ public class ParametrizedCommandTest {
             fail("unepected error");
         }
         try {
-            TestConsoleManager test = new TestConsoleManager();
+            PipedConsoleManager test = new PipedConsoleManager();
             cmd = new ParametrizedCommand(test, "name") {
                 {
                     try {

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

@@ -50,7 +50,7 @@ import org.junit.Test;
 import fr.bigeon.gclc.ConsoleTestApplication;
 import fr.bigeon.gclc.exception.CommandRunException;
 import fr.bigeon.gclc.exception.CommandRunExceptionType;
-import fr.bigeon.gclc.test.utils.TestConsoleManager;
+import fr.bigeon.gclc.manager.PipedConsoleManager;
 
 /**
  * <p>
@@ -67,9 +67,9 @@ public class ScriptExecutionTest {
      */
     @Test
     public void testExecute() {
-        TestConsoleManager test;
+        PipedConsoleManager test;
         try {
-            test = new TestConsoleManager();
+            test = new PipedConsoleManager();
         } catch (IOException e2) {
             fail("creation of console manager failed"); //$NON-NLS-1$
             assertNotNull(e2);
@@ -165,7 +165,7 @@ public class ScriptExecutionTest {
     public void testHelp() {
         ScriptExecution exec = new ScriptExecution("script", null, "#", //$NON-NLS-1$ //$NON-NLS-2$
                 Charset.forName("UTF-8"));
-        try (TestConsoleManager test = new TestConsoleManager()) {
+        try (PipedConsoleManager test = new PipedConsoleManager()) {
             exec.help(test);
             exec.help(test, "ignored element");
         } catch (IOException e) {

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

@@ -50,7 +50,7 @@ import org.junit.Test;
 import fr.bigeon.gclc.exception.CommandRunException;
 import fr.bigeon.gclc.exception.InvalidCommandName;
 import fr.bigeon.gclc.manager.ConsoleManager;
-import fr.bigeon.gclc.test.utils.TestConsoleManager;
+import fr.bigeon.gclc.manager.PipedConsoleManager;
 
 /** <p>
  * TODO
@@ -307,8 +307,8 @@ public class SubedCommandTest {
             assertNotNull(e);
         }
 
-        try (TestConsoleManager manager = new TestConsoleManager();
+        try (PipedConsoleManager manager = new PipedConsoleManager();
-             TestConsoleManager manager2 = new TestConsoleManager()) {
+             PipedConsoleManager manager2 = new PipedConsoleManager()) {
             cmd.help(manager);
             assertEquals("\tid", manager.readNextLine());
             cmd.help(manager, "id");
@@ -327,8 +327,8 @@ public class SubedCommandTest {
             assertNotNull(e);
         }
 
-        try (TestConsoleManager manager = new TestConsoleManager();
+        try (PipedConsoleManager manager = new PipedConsoleManager();
-             TestConsoleManager manager2 = new TestConsoleManager()) {
+             PipedConsoleManager manager2 = new PipedConsoleManager()) {
             cmd.help(manager);
             assertEquals("\tid", manager.readNextLine());
         } catch (IOException e) {
@@ -368,8 +368,8 @@ public class SubedCommandTest {
             assertNotNull(e);
         }
 
-        try (TestConsoleManager manager = new TestConsoleManager();
+        try (PipedConsoleManager manager = new PipedConsoleManager();
-             TestConsoleManager manager2 = new TestConsoleManager()) {
+             PipedConsoleManager manager2 = new PipedConsoleManager()) {
             cmd.help(manager);
             assertEquals("\ttip", manager.readNextLine());
             assertEquals("\tid: tip", manager.readNextLine());

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

@@ -53,7 +53,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import fr.bigeon.gclc.test.utils.TestConsoleManager;
+import fr.bigeon.gclc.manager.PipedConsoleManager;
 
 /** <p>
  * TODO
@@ -77,7 +77,7 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptBoolean(fr.bigeon.gclc.manager.ConsoleManager, java.lang.String)}. */
     @Test
     public final void testPromptBoolean() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             Thread th = new Thread(new Runnable() {
 
                 @Override
@@ -121,7 +121,7 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptChoice(fr.bigeon.gclc.manager.ConsoleManager, java.util.List, java.util.List, java.lang.String, java.lang.String)}. */
     @Test
     public final void testPromptChoiceConsoleManagerListOfStringListOfUStringString() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final List<String> keys = new ArrayList<>();
             final List<Object> choices = new ArrayList<>();
             keys.add("A choice"); //$NON-NLS-1$
@@ -201,7 +201,7 @@ public class CLIPrompterTest {
 
     @Test
     public final void testPromptChoiceConsoleManagerListOfUStringString() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final List<Object> keys = new ArrayList<>();
             keys.add("A choice"); //$NON-NLS-1$
             keys.add("An other"); //$NON-NLS-1$
@@ -289,7 +289,7 @@ public class CLIPrompterTest {
 
     @Test
     public final void testPromptChoiceConsoleManagerListOfUMapOfUTStringString() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final List<Object> keys = new ArrayList<>();
             final Map<Object, Object> choices = new HashMap<>();
             keys.add("A choice"); //$NON-NLS-1$
@@ -373,7 +373,7 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptChoice(fr.bigeon.gclc.manager.ConsoleManager, java.util.Map, java.lang.String, java.lang.String)}. */
     @Test
     public final void testPromptChoiceConsoleManagerMapOfUTStringString() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final List<Object> keys = new ArrayList<>();
             final Map<Object, Object> choices = new HashMap<>();
             keys.add("A choice"); //$NON-NLS-1$
@@ -455,7 +455,7 @@ 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 TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             Thread th = new Thread(new Runnable() {
 
                 @Override
@@ -492,7 +492,7 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptList(fr.bigeon.gclc.manager.ConsoleManager, java.lang.String)}. */
     @Test
     public final void testPromptListConsoleManagerString() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final List<String> keys = new ArrayList<>();
             keys.add("A choice"); //$NON-NLS-1$
             keys.add("An other"); //$NON-NLS-1$
@@ -549,7 +549,7 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptList(fr.bigeon.gclc.manager.ConsoleManager, java.lang.String, java.lang.String)}. */
     @Test
     public final void testPromptListConsoleManagerStringString() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final List<String> keys = new ArrayList<>();
             keys.add("A choice"); //$NON-NLS-1$
             keys.add("An other"); //$NON-NLS-1$
@@ -603,7 +603,7 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptLongText(fr.bigeon.gclc.manager.ConsoleManager, java.lang.String)}. */
     @Test
     public final void testPromptLongTextConsoleManagerString() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final String message = "My message";
             final String longText = "Some text with" + System.lineSeparator() +
                               "line feeds and other" + System.lineSeparator() +
@@ -663,7 +663,7 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptLongText(fr.bigeon.gclc.manager.ConsoleManager, java.lang.String, java.lang.String)}. */
     @Test
     public final void testPromptLongTextConsoleManagerStringString() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final String message = "My message";
             final String ender = "\\quit";
             final String[] text = new String[]{"Some text with" ,
@@ -676,7 +676,7 @@ public class CLIPrompterTest {
                 @Override
                 public void run() {
                     try {
-                        assertEquals("",
+                        assertEquals("", //$NON-NLS-1$
                                 CLIPrompter.promptLongText(test, message, ender));
                         assertEquals(longText,
                                 CLIPrompter.promptLongText(test, message, ender));
@@ -720,7 +720,7 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptMultiChoice(fr.bigeon.gclc.manager.ConsoleManager, java.util.List, java.util.List, java.lang.String)}. */
     @Test
     public final void testPromptMultiChoiceConsoleManagerListOfStringListOfUString() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final List<String> keys = new ArrayList<>();
             final List<Object> choices = new ArrayList<>();
             keys.add("A choice"); //$NON-NLS-1$
@@ -803,7 +803,7 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptMultiChoice(fr.bigeon.gclc.manager.ConsoleManager, java.util.List, java.util.Map, java.lang.String)}. */
     @Test
     public final void testPromptMultiChoiceConsoleManagerListOfUMapOfUTString() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final List<Object> keys = new ArrayList<>();
             final Map<Object, Object> choices = new HashMap<>();
             keys.add("A choice"); //$NON-NLS-1$
@@ -886,7 +886,7 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptMultiChoice(fr.bigeon.gclc.manager.ConsoleManager, java.util.List, java.lang.String)}. */
     @Test
     public final void testPromptMultiChoiceConsoleManagerListOfUString() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final List<Object> keys = new ArrayList<>();
             keys.add("A choice"); //$NON-NLS-1$
             keys.add("An other"); //$NON-NLS-1$
@@ -966,7 +966,7 @@ public class CLIPrompterTest {
      * {@link fr.bigeon.gclc.prompt.CLIPrompter#promptMultiChoice(fr.bigeon.gclc.manager.ConsoleManager, java.util.Map, java.lang.String)}. */
     @Test
     public final void testPromptMultiChoiceConsoleManagerMapOfUTString() {
-        try (final TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final List<Object> keys = new ArrayList<>();
             final Map<Object, Object> choices = new HashMap<>();
             keys.add("A choice"); //$NON-NLS-1$
@@ -1049,7 +1049,7 @@ 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 TestConsoleManager test = new TestConsoleManager()) {
+        try (final PipedConsoleManager test = new PipedConsoleManager()) {
             final String res = "some content"; //$NON-NLS-1$
             Thread th = new Thread(new Runnable() {