From 8d517335905ad8ea630ecb77a2eb31f58c6fde61 Mon Sep 17 00:00:00 2001 From: Emmanuel Bigeon Date: Mon, 15 Oct 2018 12:19:23 -0400 Subject: [PATCH] Made shell invisible in tests. added shell style access Signed-off-by: Emmanuel Bigeon --- .../net/bigeon/gclc/swt/SWTConsoleShell.java | 4 ++-- .../net/bigeon/gclc/swt/SWTConsoleView.java | 6 +++--- .../bigeon/gclc/swt/SWTConsoleShellTest.java | 19 +++++++++++-------- .../bigeon/gclc/swt/SWTConsoleViewTest.java | 1 + 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleShell.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleShell.java index 196c926..dc30d1e 100644 --- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleShell.java +++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleShell.java @@ -85,8 +85,8 @@ public final class SWTConsoleShell extends Shell { /** Create the shell. * * @param display the display */ - public SWTConsoleShell(final Display display) { - super(display, SWT.SHELL_TRIM); + public SWTConsoleShell(final Display display, final int style) { + super(display, style); setLayout(new FillLayout(SWT.HORIZONTAL)); createContents(); diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java index fabd396..1443fd6 100644 --- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java +++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java @@ -103,7 +103,7 @@ public final class SWTConsoleView extends Composite implements ConsoleDelayIO { @Override protected void forwardLine(final String m) { - appendConsoleOutput(m); + appendConsoleOutput(System.lineSeparator() + m); } @Override @@ -149,12 +149,12 @@ public final class SWTConsoleView extends Composite implements ConsoleDelayIO { } /** @param next the next message */ - private void appendConsoleOutput(final String next) { + public void appendConsoleOutput(final String next) { Display.getDefault().syncExec(new Runnable() { @SuppressWarnings("synthetic-access") @Override public void run() { - consoleOutput.append(System.lineSeparator() + next); + consoleOutput.append(next); } }); } diff --git a/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java index f56a2d1..e898796 100644 --- a/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java +++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java @@ -75,6 +75,7 @@ import static org.junit.Assert.fail; import java.io.IOException; +import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.junit.Test; @@ -99,7 +100,7 @@ public class SWTConsoleShellTest { @Test public void test() { - final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY); + final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY, SWT.SHELL_TRIM); final SWTConsole swtConsole = shell.getManager(); try { final ConsoleApplication appl = new ConsoleApplication(swtConsole, swtConsole, @@ -138,6 +139,7 @@ public class SWTConsoleShellTest { }); // shell.pack(); shell.open(); + shell.setVisible(false); final Thread applThread = new Thread(new Runnable() { @Override @@ -159,7 +161,7 @@ public class SWTConsoleShellTest { @Override public void run() { swtConsole.setText("test"); //$NON-NLS-1$ - swtConsole.validateCommand(); + swtConsole.validateInput(); } }); try { @@ -198,7 +200,7 @@ public class SWTConsoleShellTest { @Test public void testConsoleClose() { - final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY); + final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY, SWT.SHELL_TRIM); final SWTConsole swtConsole = shell.getManager(); swtConsole.close(); swtConsole.setPrompt(":"); @@ -267,6 +269,7 @@ public class SWTConsoleShellTest { }); // shell.pack(); shell.open(); + shell.setVisible(false); final Thread applThread = new Thread(new Runnable() { @Override @@ -288,7 +291,7 @@ public class SWTConsoleShellTest { @Override public void run() { swtConsole.setText("test"); //$NON-NLS-1$ - swtConsole.validateCommand(); + swtConsole.validateInput(); } }); Display.getDefault().syncExec(new Runnable() { @@ -297,28 +300,28 @@ public class SWTConsoleShellTest { swtConsole.setText("ok"); //$NON-NLS-1$ } }); - swtConsole.validateCommand(); + swtConsole.validateInput(); Display.getDefault().syncExec(new Runnable() { @Override public void run() { swtConsole.setText("long"); //$NON-NLS-1$ } }); - swtConsole.validateCommand(); + swtConsole.validateInput(); Display.getDefault().syncExec(new Runnable() { @Override public void run() { swtConsole.setText("test"); //$NON-NLS-1$ } }); - swtConsole.validateCommand(); + swtConsole.validateInput(); Display.getDefault().syncExec(new Runnable() { @Override public void run() { swtConsole.setText("test"); //$NON-NLS-1$ } }); - swtConsole.validateCommand(); + swtConsole.validateInput(); try { Thread.sleep(TWO_SECONDS); } catch (final InterruptedException e) { diff --git a/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java index 3ba40e2..2295d8a 100644 --- a/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java +++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java @@ -147,6 +147,7 @@ public class SWTConsoleViewTest { }); // shell.pack(); shell.open(); + shell.setVisible(false); final Thread applThread = new Thread(new Runnable() { @Override