Fix unit tests for conemu

jline · Jan 30, 2019 · a6dd868 · a6dd868
1 parent 8bb13a8
commit a6dd868
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 31 deletions.
diff --git a/reader/src/test/java/org/jline/reader/impl/LineReaderTest.java b/reader/src/test/java/org/jline/reader/impl/LineReaderTest.java
@@ -12,21 +12,28 @@
 import org.jline.reader.EndOfFileException;
 import org.jline.reader.LineReader;
 import org.jline.reader.LineReaderBuilder;
+import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
+import org.jline.terminal.impl.AbstractWindowsTerminal;
 import org.jline.terminal.impl.DumbTerminal;
 import org.jline.utils.AttributedString;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringWriter;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.jline.terminal.impl.AbstractWindowsTerminal.TYPE_WINDOWS_CONEMU;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 public class LineReaderTest {
@@ -90,4 +97,49 @@ private String computeGroupPost(List<Candidate> c, boolean autoGroup, boolean gr
         return new LineReaderImpl(terminal).computePost(c, null, null, "", s -> AttributedString.fromAnsi(s).columnLength(), 80, autoGroup, groupName, true).post.toString();
     }
 
+    @Test
+    public void testConEmuLineReaderClearScreen() throws IOException {
+        System.setProperty("org.jline.terminal.conemu.disable-activate", "false");
+        StringWriter sw = new StringWriter();
+        AbstractWindowsTerminal terminal = new AbstractWindowsTerminal(new BufferedWriter(sw), "name", TYPE_WINDOWS_CONEMU, Charset.defaultCharset(),0,
+                false, Terminal.SignalHandler.SIG_DFL) {
+            @Override
+            protected int getConsoleOutputCP() {
+                return 0;
+            }
+            @Override
+            protected int getConsoleMode() {
+                return 0;
+            }
+            @Override
+            protected void setConsoleMode(int mode) {
+            }
+            @Override
+            protected boolean processConsoleInput() throws IOException {
+                return false;
+            }
+            @Override
+            public Size getSize() {
+                return new Size(80, 25);
+            }
+        };
+        assertTrue(sw.toString().contains("\u001b[9999E"));
+        LineReader reader = new LineReaderImpl(terminal);
+        new Thread(() -> {
+            try {
+                Thread.sleep(50);
+                terminal.processInputChar((char) 12);
+                Thread.sleep(50);
+                terminal.processInputChar('a');
+                terminal.processInputChar((char) 13);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }).start();
+        String line = reader.readLine();
+        assertTrue(sw.toString().contains("\u001b[H\u001b[J"));
+        assertTrue(sw.toString().contains("\u001b[9999E"));
+    }
+
+
 }
diff --git a/terminal/src/test/java/org/jline/terminal/impl/AbstractWindowsTerminalTest.java b/terminal/src/test/java/org/jline/terminal/impl/AbstractWindowsTerminalTest.java
@@ -10,9 +10,7 @@
 
 import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;
-import static org.jline.terminal.impl.AbstractWindowsTerminal.TYPE_WINDOWS_256_COLOR;
 import org.jline.utils.AnsiWriter;
-import org.jline.utils.InfoCmp;
 import org.junit.Test;
 
 import java.io.BufferedWriter;
@@ -59,33 +57,4 @@ public Size getSize() {
         assertEquals("This is a char.\nThis is a string.\n", sw.toString());
     }
 
-    @Test
-    public void testConEmuClearScreen() throws IOException {
-        System.setProperty("org.jline.terminal.conemu.disable-activate", "false");
-        StringWriter sw = new StringWriter();
-        Terminal terminal = new AbstractWindowsTerminal(new AnsiWriter(new BufferedWriter(sw)), "name", TYPE_WINDOWS_256_COLOR, Charset.defaultCharset(),0,
-                false, Terminal.SignalHandler.SIG_DFL) {
-            @Override
-            protected int getConsoleOutputCP() {
-                return 0;
-            }
-            @Override
-            protected int getConsoleMode() {
-                return 0;
-            }
-            @Override
-            protected void setConsoleMode(int mode) {
-            }
-            @Override
-            protected boolean processConsoleInput() throws IOException {
-                return false;
-            }
-            @Override
-            public Size getSize() {
-                return new Size(80, 25);
-            }
-        };
-        assertEquals("\\E[H\\E[J\\E[9999E", terminal.getStringCapability(InfoCmp.Capability.clear_screen));
-    }
-
 }