emmanuel/gclc-core
emmanuel/gclc-core
1
0
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases Wiki Activity

Compare commits

base: emmanuel:master
Branches Tags
emmanuel:master
emmanuel:dev
emmanuel:swt-1.2.1
emmanuel:gclc-2.1.5
emmanuel:gclc-2.1.2
emmanuel:gclc-2.1.1
emmanuel:socket-1.1.18
emmanuel:socket-1.1.17
emmanuel:socket-1.1.16
emmanuel:socket-1.1.15
emmanuel:swt-1.2.0
emmanuel:socket-1.1.14
emmanuel:process-0.0.6
emmanuel:gclc-2.1.0
emmanuel:gclc-2.0.12
emmanuel:process-0.0.5
emmanuel:swt-1.1.6
emmanuel:socket-1.1.13
emmanuel:process-0.0.4
emmanuel:system-0.0.2
emmanuel:gclc-2.0.11
emmanuel:socket-1.1.12
emmanuel:gclc-2.0.10
emmanuel:gclc-socket-1.1.11
emmanuel:gclc-2.0.9
emmanuel:gclc-2.0.8
emmanuel:process-0.0.3
emmanuel:system-0.0.1
emmanuel:gclc-swt-1.1.5
emmanuel:gclc-socket-1.1.10
emmanuel:gclc-2.0.7
emmanuel:gclc-2.0.6
emmanuel:process-0.0.2
emmanuel:gclc-2.0.5
emmanuel:gclc-2.0.4
emmanuel:gclc-2.0.3
emmanuel:gclc-2.0.2
emmanuel:gclc-swt-1.1.4
emmanuel:gclc-socket-1.1.9
emmanuel:gclc-2.0.1
emmanuel:gclc-2.0.0
emmanuel:gclc-1.5.0
emmanuel:gclc-socket-1.1.8
emmanuel:gclc-1.4.0
emmanuel:gclc-1.3.7
emmanuel:gclc-swt-1.1.3
emmanuel:gclc-socket-1.1.7
emmanuel:gclc-1.3.6
emmanuel:gclc-1.3.4
emmanuel:gclc-socket-1.1.6
emmanuel:gclc-socket-1.1.5
emmanuel:gclc-1.3.3
emmanuel:gclc-socket-1.1.4
emmanuel:gclc-swt-1.1.2
emmanuel:gclc-socket-1.1.3
emmanuel:gclc-socket-1.1.2
emmanuel:gclc-1.3.2
emmanuel:gclc-socket-1.1.1
emmanuel:gclc-swt-1.1.1
emmanuel:gclc-swt-1.1.0
emmanuel:gclc-socket-1.1.0
emmanuel:gclc-1.3.1
emmanuel:gclc-1.3.0
emmanuel:gclc-1.2.6
emmanuel:gclc-1.2.5
emmanuel:gclc-1.2.4
emmanuel:gclc-1.2.3
emmanuel:gclc-socket-1.0.6
emmanuel:gclc-socket-1.0.5
emmanuel:gclc-socket-1.0.4
emmanuel:gclc-1.2.2
emmanuel:gclc-1.2.1
emmanuel:gclc-swt-1.0.2
..
compare: emmanuel:socket-1.1.14
Branches Tags
emmanuel:master
emmanuel:dev
emmanuel:swt-1.2.1
emmanuel:gclc-2.1.5
emmanuel:gclc-2.1.2
emmanuel:gclc-2.1.1
emmanuel:socket-1.1.18
emmanuel:socket-1.1.17
emmanuel:socket-1.1.16
emmanuel:socket-1.1.15
emmanuel:swt-1.2.0
emmanuel:socket-1.1.14
emmanuel:process-0.0.6
emmanuel:gclc-2.1.0
emmanuel:gclc-2.0.12
emmanuel:process-0.0.5
emmanuel:swt-1.1.6
emmanuel:socket-1.1.13
emmanuel:process-0.0.4
emmanuel:system-0.0.2
emmanuel:gclc-2.0.11
emmanuel:socket-1.1.12
emmanuel:gclc-2.0.10
emmanuel:gclc-socket-1.1.11
emmanuel:gclc-2.0.9
emmanuel:gclc-2.0.8
emmanuel:process-0.0.3
emmanuel:system-0.0.1
emmanuel:gclc-swt-1.1.5
emmanuel:gclc-socket-1.1.10
emmanuel:gclc-2.0.7
emmanuel:gclc-2.0.6
emmanuel:process-0.0.2
emmanuel:gclc-2.0.5
emmanuel:gclc-2.0.4
emmanuel:gclc-2.0.3
emmanuel:gclc-2.0.2
emmanuel:gclc-swt-1.1.4
emmanuel:gclc-socket-1.1.9
emmanuel:gclc-2.0.1
emmanuel:gclc-2.0.0
emmanuel:gclc-1.5.0
emmanuel:gclc-socket-1.1.8
emmanuel:gclc-1.4.0
emmanuel:gclc-1.3.7
emmanuel:gclc-swt-1.1.3
emmanuel:gclc-socket-1.1.7
emmanuel:gclc-1.3.6
emmanuel:gclc-1.3.4
emmanuel:gclc-socket-1.1.6
emmanuel:gclc-socket-1.1.5
emmanuel:gclc-1.3.3
emmanuel:gclc-socket-1.1.4
emmanuel:gclc-swt-1.1.2
emmanuel:gclc-socket-1.1.3
emmanuel:gclc-socket-1.1.2
emmanuel:gclc-1.3.2
emmanuel:gclc-socket-1.1.1
emmanuel:gclc-swt-1.1.1
emmanuel:gclc-swt-1.1.0
emmanuel:gclc-socket-1.1.0
emmanuel:gclc-1.3.1
emmanuel:gclc-1.3.0
emmanuel:gclc-1.2.6
emmanuel:gclc-1.2.5
emmanuel:gclc-1.2.4
emmanuel:gclc-1.2.3
emmanuel:gclc-socket-1.0.6
emmanuel:gclc-socket-1.0.5
emmanuel:gclc-socket-1.0.4
emmanuel:gclc-1.2.2
emmanuel:gclc-1.2.1
emmanuel:gclc-swt-1.0.2

No commits in common. "master" and "socket-1.1.14" have entirely different histories.
master ... socket-1.1

69 changed files with 532 additions and 925 deletions
Show Stats Expand all files Collapse all files

8
gclc-process/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>net.bigeon.config</groupId>
<artifactId>ebigeon-config</artifactId>
<version>1.8.33</version>
<version>1.8.21</version>
</parent>
<groupId>net.bigeon.gclc</groupId>
@ -38,7 +38,7 @@
</developers>
<scm>
<tag>HEAD</tag>
<developerConnection>scm:git:gitea@git.code.bigeon.net:emmanuel/gclc-core.git</developerConnection>
<developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -49,12 +49,12 @@
<dependency>
<groupId>net.bigeon</groupId>
<artifactId>gclc</artifactId>
<version>2.1.5</version>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>net.bigeon.test</groupId>
<artifactId>junitmt</artifactId>
<version>1.0.4</version>
<version>1.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>

9
gclc-process/src/main/java/net/bigeon/gclc/process/ForkTask.java
View File

@ -100,7 +100,7 @@ public abstract class ForkTask implements Task {
/** Create the task.
*
* @param lines the number of print to store in the output */
protected ForkTask(final int lines) {
public ForkTask(final int lines) {
out = new ConnectingConsoleOutput(ConnectingConsoleOutput.PERSIST, lines);
}
@ -142,19 +142,16 @@ public abstract class ForkTask implements Task {
* @param timeout the maximal time to join for (0 for ever) */
public final void join(final ConsoleOutput out, final ConsoleInput in,
final long timeout) {
final long tic = System.currentTimeMillis();
synchronized (runLock) {
this.out.connect(out);
this.in.connect(in);
long tac = System.currentTimeMillis() - tic;
while (running && tac < timeout) {
try {
if (running) {
runLock.wait(timeout);
}
} catch (final InterruptedException e) {
Thread.currentThread().interrupt();
}
tac = System.currentTimeMillis() - tic;
}
this.out.disconnect();
this.in.disconnect();
}

4
gclc-process/src/main/java/net/bigeon/gclc/process/TaskSpawner.java
View File

@ -84,8 +84,8 @@ public abstract class TaskSpawner extends Command {
private final ExecutorService threadPool;
/** @param name the command name
* @param threadPool the pool */
protected TaskSpawner(final String name, final TaskPool pool,
* @param pool the pool */
public TaskSpawner(final String name, final TaskPool pool,
final ExecutorService threadPool) {
super(name);
this.pool = pool;

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

@ -72,16 +72,20 @@ import java.io.InterruptedIOException;
import java.util.function.Supplier;
import net.bigeon.gclc.manager.ConsoleInput;
import net.bigeon.gclc.tools.ConstantString;
/** A console input that can be connected to and diconnected from.
*
* @author Emmanuel Bigeon */
public final class ConnectingConsoleInput implements ConsoleInput {
/** The empty string provider. */
private static final ConstantString EMPTY_STRING = new ConstantString("");
/** If the input is closed. */
private boolean close = false;
/** The prompt string. */
private Supplier<String> prompt = () -> "";
private Supplier<String> prompt = EMPTY_STRING;
/** If the input is currently in prompting state.
* <p>
* To change it you should be in a promptLock. */
@ -206,18 +210,10 @@ public final class ConnectingConsoleInput implements ConsoleInput {
return doPrompt(message, timeout, tic);
}
/** Actually do the prompting
*
* @param message the prompt message
* @param timeout the time to wait for an answer
* @param tic the moment the wait started
* @return the message provided through the prompting
* @throws IOException if an IO error occurred while prompting. */
private String doPrompt(final String message, final long timeout, final long tic)
throws IOException {
do {
if (!checkPrompt()) {
// We are not prompting... lets stop here.
break;
}
getConnection(getTimeoutLeft(tic, timeout));
@ -228,13 +224,10 @@ public final class ConnectingConsoleInput implements ConsoleInput {
actualConnected = connected;
}
if (!connect) {
// There is no provide of input... So lets start again, until we actually
// DO get a provider of input.
continue;
}
try {
final String res = actualPrompt(message, timeout, tic, actualConnected);
// We got something from the prompting
synchronized (promptLock) {
if (prompting) {
prompting = false;
@ -293,10 +286,10 @@ public final class ConnectingConsoleInput implements ConsoleInput {
}
private void getConnection(final long timeout) throws InterruptedIOException {
final long tic = System.currentTimeMillis();
boolean connect;
synchronized (connectionLock) {
while ((connected == null || !interrupting)
&& (tic + timeout) > System.currentTimeMillis()) {
connect = connected != null;
if (!connect) {
try {
connectionLock.wait(timeout);
} catch (final InterruptedException e) {
@ -314,7 +307,7 @@ public final class ConnectingConsoleInput implements ConsoleInput {
* @see fr.bigeon.gclc.manager.ConsoleInput#setPrompt(java.lang.String) */
@Override
public void setPrompt(final String prompt) {
this.prompt = () -> prompt;
this.prompt = new ConstantString(prompt);
}
/* (non-Javadoc)

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

@ -1,6 +1,10 @@
package net.bigeon.gclc.process.io;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.IOException;
import java.io.InterruptedIOException;
@ -8,16 +12,16 @@ import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier;
import org.junit.Test;
import net.bigeon.gclc.manager.PipedConsoleInput;
import net.bigeon.gclc.manager.StreamConsoleInput;
import net.bigeon.gclc.tools.ConstantString;
import net.bigeon.test.junitmt.ATestRunnable;
import net.bigeon.test.junitmt.FunctionalTestRunnable;
import net.bigeon.test.junitmt.TestFunction;
import net.bigeon.test.junitmt.ThreadTest;
import net.bigeon.test.junitmt.api.ATestRunnable;
import net.bigeon.test.junitmt.api.TestFunction;
public class ConnectingConsoleInputTest {
@ -63,8 +67,9 @@ public class ConnectingConsoleInputTest {
public void testCoveragePrompt() {
final ConnectingConsoleInput in = new ConnectingConsoleInput();
in.setPrompt("test");
assertEquals("Prompt should be set correctly", "test", in.getPrompt().get());
final Supplier<String> prompt = () -> "other";
assertEquals("Prompt should be set correctly", "test",
((ConstantString) in.getPrompt()).get());
final ConstantString prompt = new ConstantString("other");
in.setPrompt(prompt);
assertEquals("Prompt should be set correctly", prompt, in.getPrompt());
}
@ -74,33 +79,40 @@ public class ConnectingConsoleInputTest {
final ConnectingConsoleInput in = new ConnectingConsoleInput();
// Unconnected
final AtomicBoolean ended = new AtomicBoolean(false);
final TestFunction one = () -> {
final TestFunction one = new TestFunction() {
@Override
public void apply() throws Exception {
try {
final String res1 = in.prompt("m1", -1);
final String res = in.prompt("m1", -1);
fail("interruption of infinite waiting prompt should cause error, but was "
+ res1);
} catch (final InterruptedIOException e1) {
+ res);
} catch (final InterruptedIOException e) {
// ok
}
try {
final String res2 = in.prompt("m2", 25000);
final String res = in.prompt("m2", 25000);
fail("interruption of finite waiting prompt should cause error, but was "
+ res2);
} catch (final InterruptedIOException e2) {
+ res);
} catch (final InterruptedIOException e) {
// ok
}
synchronized (ended) {
ended.set(true);
try {
assertNull("Overtime should return null", in.prompt("m3", 200));
} catch (final InterruptedIOException e3) {
} catch (final InterruptedIOException e) {
fail("Unexpected interruption error in overtime");
}
}
}
};
final ATestRunnable runnable = new FunctionalTestRunnable(one);
final Thread th = new Thread(runnable, "TestPromptSequence");
final Thread inter = new Thread(() -> {
final Thread th = new Thread(runnable);
final Thread inter = new Thread(new Runnable() {
@Override
public void run() {
while (!ended.get()) {
try {
th.join(100);
@ -114,6 +126,7 @@ public class ConnectingConsoleInputTest {
}
}
}
}
});
th.start();
inter.start();
@ -126,7 +139,10 @@ public class ConnectingConsoleInputTest {
in.connect(new StreamConsoleInput(null, pis, StandardCharsets.UTF_8));
final ATestRunnable runnable2 = new FunctionalTestRunnable(one);
final Thread th2 = new Thread(runnable2);
final Thread inter2 = new Thread(() -> {
final Thread inter2 = new Thread(new Runnable() {
@Override
public void run() {
while (!ended.get()) {
try {
th2.join(100);
@ -140,6 +156,7 @@ public class ConnectingConsoleInputTest {
}
}
}
}
});
th2.start();
inter2.start();

14
gclc-socket/pom.xml
View File

@ -3,11 +3,11 @@
<parent>
<groupId>net.bigeon.config</groupId>
<artifactId>ebigeon-public-conf</artifactId>
<version>1.0.12</version>
<version>1.0.10</version>
</parent>
<groupId>net.bigeon.gclc</groupId>
<artifactId>socket</artifactId>
<version>1.1.19-SNAPSHOT</version>
<version>1.1.14</version>
<packaging>jar</packaging>
<name>GCLC Socket</name>
<description>Socket implementation of GCLC</description>
@ -35,8 +35,8 @@
</developer>
</developers>
<scm>
<developerConnection>scm:git:gitea@git.code.bigeon.net:emmanuel/gclc-core.git</developerConnection>
<tag>HEAD</tag>
<developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
<tag>socket-1.1.14</tag>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -46,17 +46,17 @@
<dependency>
<groupId>net.bigeon</groupId>
<artifactId>gclc</artifactId>
<version>2.1.5</version>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>net.bigeon</groupId>
<artifactId>smu</artifactId>
<version>1.1.2</version>
<version>1.0.7</version>
</dependency>
<dependency>
<groupId>net.bigeon.test</groupId>
<artifactId>junitmt</artifactId>
<version>1.0.4</version>
<version>1.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>

14
gclc-socket/src/main/java/net/bigeon/gclc/socket/DisconnexionListener.java
View File

@ -1,14 +0,0 @@
/**
*
*/
package net.bigeon.gclc.socket;
/** Interface for listener of brutal disconnection from a pluggable
* input/output.
*
* @author Emmanuel Bigeon */
@FunctionalInterface
public interface DisconnexionListener {
/** Indicate a brutal disconnection */
void disconnected();
}

51
gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleInput.java
View File

@ -41,16 +41,14 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.InterruptedIOException;
import java.io.PrintStream;
import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.bigeon.gclc.manager.ConsoleInput;
import net.bigeon.gclc.tools.ConstantString;
import net.bigeon.gclc.utils.ReadingRunnable;
/** A console input where the stream can be plugged.
@ -77,7 +75,7 @@ public final class PluggableConsoleInput implements ConsoleInput {
/** If the element is closed. */
private boolean closed = false;
/** The default prompt. */
private Supplier<String> prompt = () -> "> "; //$NON-NLS-1$
private Supplier<String> prompt = new ConstantString("> "); //$NON-NLS-1$
/** If the input is plugged or buffering. */
private boolean connected = false;
/** The current connexion (if any). */
@ -89,8 +87,6 @@ public final class PluggableConsoleInput implements ConsoleInput {
/** The output for hints. */
private PrintStream output;
private final Set<DisconnexionListener> listeners = new HashSet<>();
// Locks
/** The lock for connexion and disconnexion of actual streams. */
private final Object connexionLock = new Object();
@ -123,7 +119,6 @@ public final class PluggableConsoleInput implements ConsoleInput {
if (prompting) {
// print the hint, to indicate we are waiting for a user input.
out.print(hint);
out.println();
out.flush();
}
final InputStreamReader streamReader = new InputStreamReader(stream,
@ -262,7 +257,7 @@ public final class PluggableConsoleInput implements ConsoleInput {
* @see net.bigeon.gclc.manager.ConsoleInput#setPrompt(java.lang.String) */
@Override
public void setPrompt(final String prompt) {
setPrompt(() -> prompt);
setPrompt(new ConstantString(prompt));
}
/* (non-Javadoc)
@ -284,50 +279,10 @@ public final class PluggableConsoleInput implements ConsoleInput {
final long connexionTimeout) throws IOException, InterruptedException {
synchronized (connexionLock) {
if (connected) {
try {
return connexion.getNextMessage(messageTimeout);
} catch (final InterruptedIOException e) {
throw e;
} catch (final IOException e) {
LOGGER.log(Level.INFO, "Communication was abrubptly interrupted", e);
brutalDisconnection();
}
}
while (!connected) {
connexionLock.wait(connexionTimeout);
}
}
return null;
}
/**
*
*/
private void brutalDisconnection() {
// clean up the disconnection
disconnect();
// notify listeners
for (final DisconnexionListener listener : listeners) {
listener.disconnected();
}
}
/** Add a listener to the list of listeners.
*
* @param e the listener
* @return if the listener was added
* @see java.util.Set#add(java.lang.Object) */
public boolean add(final DisconnexionListener e) {
return listeners.add(e);
}
/** Remove a listener from the list of listeners.
*
* @param o the listener
* @return if the listener was removed
* @see java.util.Set#remove(java.lang.Object) */
public boolean remove(final DisconnexionListener o) {
return listeners.remove(o);
}
}

91
gclc-socket/src/main/java/net/bigeon/gclc/socket/RemoteDisconnectCommand.java
View File

@ -4,21 +4,60 @@
*/
package net.bigeon.gclc.socket;
/*-
* #%L
* GCLC Socket
* %%
* Copyright (C) 2016 - 2018 Bigeon
* %%
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
*
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
* that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
*
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import java.io.IOException;
import java.text.MessageFormat;
import java.util.Collection;
import net.bigeon.gclc.command.Command;
import net.bigeon.gclc.exception.CommandRunException;
import net.bigeon.gclc.exception.CommandRunExceptionType;
import net.bigeon.gclc.manager.ConsoleInput;
import net.bigeon.gclc.manager.ConsoleOutput;
/** A {@link Command} to disconnect elements from a {@link ConnexionManager}.
*
* @author Emmanuel Bigeon
* @param <T> the type of connected object
* @deprecated since 1.1.17, this has been moved to
* {@link RemoteDisconnectCommand}. */
@Deprecated
* @param <T> the type of connected object */
public final class RemoteDisconnectCommand<T> extends Command {
private final net.bigeon.gclc.socket.cmd.RemoteDisconnectCommand<T> real;
/** The connexion manager. */
private final ConnexionManager<T> manager;
/** If all connexion should be disconnected when no argument have been
* specified. */
private final boolean all;
/** Create the disconnection command.
*
@ -29,8 +68,8 @@ public final class RemoteDisconnectCommand<T> extends Command {
public RemoteDisconnectCommand(final String name, final ConnexionManager<T> manager,
final boolean all) {
super(name);
real = new net.bigeon.gclc.socket.cmd.RemoteDisconnectCommand<>(name, manager,
all);
this.manager = manager;
this.all = all;
}
/* (non-Javadoc)
@ -39,20 +78,52 @@ public final class RemoteDisconnectCommand<T> extends Command {
@Override
public void execute(final ConsoleOutput out, final ConsoleInput in,
final String... args) throws CommandRunException {
real.execute(out, in, args);
if (args.length == 0 && all) {
final Collection<String> coll = manager.getConnected();
for (final String string : coll) {
manager.disconnect(string);
}
}
for (final String string : args) {
if (manager.isConnected(string)) {
manager.disconnect(string);
} else {
print(out,
MessageFormat.format("[WARNING] {0} is not connected", string)); //$NON-NLS-1$
}
}
}
/** Print a message if the output is defined.
*
* @param out the output
* @param string the message
* @throws CommandRunException if the output exists but cannot be printed to */
private static void print(final ConsoleOutput out, final String string)
throws CommandRunException {
if (out != null) {
try {
out.println(string);
} catch (final IOException e) {
throw new CommandRunException(CommandRunExceptionType.INTERACTION,
"Unable to print to existing output", e); //$NON-NLS-1$
}
}
}
/* (non-Javadoc)
* @see fr.bigeon.gclc.command.ICommand#tip() */
@Override
public String tip() {
return real.tip();
return "Close a connexion."; //$NON-NLS-1$
}
/* (non-Javadoc)
* @see fr.bigeon.gclc.command.Command#usageDetail() */
@Override
protected String usageDetail() {
return "";
return MessageFormat.format(
" If arguments are provided the corresponding connexions are closed, otherwise\n{0} are.",
all ? "all connexions" : "none");
}
}

24
gclc-socket/src/main/java/net/bigeon/gclc/socket/SocketConsoleApplicationShell.java
View File

@ -77,8 +77,6 @@ public final class SocketConsoleApplicationShell implements Runnable {
/** The application. */
private ConsoleApplication app;
private final Object initLock = new Object();
/** The server socket. */
private ServerSocket serverSocket;
/** THe server address. */
@ -125,10 +123,7 @@ public final class SocketConsoleApplicationShell implements Runnable {
// Create the server
try (ServerSocket actualServerSocket = new ServerSocket(port, 1, addr)) {
serverSocket = actualServerSocket;
synchronized (initLock) {
running = true;
initLock.notifyAll();
}
// Create the streams
runSokectServer();
} catch (final IOException e) {
@ -199,23 +194,4 @@ public final class SocketConsoleApplicationShell implements Runnable {
LOGGER.log(Level.SEVERE, "Exception in closing socket server", e); //$NON-NLS-1$
}
}
/** A method to wait for the socket server initialization.
*
* @param timeout the timeout */
public void waitStartUp(final long timeout) {
synchronized (initLock) {
final long tic = System.currentTimeMillis() + timeout;
long tac;
while (!running && (tac = System.currentTimeMillis()) < tic) {
final long idle = tic - tac;
try {
initLock.wait(idle);
} catch (final InterruptedException e) {
LOGGER.log(Level.INFO, "Thread interruption", e);
Thread.currentThread().interrupt();
}
}
}
}
}

98
gclc-socket/src/main/java/net/bigeon/gclc/socket/cmd/ConnexionListCommand.java
View File

@ -1,98 +0,0 @@
/**
* gclc-socket:net.bigeon.gclc.socket.RemoteDisconnectCommand.java
* Created on: Nov 18, 2017
*/
package net.bigeon.gclc.socket.cmd;
/*-
* #%L
* GCLC Socket
* %%
* Copyright (C) 2016 - 2018 Bigeon
* %%
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
*
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
* that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
*
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import java.io.IOException;
import java.util.Collection;
import net.bigeon.gclc.command.Command;
import net.bigeon.gclc.exception.CommandRunException;
import net.bigeon.gclc.exception.CommandRunExceptionType;
import net.bigeon.gclc.manager.ConsoleInput;
import net.bigeon.gclc.manager.ConsoleOutput;
import net.bigeon.gclc.socket.ConnexionManager;
/** A {@link Command} to disconnect elements from a {@link ConnexionManager}.
*
* @author Emmanuel Bigeon
* @param <T> the type of connected object */
public final class ConnexionListCommand<T> extends Command {
/** The connexion manager. */
private final ConnexionManager<T> manager;
/** Create the connexion listing command.
*
* @param name the command name
* @param manager the manager */
public ConnexionListCommand(final String name, final ConnexionManager<T> manager) {
super(name);
this.manager = manager;
}
/* (non-Javadoc)
* @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.manager.
* ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput, java.lang.String[]) */
@Override
public void execute(final ConsoleOutput out, final ConsoleInput in,
final String... args) throws CommandRunException {
final Collection<String> coll = manager.getConnected();
try {
for (final String string : coll) {
out.println(string);
}
} catch (final IOException e) {
throw new CommandRunException(CommandRunExceptionType.INTERACTION,
"User cannot be notified", e);
}
}
/* (non-Javadoc)
* @see fr.bigeon.gclc.command.ICommand#tip() */
@Override
public String tip() {
return "List current connexions."; //$NON-NLS-1$
}
/* (non-Javadoc)
* @see fr.bigeon.gclc.command.Command#usageDetail() */
@Override
protected String usageDetail() {
return "";
}
}

136
gclc-socket/src/main/java/net/bigeon/gclc/socket/cmd/RemoteDisconnectCommand.java
View File

@ -1,136 +0,0 @@
/**
* gclc-socket:net.bigeon.gclc.socket.RemoteDisconnectCommand.java
* Created on: Nov 18, 2017
*/
package net.bigeon.gclc.socket.cmd;
/*-
* #%L
* GCLC Socket
* %%
* Copyright (C) 2016 - 2018 Bigeon
* %%
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
*
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
* that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
*
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import java.io.IOException;
import java.text.MessageFormat;
import java.util.Collection;
import net.bigeon.gclc.command.Command;
import net.bigeon.gclc.exception.CommandRunException;
import net.bigeon.gclc.exception.CommandRunExceptionType;
import net.bigeon.gclc.manager.ConsoleInput;
import net.bigeon.gclc.manager.ConsoleOutput;
import net.bigeon.gclc.socket.ConnexionManager;
/** A {@link Command} to disconnect elements from a {@link ConnexionManager}.
*
* @author Emmanuel Bigeon
* @param <T> the type of connected object */
public final class RemoteDisconnectCommand<T> extends Command {
/** The connexion manager. */
private final ConnexionManager<T> manager;
/** If all connexion should be disconnected when no argument have been
* specified. */
private final boolean all;
/** Create the disconnection command.
*
* @param name the command name
* @param manager the manager
* @param all if all elements should be disconnected when no argument is
* provided */
public RemoteDisconnectCommand(final String name, final ConnexionManager<T> manager,
final boolean all) {
super(name);
this.manager = manager;
this.all = all;
}
/* (non-Javadoc)
* @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.manager.
* ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput, java.lang.String[]) */
@Override
public void execute(final ConsoleOutput out, final ConsoleInput in,
final String... args) throws CommandRunException {
if (args.length == 0 && all) {
final Collection<String> coll = manager.getConnected();
for (final String string : coll) {
manager.disconnect(string);
}
}
for (final String string : args) {
if (manager.isConnected(string)) {
manager.disconnect(string);
} else {
print(out,
MessageFormat.format("[WARNING] {0} is not connected", string)); //$NON-NLS-1$
}
}
}
/** Print a message if the output is defined.
*
* @param out the output
* @param string the message
* @throws CommandRunException if the output exists but cannot be printed to */
private static void print(final ConsoleOutput out, final String string)
throws CommandRunException {
if (out != null) {
try {
out.println(string);
} catch (final IOException e) {
throw new CommandRunException(CommandRunExceptionType.INTERACTION,
"Unable to print to existing output", e); //$NON-NLS-1$
}
}
}
/* (non-Javadoc)
* @see fr.bigeon.gclc.command.ICommand#tip() */
@Override
public String tip() {
return "Close a connexion."; //$NON-NLS-1$
}
/* (non-Javadoc)
* @see fr.bigeon.gclc.command.Command#usageDetail() */
@Override
protected String usageDetail() {
final StringBuilder builder = new StringBuilder(
" If arguments are provided the corresponding connexions are closed, otherwise\n");
if (all) {
builder.append("all connections");
} else {
builder.append("none");
}
builder.append(" are.");
return builder.toString();
}
}

8
gclc-socket/src/main/java/net/bigeon/gclc/socket/cmd/package-info.java
View File

@ -1,8 +0,0 @@
/**
*
*/
/**
* @author Emmanuel Bigeon
*
*/
package net.bigeon.gclc.socket.cmd;

5
gclc-socket/src/test/java/net/bigeon/gclc/socket/cmd/RemoteDisconnectCommandTest.java → gclc-socket/src/test/java/net/bigeon/gclc/socket/RemoteDisconnectCommandTest.java
View File

@ -2,7 +2,7 @@
* gclc-socket:net.bigeon.gclc.socket.RemoteDisconnectCommandTest.java
* Created on: Nov 18, 2017
*/
package net.bigeon.gclc.socket.cmd;
package net.bigeon.gclc.socket;
/*-
* #%L
@ -47,7 +47,6 @@ import org.junit.Test;
import net.bigeon.gclc.exception.CommandRunException;
import net.bigeon.gclc.manager.PipedConsoleOutput;
import net.bigeon.gclc.socket.DConnexionManager;
/**
* <p>
@ -57,7 +56,7 @@ import net.bigeon.gclc.socket.DConnexionManager;
public class RemoteDisconnectCommandTest {
/** Test method for
* {@link net.bigeon.gclc.socket.cmd.RemoteDisconnectCommand#execute(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, java.lang.String[])}.
* {@link net.bigeon.gclc.socket.RemoteDisconnectCommand#execute(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, java.lang.String[])}.
*
* @throws CommandRunException if the command unexpectedly failed.
* @throws IOException if the output could not be written to */

9
gclc-socket/src/test/java/net/bigeon/gclc/socket/TestServer.java
View File

@ -66,7 +66,6 @@ public class TestServer {
if (server == null) {
server = new Thread(getShell(), "gclcServer");
server.start();
getShell().waitStartUp(500);
}
return server;
}
@ -83,7 +82,13 @@ public class TestServer {
SHELL.setInterface(new SocketConsoleInterface(input, output));
SHELL.setConnexionManager(manager);
SHELL.setApplication(app);
final Thread th = new Thread(() -> app.start());
final Thread th = new Thread(new Runnable() {
@Override
public void run() {
app.start();
}
});
th.start();
try {
final Object waiting = new Object();

17
gclc-swt/pom.xml
View File

@ -2,12 +2,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.bigeon.config</groupId>
<artifactId>swt-public-conf</artifactId>
<version>1.0.2</version>
<artifactId>swt-config</artifactId>
<version>1.8.11</version>
</parent>
<groupId>net.bigeon.gclc</groupId>
<artifactId>swt</artifactId>
<version>1.2.2-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GCLC swt</name>
<description>A swt window for console applications</description>
@ -35,7 +35,7 @@
</developer>
</developers>
<scm>
<developerConnection>scm:git:gitea@git.code.bigeon.net:emmanuel/gclc-core.git</developerConnection>
<developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
<tag>HEAD</tag>
</scm>
<properties>
@ -48,26 +48,27 @@
<dependency>
<groupId>net.bigeon</groupId>
<artifactId>gclc</artifactId>
<version>2.1.5</version>
<version>2.0.12</version>
</dependency>
<dependency>
<groupId>net.bigeon</groupId>
<artifactId>collections</artifactId>
<version>1.3.5</version>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.15.2</version>
<version>2.23.0</version>
<scope>test</scope>
</dependency>
</dependencies>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>2.10.3</version>
</plugin>
<plugin>
<groupId>com.github.sevntu-checkstyle</groupId>

2
gclc-swt/src/main/java/net/bigeon/gclc/swt/api/ConsoleDelayIO.java → gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleDelayIO.java
View File

@ -33,7 +33,7 @@
* gclc-swt:net.bigeon.gclc.swt.ConsoleDelayIO.java
* Created on: Nov 19, 2016
*/
package net.bigeon.gclc.swt.api;
package net.bigeon.gclc.swt;
import java.io.IOException;

5
gclc-swt/src/main/java/net/bigeon/gclc/swt/io/ConsoleInputManager.java → gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleInputManager.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package net.bigeon.gclc.swt.io;
package net.bigeon.gclc.swt;
/*-
* #%L
@ -41,8 +41,7 @@ import java.io.IOException;
import org.eclipse.swt.widgets.Text;
import net.bigeon.gclc.manager.PipedConsoleInput;
import net.bigeon.gclc.swt.api.ConsoleDelayIO;
import net.bigeon.gclc.utils.PipedConsoleInput;
/** The object managing the console input.
*

2
gclc-swt/src/main/java/net/bigeon/gclc/swt/api/ConsoleOutputDisplay.java → gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputDisplay.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package net.bigeon.gclc.swt.api;
package net.bigeon.gclc.swt;
/*-
* #%L

14
gclc-swt/src/main/java/net/bigeon/gclc/swt/io/ConsoleOutputManager.java → gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputManager.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package net.bigeon.gclc.swt.io;
package net.bigeon.gclc.swt;
/*-
* #%L
@ -39,10 +39,8 @@ package net.bigeon.gclc.swt.io;
import org.eclipse.swt.widgets.Text;
import net.bigeon.gclc.manager.PipedConsoleOutput;
import net.bigeon.gclc.swt.api.ConsoleOutputDisplay;
import net.bigeon.gclc.swt.tools.TextAppendingRunnable;
import net.bigeon.gclc.swt.tools.ToSWTConsoleForwardRunnable;
import net.bigeon.gclc.utils.PipedConsoleOutput;
/** The manager for console output to insert in a text.
*
@ -96,12 +94,4 @@ public final class ConsoleOutputManager implements ConsoleOutputDisplay {
public Thread getForwardThread() {
return forwardThread;
}
/** @return the output consumer */
public PipedConsoleOutput getManager() {
if (forward == null) {
return null;
}
return forward.getOuput();
}
}

2
gclc-swt/src/main/java/net/bigeon/gclc/swt/io/ConsolePromptManager.java → gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsolePromptManager.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package net.bigeon.gclc.swt.io;
package net.bigeon.gclc.swt;
/*-
* #%L

3
gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/HistoryTextKeyListener.java → gclc-swt/src/main/java/net/bigeon/gclc/swt/HistoryTextKeyListener.java
View File

@ -33,7 +33,7 @@
* gclc-swt:net.bigeon.gclc.swt.HistoryTextKeyListener.java
* Created on: Jun 9, 2016
*/
package net.bigeon.gclc.swt.tools;
package net.bigeon.gclc.swt;
import java.io.IOException;
import java.util.logging.Level;
@ -78,7 +78,6 @@ import org.eclipse.swt.events.KeyEvent;
import net.bigeon.collections.Ribbon;
import net.bigeon.collections.ribbon.ArrayRibbon;
import net.bigeon.gclc.swt.api.ConsoleDelayIO;
/** A key listener to validate commands and manage the history of commands.
*

13
gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java
View File

@ -77,13 +77,8 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import net.bigeon.gclc.manager.PipedConsoleInput;
import net.bigeon.gclc.manager.PipedConsoleOutput;
import net.bigeon.gclc.swt.api.ConsoleDelayIO;
import net.bigeon.gclc.swt.api.ConsoleOutputDisplay;
import net.bigeon.gclc.swt.io.ConsoleInputManager;
import net.bigeon.gclc.swt.io.ConsoleOutputManager;
import net.bigeon.gclc.swt.io.ConsolePromptManager;
import net.bigeon.gclc.utils.PipedConsoleInput;
import net.bigeon.gclc.utils.PipedConsoleOutput;
/** A shell containing a {@link SWTConsoleView}
* <p>
@ -133,12 +128,12 @@ public final class SWTConsole extends Composite {
}
/** @return the inputManager */
public ConsoleDelayIO getInputManager() {
public ConsoleInputManager getInputManager() {
return inputManager;
}
/** @return the outputManager */
public ConsoleOutputDisplay getOutputManager() {
public ConsoleOutputManager getOutputManager() {
return outputManager;
}

13
gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java
View File

@ -76,13 +76,8 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Text;
import net.bigeon.gclc.ConsoleApplication;
import net.bigeon.gclc.manager.PipedConsoleInput;
import net.bigeon.gclc.manager.PipedConsoleOutput;
import net.bigeon.gclc.swt.api.ConsoleDelayIO;
import net.bigeon.gclc.swt.api.ConsoleOutputDisplay;
import net.bigeon.gclc.swt.io.ConsoleInputManager;
import net.bigeon.gclc.swt.io.ConsoleOutputManager;
import net.bigeon.gclc.swt.tools.HistoryTextKeyListener;
import net.bigeon.gclc.utils.PipedConsoleInput;
import net.bigeon.gclc.utils.PipedConsoleOutput;
/** A SWT component to connect to gclc {@link ConsoleApplication}.
*
@ -134,14 +129,14 @@ public final class SWTConsoleView extends Composite {
/** Get the manager of console input.
*
* @return the input manager */
public ConsoleDelayIO getInputManager() {
public ConsoleInputManager getInputManager() {
return inManager;
}
/** Get the manager of console output.
*
* @return the output manager */
public ConsoleOutputDisplay getOutputManager() {
public ConsoleOutputManager getOutputManager() {
return outManager;
}
}

2
gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/TextAppendingRunnable.java → gclc-swt/src/main/java/net/bigeon/gclc/swt/TextAppendingRunnable.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package net.bigeon.gclc.swt.tools;
package net.bigeon.gclc.swt;
import org.eclipse.swt.widgets.Text;

8
gclc-swt/src/main/java/net/bigeon/gclc/swt/api/package-info.java
View File

@ -1,8 +0,0 @@
/**
*
*/
/**
* @author Emmanuel Bigeon
*
*/
package net.bigeon.gclc.swt.api;

8
gclc-swt/src/main/java/net/bigeon/gclc/swt/io/package-info.java
View File

@ -1,8 +0,0 @@
/**
*
*/
/**
* @author Emmanuel Bigeon
*
*/
package net.bigeon.gclc.swt.io;

9
gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/ToSWTConsoleForwardRunnable.java
View File

@ -5,14 +5,15 @@ package net.bigeon.gclc.swt.tools;
import org.eclipse.swt.widgets.Widget;
import net.bigeon.gclc.manager.PipedConsoleOutput;
import net.bigeon.gclc.swt.api.ConsoleOutputDisplay;
import net.bigeon.gclc.tools.AOutputForwardRunnable;
import net.bigeon.gclc.swt.ConsoleOutputDisplay;
import net.bigeon.gclc.utils.AOutputForwardRunnable;
import net.bigeon.gclc.utils.PipedConsoleOutput;
/** The local implementation of the forwarding runnable.
*
* @author Emmanuel Bigeon */
public final class ToSWTConsoleForwardRunnable extends AOutputForwardRunnable {
public final class ToSWTConsoleForwardRunnable
extends AOutputForwardRunnable {
/** The running status. */
private boolean running = true;
/** The console output. */

14
gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleInputManagerTest.java
View File

@ -39,15 +39,17 @@ package net.bigeon.gclc.swt;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.io.IOException;
import org.eclipse.swt.widgets.Text;
import org.junit.Test;
import net.bigeon.gclc.manager.PipedConsoleInput;
import net.bigeon.gclc.swt.io.ConsoleInputManager;
import net.bigeon.gclc.utils.PipedConsoleInput;
/** @author Emmanuel Bigeon */
public class ConsoleInputManagerTest {
@ -56,7 +58,7 @@ public class ConsoleInputManagerTest {
private final ConsoleInputManager cim = new ConsoleInputManager(text);
/** Test method for
* {@link net.bigeon.gclc.swt.io.ConsoleInputManager#setInput(java.lang.String)}. */
* {@link net.bigeon.gclc.swt.ConsoleInputManager#setInput(java.lang.String)}. */
@Test
public void testSetText() {
cim.setInput("Text");
@ -64,7 +66,7 @@ public class ConsoleInputManagerTest {
}
/** Test method for
* {@link net.bigeon.gclc.swt.io.ConsoleInputManager#validateInput()}.
* {@link net.bigeon.gclc.swt.ConsoleInputManager#validateInput()}.
*
* @throws IOException if an error occurred */
@Test
@ -102,7 +104,7 @@ public class ConsoleInputManagerTest {
}
/** Test method for
* {@link net.bigeon.gclc.swt.io.ConsoleInputManager#getText()}. */
* {@link net.bigeon.gclc.swt.ConsoleInputManager#getText()}. */
@Test
public void testGetText() {
assertEquals("Text component should be preserved", text, cim.getText());

10
gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleOutputManagerTest.java
View File

@ -38,7 +38,10 @@ package net.bigeon.gclc.swt;
*/
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.io.IOException;
@ -48,8 +51,7 @@ import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import net.bigeon.gclc.manager.PipedConsoleOutput;
import net.bigeon.gclc.swt.io.ConsoleOutputManager;
import net.bigeon.gclc.utils.PipedConsoleOutput;
/** @author Emmanuel Bigeon */
public class ConsoleOutputManagerTest {
@ -72,7 +74,7 @@ public class ConsoleOutputManagerTest {
}
/** Test method for
* {@link net.bigeon.gclc.swt.io.ConsoleOutputManager#appendLine(java.lang.String)}. */
* {@link net.bigeon.gclc.swt.ConsoleOutputManager#appendLine(java.lang.String)}. */
@Test
public void testAppendConsoleOutput() {
when(text.getText()).thenReturn("", "abc",

113
gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsolePromptManagerTest.java
View File

@ -3,7 +3,6 @@
*/
package net.bigeon.gclc.swt;
import static org.mockito.ArgumentMatchers.any;
/*-
* #%L
* GCLC swt
@ -37,128 +36,46 @@ import static org.mockito.ArgumentMatchers.any;
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import java.io.BufferedReader;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import net.bigeon.gclc.swt.io.ConsolePromptManager;
/** @author Emmanuel Bigeon */
/**
* @author Emmanuel Bigeon
*
*/
public class ConsolePromptManagerTest {
private final Label label = mock(Label.class);
private final ConsolePromptManager manager = new ConsolePromptManager(label);
/** Test method for
* {@link net.bigeon.gclc.swt.io.ConsolePromptManager#setPrompt(java.lang.String)}. */
/**
* Test method for {@link net.bigeon.gclc.swt.ConsolePromptManager#setPrompt(java.lang.String)}.
*/
@Test
public void testSetPrompt() {
manager.setPrompt("abc");
verify(label).setText("abc");
}
/** Test method for
* {@link net.bigeon.gclc.swt.io.ConsolePromptManager#setStream(java.io.BufferedReader)}.
*
* @throws IOException if error */
/**
* Test method for {@link net.bigeon.gclc.swt.ConsolePromptManager#setStream(java.io.BufferedReader)}.
*/
@Test
public void testSetStream() throws IOException {
// Create the dispaly, in case...
final Display d = mock(Display.class);
when(label.getDisplay()).thenReturn(d);
Mockito.doAnswer(invocation -> {
((Runnable) invocation.getArgument(0)).run();
return null;
}).when(d).asyncExec(any(Runnable.class));
Mockito.doAnswer(invocation -> {
((Runnable) invocation.getArgument(0)).run();
return null;
}).when(d).syncExec(any(Runnable.class));
// Test.
public void testSetStream() {
BufferedReader output = mock(BufferedReader.class);
final Object lock = new Object();
final AtomicInteger calls = new AtomicInteger(0);
Mockito.when(output.readLine()).then(new Answer<String>() {
String[] ans = { "A line" };
@Override
public String answer(final InvocationOnMock invocation) throws Throwable {
synchronized (lock) {
if (calls.get() >= ans.length) {
calls.incrementAndGet();
lock.notify();
return null;
}
lock.notify();
return ans[calls.getAndIncrement()];
}
}
});
manager.setStream(output);
manager.setStream(output);
synchronized (lock) {
while (calls.get() < 2) {
try {
lock.wait(10);
} catch (final InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
verify(output, times(2)).readLine();
output = mock(BufferedReader.class);
calls.set(0);
Mockito.when(output.readLine()).then(new Answer<String>() {
String[] ans = { "A line" };
@Override
public String answer(final InvocationOnMock invocation) throws Throwable {
synchronized (lock) {
if (calls.get() >= ans.length) {
calls.incrementAndGet();
lock.notify();
return null;
}
lock.notify();
return ans[calls.getAndIncrement()];
}
}
});
manager.setStream(output);
while (calls.get() < 2) {
synchronized (lock) {
try {
lock.wait(10);
} catch (final InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
manager.setStream(null);
manager.setStream(output);
while (calls.get() < 3) {
synchronized (lock) {
try {
lock.wait(10);
} catch (final InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
verify(output, times(3)).readLine();
verify(label, times(2)).setText("A line");
}
}

24
gclc-swt/src/test/java/net/bigeon/gclc/swt/HistoryTextKeyListenerTest.java
View File

@ -69,17 +69,11 @@ package net.bigeon.gclc.swt;
* #L%
*/
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*;
import java.io.IOException;
import static org.mockito.Mockito.mock;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.junit.Test;
import org.mockito.Mockito;
import net.bigeon.gclc.swt.api.ConsoleDelayIO;
import net.bigeon.gclc.swt.tools.HistoryTextKeyListener;
/**
* <p>
@ -89,7 +83,7 @@ import net.bigeon.gclc.swt.tools.HistoryTextKeyListener;
public class HistoryTextKeyListenerTest {
/** Test method for
* {@link net.bigeon.gclc.swt.tools.HistoryTextKeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)}. */
* {@link net.bigeon.gclc.swt.HistoryTextKeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)}. */
@Test
public final void testKeyPressedKeyEvent() {
final ConsoleDelayIO io = new ConsoleDelayIO() {
@ -148,23 +142,11 @@ public class HistoryTextKeyListenerTest {
}
@Test
public void testKeyPressedA() throws IOException {
public void testKeyPressed() {
final ConsoleDelayIO io = mock(ConsoleDelayIO.class);
final KeyEvent event = mock(KeyEvent.class);
event.keyCode = 'a';
final HistoryTextKeyListener listener = new HistoryTextKeyListener(io);
listener.keyPressed(event);
verifyNoInteractions(io);
}
@Test
public void testKeyPressedReturn() throws IOException {
final ConsoleDelayIO io = mock(ConsoleDelayIO.class);
Mockito.when(io.getInput()).thenReturn("Alpha");
final KeyEvent event = mock(KeyEvent.class);
event.keyCode = '\r';
final HistoryTextKeyListener listener = new HistoryTextKeyListener(io);
listener.keyPressed(event);
verify(io, times(1)).validateInput();
}
}

13
gclc-swt/src/test/java/net/bigeon/gclc/swt/PromptReadingRunnableTest.java
View File

@ -50,7 +50,8 @@ import java.util.logging.Logger;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import net.bigeon.gclc.swt.tools.PromptReadingRunnable;
@ -60,10 +61,16 @@ public class PromptReadingRunnableTest {
private final Display display = mock(Display.class);
{
when(view.getDisplay()).thenReturn(display);
doAnswer(invocation -> {
doAnswer(new Answer<Object>() {
/* (non-Javadoc)
* @see
* org.mockito.stubbing.Answer#answer(org.mockito.invocation.InvocationOnMock) */
@Override
public Object answer(final InvocationOnMock invocation) throws Throwable {
final Runnable runnable = invocation.getArgument(0);
runnable.run();
return null;
}
}).when(display).syncExec(any(Runnable.class));
}
@ -78,7 +85,6 @@ public class PromptReadingRunnableTest {
final PromptReadingRunnable runnable = new PromptReadingRunnable(reader, view);
runnable.run();
Mockito.verify(reader, Mockito.times(3)).readLine();
}
/** Test method for {@link net.bigeon.gclc.swt.tools.PromptReadingRunnable#run()}.
@ -96,7 +102,6 @@ public class PromptReadingRunnableTest {
runnable.run();
logger.setLevel(back);
Mockito.verify(reader, Mockito.times(1)).readLine();
}
}

9
gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java
View File

@ -38,17 +38,12 @@ package net.bigeon.gclc.swt;
*/
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
import org.junit.Test;
import net.bigeon.gclc.manager.PipedConsoleInput;
import net.bigeon.gclc.manager.PipedConsoleOutput;
import net.bigeon.gclc.swt.io.ConsoleOutputManager;
/** @author Emmanuel Bigeon */
public class SWTConsoleShellTest {
@ -66,14 +61,12 @@ public class SWTConsoleShellTest {
}
/** Test method for
* {@link net.bigeon.gclc.swt.SWTConsole#connect(PipedConsoleInput, PipedConsoleOutput, java.io.BufferedReader)}. */
* {@link net.bigeon.gclc.swt.SWTConsole#connect(net.bigeon.gclc.utils.PipedConsoleInput, net.bigeon.gclc.utils.PipedConsoleOutput, java.io.BufferedReader)}. */
@Test
public void testConnect() {
final SWTConsole console = new SWTConsole(new Shell(), SWT.NONE);
// Disconnection should work.
console.connect(null, null, null);
assertNull("Console should disconnect",
((ConsoleOutputManager) console.getOutputManager()).getManager());
}
}

9
gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java
View File

@ -39,16 +39,11 @@ package net.bigeon.gclc.swt;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Shell;
import org.junit.Test;
import net.bigeon.gclc.manager.PipedConsoleInput;
import net.bigeon.gclc.manager.PipedConsoleOutput;
import net.bigeon.gclc.swt.io.ConsoleOutputManager;
/** @author Emmanuel Bigeon */
public class SWTConsoleViewTest {
@ -70,13 +65,11 @@ public class SWTConsoleViewTest {
}
/** Test method for
* {@link net.bigeon.gclc.swt.SWTConsoleView#setManager(PipedConsoleOutput, PipedConsoleInput)}. */
* {@link net.bigeon.gclc.swt.SWTConsoleView#setManager(net.bigeon.gclc.utils.PipedConsoleOutput, net.bigeon.gclc.utils.PipedConsoleInput)}. */
@Test
public void testSetManager() {
final SWTConsoleView view = new SWTConsoleView(new Shell(), SWT.NONE);
// Disconnection should work.
view.setManager(null, null);
assertNull("Disconnection should replace the input.",
((ConsoleOutputManager) view.getOutputManager()).getManager());
}
}

12
gclc-test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>net.bigeon.config</groupId>
<artifactId>ebigeon-config</artifactId>
<version>1.8.33</version>
<version>1.8.21</version>
</parent>
<groupId>net.bigeon.gclc</groupId>
<artifactId>test</artifactId>
@ -37,7 +37,7 @@
</developer>
</developers>
<scm>
<developerConnection>scm:git:gitea@git.code.bigeon.net:emmanuel/gclc-core.git</developerConnection>
<developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
<tag>HEAD</tag>
</scm>
<properties>
@ -49,17 +49,17 @@
<dependency>
<groupId>net.bigeon</groupId>
<artifactId>gclc</artifactId>
<version>2.1.5</version>
<version>2.0.12</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<version>4.12</version>
</dependency>
<dependency>
<groupId>net.bigeon.test</groupId>
<artifactId>junitmt</artifactId>
<version>1.0.4</version>
<version>1.0.2</version>
</dependency>
</dependencies>
<reporting>
@ -67,7 +67,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>2.10.3</version>
</plugin>
<plugin>
<groupId>com.github.sevntu-checkstyle</groupId>

10
gclc-test/src/main/java/net/bigeon/gclc/test/InputContract.java
View File

@ -13,6 +13,7 @@ import java.util.function.Supplier;
import net.bigeon.gclc.manager.ConsoleInput;
import net.bigeon.test.junitmt.FunctionalTestRunnable;
import net.bigeon.test.junitmt.TestFunction;
import net.bigeon.test.junitmt.ThreadTest;
/** @author Emmanuel Bigeon */
@ -37,17 +38,24 @@ public final class InputContract {
// Test interruption contract
final ConsoleInput input2 = inputs.get();
final FunctionalTestRunnable prompting = new FunctionalTestRunnable(
() -> {
new TestFunction() {
@Override
public void apply() throws Exception {
try {
input2.prompt();
fail("Interrupted prompt should throw INterruptedIOException");
} catch (final InterruptedIOException e) {
// ok
}
}
});
final Thread th = new Thread(prompting);
th.start();
// while (!input2.isPrompting()) {
th.join(200);
//
// }
input2.interruptPrompt();
ThreadTest.assertRuns(th, prompting);
}

52
gclc-test/src/test/java/net/bigeon/gclc/test/InputContractTest.java
View File

@ -1,52 +0,0 @@
/** gclc-test: InputContractTest
* Created on Apr. 6, 2020
*/
package net.bigeon.gclc.test;
import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.io.PrintStream;
import java.nio.charset.StandardCharsets;
import org.junit.After;
import org.junit.Test;
import net.bigeon.gclc.manager.EmptyInput;
import net.bigeon.gclc.manager.StreamConsoleInput;
/** @author Emmanuel Bigeon */
public class InputContractTest {
/** Test method for
* {@link net.bigeon.gclc.test.InputContract#testInputContract(java.util.function.Supplier)}. */
@Test
public void testTestInputContract() throws IOException, InterruptedException {
final InputContract contract = new InputContract();
try (InputStream in = new PipedInputStream(new PipedOutputStream());
PrintStream out = new PrintStream("temp.txt")) {
contract.testInputContract(
() -> new StreamConsoleInput(out, in, StandardCharsets.UTF_8));
}
try {
contract.testInputContract(() -> EmptyInput.INSTANCE);
fail("Empty input does not fit the contract for inputs since it cannot be closed.");
} catch (final AssertionError e) {
// ok
}
}
@After
public void tearDown() {
final File f = new File("temp.txt");
if (f.exists()) {
f.delete();
}
}
}

10
gclc.system/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>net.bigeon.config</groupId>
<artifactId>ebigeon-config</artifactId>
<version>1.8.33</version>
<version>1.8.21</version>
</parent>
<groupId>net.bigeon.gclc</groupId>
<artifactId>system</artifactId>
@ -35,7 +35,7 @@
</developer>
</developers>
<scm>
<developerConnection>scm:git:gitea@git.code.bigeon.net:emmanuel/gclc-core.git</developerConnection>
<developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
<tag>HEAD</tag>
</scm>
<properties>
@ -48,12 +48,12 @@
<dependency>
<groupId>net.bigeon</groupId>
<artifactId>gclc</artifactId>
<version>2.1.5</version>
<version>2.0.11</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.15.2</version>
<version>2.23.0</version>
<scope>test</scope>
</dependency>
</dependencies>
@ -67,7 +67,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>2.10.3</version>
</plugin>
<plugin>
<groupId>com.github.sevntu-checkstyle</groupId>

2
gclc.system/src/main/java/net/bigeon/gclc/system/ExecSystemCommand.java
View File

@ -101,7 +101,7 @@ public class ExecSystemCommand extends Command {
try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os))) {
while (th.isAlive()) {
final String user = in.prompt();
// Forward to process if not empty.
// Avoid interruption being sent to process.
if (!user.isEmpty()) {
writer.write(user + EOL);
}

42
gclc.system/src/test/java/net/bigeon/gclc/system/ExecSystemCommandTest.java
View File

@ -33,17 +33,17 @@ package net.bigeon.gclc.system;
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import org.junit.jupiter.api.Test;
import org.junit.Test;
import net.bigeon.gclc.exception.CommandRunException;
import net.bigeon.gclc.manager.ConsoleInput;
import net.bigeon.gclc.manager.ConsoleOutput;
import net.bigeon.gclc.manager.EmptyInput;
import net.bigeon.gclc.manager.SinkOutput;
import net.bigeon.gclc.utils.EmptyInput;
import net.bigeon.gclc.utils.SinkOutput;
public class ExecSystemCommandTest {
@ -51,10 +51,10 @@ public class ExecSystemCommandTest {
@Test
public void testExecSystemCommand() {
final ExecSystemCommand cmd = new ExecSystemCommand("test");
assertEquals("test", cmd.getCommandName(), "Name should be preserved");
assertNotNull(cmd.tip(), "tip should be defined");
assertNotNull(cmd.usagePattern(), "usage should be defined");
assertNotNull(cmd.usageDetail(), "usage should be detailed");
assertEquals("Name should be preserved", "test", cmd.getCommandName());
assertNotNull("tip should be defined", cmd.tip());
assertNotNull("usage should be defined", cmd.usagePattern());
assertNotNull("usage should be defined", cmd.usageDetail());
}
/** Test the execution of the command.
@ -79,26 +79,4 @@ public class ExecSystemCommandTest {
}
}
/** Test the execution of the command.
*
* @throws CommandRunException if the command fails */
@Test
public void testLongExecute() throws CommandRunException {
final ConsoleOutput out = SinkOutput.INSTANCE;
final ConsoleInput in = EmptyInput.INSTANCE;
final ExecSystemCommand cmd = new ExecSystemCommand();
if (System.getProperty("os.name").contains("indows")) {
cmd.execute(out, in, "cmd", "/C", "dir", "/s");
} else if (System.getProperty("os.name").contains("inux")) {
cmd.execute(out, in, "ls", "-R");
}
try {
cmd.execute(out, in, "inexistent");
fail("Able to execute inexistent command in system");
} catch (final CommandRunException e) {
// ok
}
}
}

14
gclc.system/src/test/java/net/bigeon/gclc/system/ForwardingRunnableTest.java
View File

@ -3,18 +3,18 @@
*/
package net.bigeon.gclc.system;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import org.junit.jupiter.api.Test;
import org.junit.Test;
import org.mockito.Mockito;
import net.bigeon.gclc.exception.CommandRunException;
import net.bigeon.gclc.manager.SinkOutput;
import net.bigeon.gclc.manager.StreamConsoleOutput;
import net.bigeon.gclc.utils.SinkOutput;
import net.bigeon.gclc.utils.StreamConsoleOutput;
/** @author Emmanuel Bigeon */
public class ForwardingRunnableTest {
@ -27,8 +27,8 @@ public class ForwardingRunnableTest {
// Runnable should close immediatly.
runnable.run();
assertInstanceOf(CommandRunException.class, runnable.getError(),
"Error should be a CommandRunException");
assertTrue("Error should be a CommandRunException",
runnable.getError() instanceof CommandRunException);
}
@Test
@ -39,6 +39,6 @@ public class ForwardingRunnableTest {
is);
// Runnable should close immediatly.
runnable.run();
assertInstanceOf(IOException.class, runnable.getError(), "Error should be an IO");
assertTrue("Error should be an IO", runnable.getError() instanceof IOException);
}
}

8
gclc/pom.xml
View File

@ -4,11 +4,11 @@
<parent>
<groupId>net.bigeon.config</groupId>
<artifactId>ebigeon-public-conf</artifactId>
<version>1.0.12</version>
<version>1.0.10</version>
</parent>
<groupId>net.bigeon</groupId>
<artifactId>gclc</artifactId>
<version>2.1.6-SNAPSHOT</version>
<version>2.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Generic Command Ligne console</name>
<description>A generic framework for console applications, with customized command input and output streams.</description>
@ -36,7 +36,7 @@
</developer>
</developers>
<scm>
<developerConnection>scm:git:gitea@git.code.bigeon.net:emmanuel/gclc-core.git</developerConnection>
<developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
<tag>HEAD</tag>
</scm>
<properties>
@ -49,7 +49,7 @@
<dependency>
<groupId>net.bigeon.test</groupId>
<artifactId>junitmt</artifactId>
<version>1.0.4</version>
<version>1.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>

4
gclc/src/main/java/net/bigeon/gclc/ConsoleApplication.java
View File

@ -191,7 +191,7 @@ public final class ConsoleApplication implements ICommandProvider {
args = GCLCConstants.splitCommand(cmd);
} catch (final CommandParsingException e) {
out.println("Command line cannot be parsed"); //$NON-NLS-1$
LOGGER.log(Level.FINE, e, () -> "Invalid user command " + cmd); //$NON-NLS-1$
LOGGER.log(Level.FINE, "Invalid user command " + cmd, e); //$NON-NLS-1$
return;
}
if (!args.isEmpty()) {
@ -199,7 +199,7 @@ public final class ConsoleApplication implements ICommandProvider {
executeSub(out, in, args.get(0),
Arrays.copyOfRange(args.toArray(new String[0]), 1, args.size()));
} catch (final CommandRunException e) {
LOGGER.log(Level.FINE, e, () -> "Command failed: " + cmd); //$NON-NLS-1$
LOGGER.log(Level.FINE, "Command failed: " + cmd, e); //$NON-NLS-1$
out.println(Messages.getString("ConsoleApplication.cmd.failed", cmd)); //$NON-NLS-1$
out.println(e.getLocalizedMessage());
if (e.getType() == CommandRunExceptionType.USAGE) {

16
gclc/src/main/java/net/bigeon/gclc/GCLCConstants.java
View File

@ -146,7 +146,10 @@ public final class GCLCConstants {
continue;
}
if (c == ' ' && !inString) {
addArgument(args, cmd.substring(startIndex, index - 1));
final String arg = cmd.substring(startIndex, index - 1);
if (!arg.isEmpty()) {
args.add(removeEscaped(arg));
}
startIndex = index;
} else if (c == '"') {
if (inString) {
@ -161,18 +164,9 @@ public final class GCLCConstants {
}
if (startIndex < cmd.length()) {
final String arg = cmd.substring(startIndex, cmd.length());
args.add(removeEscaped(arg));
args.add(arg);
}
return args;
}
/** Add an argument to the list of arguments if it is not an empty string.
*
* @param args the list of argument
* @param arg the candidate argument */
private static void addArgument(final List<String> args, final String arg) {
if (!arg.isEmpty()) {
args.add(removeEscaped(arg));
}
}
}

5
gclc/src/main/java/net/bigeon/gclc/command/Command.java
View File

@ -73,11 +73,8 @@ public abstract class Command implements ICommand {
/** Create the command.
*
* @param name the command name */
protected Command(final String name) {
public Command(final String name) {
super();
if (name == null) {
throw new IllegalArgumentException("The command name is mandatory");
}
this.name = name;
}

10
gclc/src/main/java/net/bigeon/gclc/command/CommandParameters.java
View File

@ -103,7 +103,7 @@ public final class CommandParameters {
* @param key the key
* @return if the key was specified */
public boolean isActive(final String key) {
final Boolean val = booleanArguments.get(key);
Boolean val = booleanArguments.get(key);
return val != null && val.booleanValue();
}
@ -198,8 +198,9 @@ public final class CommandParameters {
* @param string the key
* @param value the value */
public void set(final String string, final boolean value) {
booleanArguments.computeIfPresent(string,
(final String k, final Boolean v) -> Boolean.valueOf(value));
if (booleanArguments.containsKey(string)) {
booleanArguments.put(string, Boolean.valueOf(value));
}
}
/** Set a string parameter value.
@ -207,9 +208,6 @@ public final class CommandParameters {
* @param string the key
* @param value the value */
public void set(final String string, final String value) {
// DO NOT USE computeIfPresent. This is a HashMap, not a ConcurrentHashMap and
// keys can be associated to null, but computeIfPresent will consider them as
// absent!
if (stringArguments.containsKey(string)) {
stringArguments.put(string, value);
}

4
gclc/src/main/java/net/bigeon/gclc/command/ParametrizedCommand.java
View File

@ -94,7 +94,7 @@ public abstract class ParametrizedCommand extends Command {
* parameters.
*
* @param name the name */
protected ParametrizedCommand(final String name) {
public ParametrizedCommand(final String name) {
this(name, true);
}
@ -106,7 +106,7 @@ public abstract class ParametrizedCommand extends Command {
*
* @param name the name
* @param strict if the arguments are restricted to the declared ones */
protected ParametrizedCommand(final String name, final boolean strict) {
public ParametrizedCommand(final String name, final boolean strict) {
super(name);
data = new ParametrizedCommandData(strict);
}

14
gclc/src/main/java/net/bigeon/gclc/command/ParametrizedCommandData.java
View File

@ -149,16 +149,14 @@ public final class ParametrizedCommandData {
* @param needed if the parameter is needed
* @throws InvalidParameterException if the new definition is invalid */
private void checkParam(final String param, final boolean needed) {
final Boolean val = stringParams.computeIfPresent(param,
(final String k, final Boolean v) -> {
final Boolean need = Boolean.valueOf(needed || v.booleanValue());
final Boolean val = stringParams.get(param);
if (val != null) {
final Boolean need = Boolean.valueOf(needed || val.booleanValue());
stringParams.put(param, need);
params.put(param, need);
return need;
});
if (val == null) {
throw new InvalidParameterException(
"Parameter is already defined as boolean"); //$NON-NLS-1$
return;
}
throw new InvalidParameterException("Parameter is already defined as boolean"); //$NON-NLS-1$
}
/** Retrieve the boolean parameters (aka flags).

12
gclc/src/main/java/net/bigeon/gclc/command/base/ScriptExecution.java
View File

@ -139,7 +139,7 @@ public final class ScriptExecution extends Command {
try (InputStreamReader fReader = new InputStreamReader(
Files.newInputStream(Paths.get(scriptFile)), charset);
BufferedReader reader = new BufferedReader(fReader)) {
final String[] emptyArray = new String[0];
String[] emptyArray = new String[0];
while ((cmd = reader.readLine()) != null) {
lineNo++;
final String cmdLine = readCommandLine(cmd, params);
@ -237,16 +237,10 @@ public final class ScriptExecution extends Command {
* @return the exception to actually throw */
private static CommandRunException manageRunException(final CommandRunException e,
final int lineNo) {
final StringBuilder builder = new StringBuilder(e.getLocalizedMessage());
int index = builder.indexOf("\n");
while (index > 0) {
builder.insert(index + 1, " ");
index = builder.indexOf("\n", index + 1);
}
return new CommandRunException(CommandRunExceptionType.EXECUTION,
MessageFormat.format(
"The script could not complete due to command failure at line {0}\n {1})", //$NON-NLS-1$
Integer.valueOf(lineNo + 1), builder),
"The script could not complete due to command failure at line {0} ({1})", //$NON-NLS-1$
Integer.valueOf(lineNo), e.getLocalizedMessage()),
e);
}

4
gclc/src/main/java/net/bigeon/gclc/i18n/Messages.java
View File

@ -105,8 +105,8 @@ public final class Messages {
try {
return MessageFormat.format(RESOURCE_BUNDLE.getString(key), args);
} catch (final MissingResourceException e) {
LOGGER.log(Level.WARNING, e,
() -> "Unrecognized internationalization message key: " + key); //$NON-NLS-1$
LOGGER.log(Level.WARNING,
"Unrecognized internationalization message key: " + key, e); //$NON-NLS-1$
return '!' + key + '!';
}
}

11
gclc/src/main/java/net/bigeon/gclc/manager/ConsoleInput.java
View File

@ -72,6 +72,7 @@ package net.bigeon.gclc.manager;
* #L%
*/
import java.io.IOException;
import java.io.InterruptedIOException;
import java.util.function.Supplier;
/** A console application input.
@ -93,7 +94,7 @@ public interface ConsoleInput extends AutoCloseable {
/** Indicate to the input that is should interrompt the prompting, if possible.
* <p>
* The pending {@link #prompt()} or {@link #prompt(String)} operations should
* return immediately by throwing an java.io.InterruptedIOException. */
* return immediately by throwing an InterruptedIOException. */
void interruptPrompt();
/** Test if the input is closed.
@ -108,7 +109,7 @@ public interface ConsoleInput extends AutoCloseable {
*
* @return the user inputed string
* @throws IOException if the manager is closed or could not read the prompt
* @throws java.io.InterruptedIOException if the prompt was interrupted */
* @throws InterruptedIOException if the prompt was interrupted */
String prompt() throws IOException;
/** Prompt the user, with an allotated time to answer.
@ -116,7 +117,7 @@ public interface ConsoleInput extends AutoCloseable {
* @param timeout the time to wait in milliseconds
* @return the user inputed string, null if the timeout was reached
* @throws IOException if the manager is closed or could not read the prompt
* @throws java.io.InterruptedIOException if the prompt was interrupted */
* @throws InterruptedIOException if the prompt was interrupted */
String prompt(long timeout) throws IOException;
/** Prompt the user, with a hint on what is prompted.
@ -124,7 +125,7 @@ public interface ConsoleInput extends AutoCloseable {
* @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 prompt
* @throws java.io.InterruptedIOException if the prompt was interrupted */
* @throws InterruptedIOException if the prompt was interrupted */
String prompt(String message) throws IOException;
/** Prompt the user, with a hint on what is prompted and an allotated time to
@ -134,7 +135,7 @@ public interface ConsoleInput extends AutoCloseable {
* @param message the message to prompt the user
* @return the user inputed string, null if the timeout was reached
* @throws IOException if the manager is closed or could not read the prompt
* @throws java.io.InterruptedIOException if the prompt was interrupted */
* @throws InterruptedIOException if the prompt was interrupted */
String prompt(String message, long timeout) throws IOException;
/** Set a prompting prefix.

38
gclc/src/main/java/net/bigeon/gclc/manager/EmptyInput.java
View File

@ -40,12 +40,48 @@ package net.bigeon.gclc.manager;
import java.util.function.Supplier;
/*-
* #%L
* Generic Command Ligne console
* %%
* Copyright (C) 2014 - 2018 Bigeon
* %%
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
*
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
* that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
*
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import net.bigeon.gclc.tools.ConstantString;
/** A console input that return empty to all prompting.
*
* @author Emmanuel Bigeon */
public final class EmptyInput implements ConsoleInput {
private static final Supplier<String> CONSTANT_STRING = () -> "";
private static final ConstantString CONSTANT_STRING = new ConstantString("");
/** The empty prompter. */
public static final ConsoleInput INSTANCE = new EmptyInput();

4
gclc/src/main/java/net/bigeon/gclc/manager/PipedConsoleOutput.java
View File

@ -101,14 +101,13 @@ public final class PipedConsoleOutput implements ConsoleOutput {
private final PrintStream outPrint;
/** The reading thread. */
private final ReadingRunnable reading;
private final PipedOutputStream out;
/** Create a manager that will write and read through piped stream.
*
* @throws IOException if the piping failed for streams */
public PipedConsoleOutput() throws IOException {
commandOutput = new PipedInputStream();
out = new PipedOutputStream(commandOutput);
final PipedOutputStream out = new PipedOutputStream(commandOutput);
commandBuffOutput = new BufferedReader(
new InputStreamReader(commandOutput, StandardCharsets.UTF_8));
outPrint = new PrintStream(out, true, UTF_8);
@ -134,7 +133,6 @@ public final class PipedConsoleOutput implements ConsoleOutput {
reading.setRunning(false);
innerManager.close();
outPrint.close();
out.close();
commandBuffOutput.close();
commandOutput.close();
}

5
gclc/src/main/java/net/bigeon/gclc/manager/StreamConsoleInput.java
View File

@ -79,6 +79,7 @@ import java.io.PrintStream;
import java.nio.charset.Charset;
import java.util.function.Supplier;
import net.bigeon.gclc.tools.ConstantString;
import net.bigeon.gclc.utils.ReadingRunnable;
/** A console using the input stream and print stream.
@ -89,7 +90,7 @@ import net.bigeon.gclc.utils.ReadingRunnable;
public final class StreamConsoleInput implements ConsoleInput {
/** The default prompt. */
public static final Supplier<String> DEFAULT_PROMPT = () -> ("> "); //$NON-NLS-1$
public static final Supplier<String> DEFAULT_PROMPT = new ConstantString("> "); //$NON-NLS-1$
/** The command prompt. It can be changed. */
private Supplier<String> prompt = DEFAULT_PROMPT;
@ -212,7 +213,7 @@ public final class StreamConsoleInput implements ConsoleInput {
* @see net.bigeon.gclc.manager.ConsoleInput#setPrompt(java.lang.String) */
@Override
public void setPrompt(final String prompt) {
this.prompt = () -> (prompt);
this.prompt = new ConstantString(prompt);
}
@Override

12
gclc/src/main/java/net/bigeon/gclc/tools/AOutputForwardRunnable.java → gclc/src/main/java/net/bigeon/gclc/manager/forwarding/AOutputForwardRunnable.java
View File

@ -36,7 +36,7 @@
* gclc:net.bigeon.gclc.tools.AOutputForwardRunnable.java
* Created on: Dec 1, 2016
*/
package net.bigeon.gclc.tools;
package net.bigeon.gclc.manager.forwarding;
/*-
* #%L
@ -97,7 +97,7 @@ public abstract class AOutputForwardRunnable implements Runnable {
/** Create a forwarding runnable.
*
* @param manager the manager */
protected AOutputForwardRunnable(final PipedConsoleOutput manager) {
public AOutputForwardRunnable(final PipedConsoleOutput manager) {
super();
this.manager = manager;
timeout = DEFAULT_TIMEOUT;
@ -116,8 +116,7 @@ public abstract class AOutputForwardRunnable implements Runnable {
*
* @param manager the manager
* @param timeout the timeout between message requests. */
protected AOutputForwardRunnable(final PipedConsoleOutput manager,
final long timeout) {
public AOutputForwardRunnable(final PipedConsoleOutput manager, final long timeout) {
super();
this.manager = manager;
this.timeout = timeout;
@ -157,11 +156,8 @@ public abstract class AOutputForwardRunnable implements Runnable {
/** a method to wait some time. */
protected final void waitASec() {
try {
final long tic = System.currentTimeMillis();
synchronized (this) {
while (System.currentTimeMillis() - tic < timeout) {
wait(timeout + tic - System.currentTimeMillis());
}
wait(timeout);
}
} catch (final InterruptedException e) {
LOGGER.log(Level.SEVERE, "Interrupted wait", //$NON-NLS-1$

43
gclc/src/main/java/net/bigeon/gclc/manager/forwarding/package-info.java Normal file
View File

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

4
gclc/src/main/java/net/bigeon/gclc/tools/ConstantString.java
View File

@ -73,9 +73,7 @@ import java.util.function.Supplier;
/** A supplier of string that hold a constant string.
*
* @author Emmanuel Bigeon
* @deprecated since 2.1.2, use a lambda expression instead */
@Deprecated
* @author Emmanuel Bigeon */
public class ConstantString implements Supplier<String> {
private final String string;

11
gclc/src/main/java/net/bigeon/gclc/utils/ReadingRunnable.java
View File

@ -128,12 +128,9 @@ public final class ReadingRunnable implements Runnable {
* @throws IOException if the runnable was stopped and no essage was found. */
private void doWaitMessage(final long timeout) throws IOException {
try {
final long tic = System.currentTimeMillis();
synchronized (lock) {
while (System.currentTimeMillis() - tic < timeout && messages.isEmpty()) {
lock.wait(timeout);
}
}
} catch (final InterruptedException e) {
LOGGER.log(Level.SEVERE, THREAD_INTERRUPTION_EXCEPTION, e);
Thread.currentThread().interrupt();
@ -202,15 +199,15 @@ public final class ReadingRunnable implements Runnable {
public void waitForDelivery(final String message) throws InterruptedException {
Object mLock;
synchronized (messageBlockerLock) {
messageBlocker.computeIfAbsent(message, (final String k) -> new Object());
if (!messageBlocker.containsKey(message)) {
messageBlocker.put(message, new Object());
}
mLock = messageBlocker.get(message);
}
synchronized (mLock) {
while (messageBlocker.containsKey(message)) {
mLock.wait();
}
}
}
/** Test if some data is available.
*
@ -254,9 +251,9 @@ public final class ReadingRunnable implements Runnable {
final Object mLock = messageBlocker.get(message);
if (mLock!=null) {
synchronized (mLock) {
messageBlocker.remove(message);
mLock.notifyAll();
}
messageBlocker.remove(message);
}
}
}

6
gclc/src/test/java/net/bigeon/gclc/ConsoleApplicationTest.java
View File

@ -71,7 +71,11 @@ package net.bigeon.gclc;
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.BufferedReader;
import java.io.IOException;

90
gclc/src/test/java/net/bigeon/gclc/GCLCConstantsTest.java
View File

@ -72,6 +72,7 @@ package net.bigeon.gclc;
* #L%
*/
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.List;
@ -86,77 +87,52 @@ import net.bigeon.gclc.exception.CommandParsingException;
@SuppressWarnings({ "nls", "static-method" })
public class GCLCConstantsTest {
@Test
public void testSplitCommandSingle() throws CommandParsingException {
List<String> res;
res = GCLCConstants.splitCommand("aCommand");
assertEquals("single word command should have one element", 1, res.size());
assertEquals("Command should be preserved", "aCommand", res.get(0));
}
@Test
public void testSplitCommandSeveral() throws CommandParsingException {
List<String> res;
res = GCLCConstants.splitCommand("aCommand with some arguments");
assertEquals("Command size", 4, res.size());
assertEquals("Elements should be preserved", "aCommand", res.get(0));
assertEquals("Command should be preserved", "with", res.get(1));
assertEquals("Command should be preserved", "some", res.get(2));
assertEquals("Command should be preserved", "arguments", res.get(3));
}
/** Test method for
* {@link net.bigeon.gclc.GCLCConstants#splitCommand(java.lang.String)}.
*
* @throws CommandParsingException if an error occured */
@Test
public void testSplitCommandMultiSpaces() throws CommandParsingException {
public void testSplitCommand() throws CommandParsingException {
List<String> res;
res = GCLCConstants.splitCommand("aCommand");
assertTrue("single word command should have one element", res.size() == 1);
assertTrue("Command should be preserved", res.get(0).equals("aCommand"));
res = GCLCConstants.splitCommand("aCommand with some arguments");
assertEquals("Command size", 4, res.size());
assertEquals("Command should be preserved", "aCommand", res.get(0));
assertEquals("Command should be preserved", "with", res.get(1));
assertEquals("Command should be preserved", "some", res.get(2));
assertEquals("Command should be preserved", "arguments", res.get(3));
}
public void testSplitCommandWithString() throws CommandParsingException {
List<String> res;
assertEquals("Elements should be preserved", "aCommand", res.get(0));
assertTrue("Elements should be preserved", res.get(1).equals("with"));
assertTrue("Elements should be preserved", res.get(2).equals("some"));
assertTrue("Elements should be preserved", res.get(3).equals("arguments"));
res = GCLCConstants.splitCommand("aCommand with some arguments");
assertEquals("Command size", 4, res.size());
assertTrue("Elements should be preserved", res.get(0).equals("aCommand"));
assertTrue("Elements should be preserved", res.get(1).equals("with"));
assertTrue("Elements should be preserved", res.get(2).equals("some"));
assertTrue("Elements should be preserved", res.get(3).equals("arguments"));
res = GCLCConstants.splitCommand("aCommand \"with some\" arguments");
assertEquals("Command size", 3, res.size());
assertEquals("Command should be preserved", "aCommand", res.get(0));
assertEquals("Command should be preserved", "with some", res.get(1));
assertEquals("Command should be preserved", "arguments", res.get(2));
assertTrue("Elements should be preserved", res.get(0).equals("aCommand"));
assertTrue("Elements should be preserved", res.get(1).equals("with some"));
assertTrue("Elements should be preserved", res.get(2).equals("arguments"));
res = GCLCConstants.splitCommand("aCommand with\\ some arguments");
assertEquals("Command size", 3, res.size());
assertTrue("Elements should be preserved", res.get(0).equals("aCommand"));
assertTrue("Elements should be preserved", res.get(1).equals("with some"));
assertTrue("Elements should be preserved", res.get(2).equals("arguments"));
res = GCLCConstants.splitCommand("aCommand wi\\\"th some arguments");
assertEquals("Command size", 4, res.size());
assertTrue("Elements should be preserved", res.get(0).equals("aCommand"));
assertTrue("Elements should be preserved", res.get(1).equals("wi\"th"));
assertTrue("Elements should be preserved", res.get(2).equals("some"));
assertTrue("Elements should be preserved", res.get(3).equals("arguments"));
res = GCLCConstants.splitCommand("aCommand with \"some arguments\"");
assertEquals("Command size", 3, res.size());
assertEquals("Command should be preserved", "aCommand", res.get(0));
assertEquals("Command should be preserved", "with", res.get(1));
assertEquals("Command should be preserved", "some arguments", res.get(2));
}
assertTrue("Elements should be preserved", res.get(0).equals("aCommand"));
assertTrue("Elements should be preserved", res.get(1).equals("with"));
assertTrue("Elements should be preserved", res.get(2).equals("some arguments"));
public void testSplitCommandWithEscape() throws CommandParsingException {
List<String> res;
res = GCLCConstants.splitCommand("aCommand with\\ some arguments");
assertEquals("Command size", 3, res.size());
assertEquals("Command should be preserved", "aCommand", res.get(0));
assertEquals("Command should be preserved", "with some", res.get(1));
assertEquals("Command should be preserved", "arguments", res.get(2));
}
public void testSplitCommandWithQuoteInString() throws CommandParsingException {
List<String> res;
res = GCLCConstants.splitCommand("aCommand wi\\\"th some arguments");
assertEquals("Command size", 4, res.size());
assertEquals("Command should be preserved", "aCommand", res.get(0));
assertEquals("Command should be preserved", "wi\"th", res.get(1));
assertEquals("Command should be preserved", "some", res.get(2));
assertEquals("Command should be preserved", "arguments", res.get(3));
}
public void testSplitCommandInvalidQuoting() throws CommandParsingException {
List<String> res;
try {
// Wrong lines?
res = GCLCConstants.splitCommand("aCommand with \"some ar\"guments");

6
gclc/src/test/java/net/bigeon/gclc/command/CommandParametersTest.java
View File

@ -71,7 +71,11 @@ package net.bigeon.gclc.command;
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.HashSet;
import java.util.Set;

3
gclc/src/test/java/net/bigeon/gclc/command/ParametrizedCommandDataTest.java
View File

@ -33,7 +33,8 @@ package net.bigeon.gclc.command;
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import static org.junit.Assert.fail;
import static org.junit.Assert.*;
import org.junit.Test;

26
gclc/src/test/java/net/bigeon/gclc/command/ParametrizedCommandTest.java
View File

@ -71,7 +71,11 @@ package net.bigeon.gclc.command;
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
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;
@ -89,10 +93,10 @@ import net.bigeon.gclc.manager.ConsoleInput;
import net.bigeon.gclc.manager.ConsoleOutput;
import net.bigeon.gclc.manager.PipedConsoleInput;
import net.bigeon.gclc.manager.PipedConsoleOutput;
import net.bigeon.test.junitmt.ATestRunnable;
import net.bigeon.test.junitmt.FunctionalTestRunnable;
import net.bigeon.test.junitmt.TestFunction;
import net.bigeon.test.junitmt.ThreadTest;
import net.bigeon.test.junitmt.api.ATestRunnable;
import net.bigeon.test.junitmt.api.TestFunction;
/**
* <p>
@ -509,7 +513,10 @@ public class ParametrizedCommandTest {
cmd.execute(out, in, "-" + str1, str2, "-" + addParam);
cmd.execute(out, in, "-" + str1, str2, "-" + addParam, addParam);
final TestFunction function = () -> {
final TestFunction function = new TestFunction() {
@Override
public void apply() throws Exception {
assertEquals("value of " + str1 + "? ", buf.readLine());
in.type("");
assertEquals("value of " + str1 + "? (cannot be empty) ",
@ -518,9 +525,9 @@ public class ParametrizedCommandTest {
assertEquals("value of " + str1 + "? (cannot be empty) ",
buf.readLine());
in.type(str2);
}
};
final FunctionalTestRunnable testConsole = new FunctionalTestRunnable(
function);
final ATestRunnable testConsole = new FunctionalTestRunnable(function);
final Thread th = new Thread(testConsole);
th.start();
@ -536,9 +543,13 @@ public class ParametrizedCommandTest {
new InputStreamReader(pis, StandardCharsets.UTF_8));
PipedConsoleInput in = new PipedConsoleInput(new PrintStream(pout))) {
final TestFunction function = () -> {
final TestFunction function = new TestFunction() {
@Override
public void apply() throws Exception {
assertEquals("value of " + str1 + "? ", buf.readLine());
in.type(str2);
}
};
final ATestRunnable testConsole = new FunctionalTestRunnable(function);
@ -554,6 +565,7 @@ public class ParametrizedCommandTest {
final PipedConsoleInput test = new PipedConsoleInput(null);
test.close();
out.close();
cmd.execute(out, test, "-" + str1, str2);
cmd.execute(out, test, "-" + addParam);
fail("Closed manager shall cause error");
} catch (final CommandRunException e) {

5
gclc/src/test/java/net/bigeon/gclc/command/SubedCommandTest.java
View File

@ -71,7 +71,10 @@ package net.bigeon.gclc.command;
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import java.io.IOException;

2
gclc/src/test/java/net/bigeon/gclc/manager/ReadingRunnableTest.java
View File

@ -92,8 +92,8 @@ import org.junit.Test;
import net.bigeon.gclc.utils.ReadingRunnable;
import net.bigeon.test.junitmt.FunctionalTestRunnable;
import net.bigeon.test.junitmt.TestFunction;
import net.bigeon.test.junitmt.ThreadTest;
import net.bigeon.test.junitmt.api.TestFunction;
/**
* <p>

5
gclc/src/test/java/net/bigeon/gclc/manager/SystemConsoleManagerTest.java
View File

@ -71,7 +71,10 @@ package net.bigeon.gclc.manager;
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.IOException;
import java.io.InputStream;

9
gclc/src/test/java/net/bigeon/gclc/prompt/CLIPrompterTest.java
View File

@ -71,7 +71,10 @@ package net.bigeon.gclc.prompt;
* knowledge of the CeCILL license and that you accept its terms.
* #L%
*/
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.BufferedReader;
import java.io.IOException;
@ -91,10 +94,10 @@ import org.junit.Test;
import net.bigeon.gclc.manager.PipedConsoleInput;
import net.bigeon.gclc.manager.PipedConsoleOutput;
import net.bigeon.test.junitmt.ATestRunnable;
import net.bigeon.test.junitmt.FunctionalTestRunnable;
import net.bigeon.test.junitmt.TestFunction;
import net.bigeon.test.junitmt.ThreadTest;
import net.bigeon.test.junitmt.api.ATestRunnable;
import net.bigeon.test.junitmt.api.TestFunction;
/**
* <p>

3
gclc/src/test/java/net/bigeon/gclc/tools/AOutputForwardRunnableTest.java
View File

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