picocli fish completion: run fish dejagnu tests from java

src/test/dejagnu.fishtests/completion/basicExample.exp

@@ -19,6 +19,5 @@ run_completion_test $cmd $test $candidates
 
 set cmd "basicExample --timeUnit="
 set test "Tab should show time unit enum values for '$cmd'"
-#set candidates "1 2 3"
-set candidates "\u2026timeUnit=DAYS   \u2026timeUnit=MICROSECONDS  \u2026timeUnit=MINUTES      \u2026timeUnit=SECONDS\r\n\u2026timeUnit=HOURS  \u2026timeUnit=MILLISECONDS  \u2026timeUnit=NANOSECONDS  "
+set candidates ".*timeUnit=DAYS.*timeUnit=MICROSECONDS.*timeUnit=MINUTES.*timeUnit=SECONDS.*timeUnit=HOURS.*timeUnit=MILLISECONDS.*timeUnit=NANOSECONDS.*"
 run_completion_test $cmd $test $candidates

src/test/dejagnu.fishtests/completion/picocompletion-demo.exp

@@ -18,7 +18,6 @@ run_completion_test $cmd $test $candidates
 # set cmd "picocompletion-demo sub1 "
 # set test "Tab should not show completions for '${cmd}'"
 
-# there is completion from root level
 set cmd "picocompletion-demo sub1 -"
 set test "Tab should show sub1 options for '${cmd}'"
 set candidates "--candidates.*--candidates=.*--num.*--str.*"

src/test/dejagnu.fishtests/lib/completion.exp

@@ -1,4 +1,8 @@
 exp_spawn fish --no-config
 expect -re "(.+>)"
 
+# Set terminal size to my notebook's resolution
+send "stty rows 53 cols 190\r"
+expect -re "(.+>)"
+
 source $::srcdir/lib/library.exp

src/test/dejagnu.fishtests/lib/library.exp

@@ -1,11 +1,11 @@
 proc run_completion_test {cmd test candidates} {
+    exp_internal 1
     send "${cmd}\t"
     expect {
         -re "(\n${candidates}\u001b)" { pass $test }
         timeout { fail $test }
     }
-    puts "###Output"
-    puts "$expect_out(1,string)"
+    exp_internal 0
     send "\x03"
     expect ">"
 }

src/test/dejagnu.fishtests/runCompletion

@@ -0,0 +1,2 @@
+#!/bin/bash
+runtest --outdir log --tool completion

src/test/java/picocli/AutoCompleteDejaGnuTest.java

@@ -67,11 +67,19 @@ public void tryRunDejaGnuCompletionTests() throws Exception {
 
         // ignores test if dejagnu not installed
         org.junit.Assume.assumeTrue("dejagnu must be installed to run this test", isDejaGnuInstalled());
-        runDejaGnuCompletionTests();
+        runDejaGnuCompletionTests("src/test/dejagnu.tests");
     }
 
-    private void runDejaGnuCompletionTests() throws Exception {
-        final File testDir = new File("src/test/dejagnu.tests");
+    @Test
+    public void tryRunFishDejaGnuCompletionTests() throws Exception {
+        // ignores test if dejagnu not installed
+        org.junit.Assume.assumeTrue("dejagnu must be installed to run this test", isDejaGnuInstalled());
+        runDejaGnuCompletionTests("src/test/dejagnu.fishtests");
+    }
+
+
+    private void runDejaGnuCompletionTests(String pathname) throws Exception {
+        final File testDir = new File(pathname);
         assertTrue(testDir.getAbsolutePath() + " should exist", testDir.exists());
         File runCompletionScript = new File(testDir, "runCompletion");
         assertTrue(runCompletionScript.getAbsolutePath() + " should exist", runCompletionScript.exists());