Fix terminal io bug.

Author: Aleksi Salmela

src/main/java/fi/helsinki/cs/tmc/cli/io/TerminalIo.java

@@ -4,11 +4,21 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.Console;
+import java.io.InputStream;
 import java.util.Scanner;
 
 public class TerminalIo extends Io {
 
     private static final Logger logger = LoggerFactory.getLogger(TerminalIo.class);
+    private final Scanner scanner;
+
+    public TerminalIo(InputStream stream) {
+        Scanner newScanner = null;
+        if (stream != null) {
+            newScanner = new Scanner(stream);
+        }
+        scanner = newScanner;
+    }
 
     @Override
     public void print(String str) {
@@ -19,8 +29,11 @@ public void print(String str) {
     public String readLine(String prompt) {
         print(prompt);
 
-        try (Scanner scanner = new Scanner(System.in)) {
+        try {
             return scanner.nextLine();
+        } catch (Exception e) {
+            logger.warn("Line could not be read.", e);
+            return null;
         }
     }
 

src/main/java/fi/helsinki/cs/tmc/cli/io/TmcCliProgressObserver.java

@@ -17,7 +17,7 @@ public class TmcCliProgressObserver extends ProgressObserver {
     protected Boolean hasProgressBar;
 
     public TmcCliProgressObserver() {
-        this(new TerminalIo());
+        this(new TerminalIo(System.in));
     }
 
     public TmcCliProgressObserver(Io io) {

src/test/java/fi/helsinki/cs/tmc/cli/command/core/CommandFactoryTest.java

@@ -7,7 +7,7 @@
 import fi.helsinki.cs.tmc.cli.Application;
 import fi.helsinki.cs.tmc.cli.CliContext;
 import fi.helsinki.cs.tmc.cli.io.Io;
-import fi.helsinki.cs.tmc.cli.io.TerminalIo;
+import fi.helsinki.cs.tmc.cli.io.TestIo;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
@@ -28,7 +28,7 @@ public class CommandFactoryTest {
 
     @Before
     public void setUp() {
-        ctx = new CliContext(new TerminalIo());
+        ctx = new CliContext(new TestIo());
     }
 
     @Test

src/test/java/fi/helsinki/cs/tmc/cli/io/TerminalIoTest.java

@@ -9,7 +9,6 @@
 import static org.powermock.api.mockito.PowerMockito.spy;
 import static org.powermock.api.mockito.PowerMockito.when;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,7 +18,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Console;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
@@ -30,27 +28,20 @@ public class TerminalIoTest {
 
     private Io io;
     private OutputStream os;
-    private InputStream oldInputStream;
 
     @Before
     public void setUp() throws Exception {
-        oldInputStream = System.in;
-        io = new TerminalIo();
+        io = new TerminalIo(null);
         os = new ByteArrayOutputStream();
         PrintStream ps = new PrintStream(os);
         System.setOut(ps);
 
         spy(System.class);
     }
 
-    @After
-    public void cleanUp() {
-        System.setIn(oldInputStream);
-    }
-
     public void writeString(String string) {
         byte[] bytes = string.getBytes(StandardCharsets.UTF_8);
-        System.setIn(new ByteArrayInputStream(bytes));
+        io = new TerminalIo(new ByteArrayInputStream(bytes));
     }
 
     @Test
@@ -91,6 +82,14 @@ public void readLineIgnoresRestOfTheLines() {
         assertEquals("abc ", os.toString());
     }
 
+    @Test
+    public void readTwoLines() {
+        writeString("test\ncool\n");
+        assertEquals("test", io.readLine("abc "));
+        assertEquals("cool", io.readLine("abc "));
+        assertEquals("abc abc ", os.toString());
+    }
+
     @Test
     public void readPassword() {
         Console mockConsole = mock(Console.class);