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

Extract interface as method return

Browse Source 
Signed-off-by: Emmanuel Bigeon <emmanuel@bigeon.fr>
This commit is contained in:
Emmanuel Bigeon 2019-06-08 20:09:03 -04:00
parent ba61efaa4a
commit c1ce1277d3
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,8 @@ import org.eclipse.swt.widgets.Text;
import net.bigeon.gclc.manager.PipedConsoleInput; import net.bigeon.gclc.manager.PipedConsoleInput;
import net.bigeon.gclc.manager.PipedConsoleOutput; 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.ConsoleInputManager;
import net.bigeon.gclc.swt.io.ConsoleOutputManager; import net.bigeon.gclc.swt.io.ConsoleOutputManager;
import net.bigeon.gclc.swt.io.ConsolePromptManager; import net.bigeon.gclc.swt.io.ConsolePromptManager;
@ -131,12 +133,12 @@ public final class SWTConsole extends Composite {
} }
/** @return the inputManager */ /** @return the inputManager */
public ConsoleInputManager getInputManager() { public ConsoleDelayIO getInputManager() {
return inputManager; return inputManager;
} }
/** @return the outputManager */ /** @return the outputManager */
public ConsoleOutputManager getOutputManager() { public ConsoleOutputDisplay getOutputManager() {
return outputManager; return outputManager;
} }

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

@ -78,6 +78,8 @@ import org.eclipse.swt.widgets.Text;
import net.bigeon.gclc.ConsoleApplication; import net.bigeon.gclc.ConsoleApplication;
import net.bigeon.gclc.manager.PipedConsoleInput; import net.bigeon.gclc.manager.PipedConsoleInput;
import net.bigeon.gclc.manager.PipedConsoleOutput; 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.ConsoleInputManager;
import net.bigeon.gclc.swt.io.ConsoleOutputManager; import net.bigeon.gclc.swt.io.ConsoleOutputManager;
import net.bigeon.gclc.swt.tools.HistoryTextKeyListener; import net.bigeon.gclc.swt.tools.HistoryTextKeyListener;
@ -132,14 +134,14 @@ public final class SWTConsoleView extends Composite {
/** Get the manager of console input. /** Get the manager of console input.
* *
* @return the input manager */ * @return the input manager */
public ConsoleInputManager getInputManager() { public ConsoleDelayIO getInputManager() {
return inManager; return inManager;
} }
/** Get the manager of console output. /** Get the manager of console output.
* *
* @return the output manager */ * @return the output manager */
public ConsoleOutputManager getOutputManager() { public ConsoleOutputDisplay getOutputManager() {
return outManager; return outManager;
} }
} }

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

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