Repository: zeppelin Updated Branches: refs/heads/master 90a7e518c -> c6fcb3b2f
[ZEPPELIN-1100] Auto completion of Alluxio interpreter doesn't work ### What is this PR for? This PR fixes auto competion of Alluxio interpreter ### What type of PR is it? Bug Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1100 ### How should this be tested? Test auto completion of Alluxio, you can refer to http://zeppelin.incubator.apache.org/docs/0.6.0-SNAPSHOT/interpreter/alluxio.html#interpreter-commands. ### Screenshots (if appropriate) - before  - after  ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: astroshim <[email protected]> Closes #1118 from astroshim/bugfix/AlluxioAutocompletion and squashes the following commits: 7dee681 [astroshim] fix testcase 3c43276 [astroshim] fix alluxio auto completion bug. Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c6fcb3b2 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c6fcb3b2 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c6fcb3b2 Branch: refs/heads/master Commit: c6fcb3b2f61b93fc6db71ce29355b8fa1726bdc8 Parents: 90a7e51 Author: astroshim <[email protected]> Authored: Mon Jul 4 00:18:49 2016 +0900 Committer: Alexander Bezzubov <[email protected]> Committed: Thu Jul 7 11:24:01 2016 +0900 ---------------------------------------------------------------------- .../zeppelin/alluxio/AlluxioInterpreter.java | 5 ++-- .../alluxio/AlluxioInterpreterTest.java | 29 +++++++++++++++----- 2 files changed, 25 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6fcb3b2/alluxio/src/main/java/org/apache/zeppelin/alluxio/AlluxioInterpreter.java ---------------------------------------------------------------------- diff --git a/alluxio/src/main/java/org/apache/zeppelin/alluxio/AlluxioInterpreter.java b/alluxio/src/main/java/org/apache/zeppelin/alluxio/AlluxioInterpreter.java index a6fed71..797a7f1 100644 --- a/alluxio/src/main/java/org/apache/zeppelin/alluxio/AlluxioInterpreter.java +++ b/alluxio/src/main/java/org/apache/zeppelin/alluxio/AlluxioInterpreter.java @@ -181,10 +181,11 @@ public class AlluxioInterpreter extends Interpreter { if (words.length > 0) { lastWord = words[ words.length - 1 ]; } - ArrayList voices = new ArrayList<>(); + + List<InterpreterCompletion> voices = new LinkedList<>(); for (String command : keywords) { if (command.startsWith(lastWord)) { - voices.add(command); + voices.add(new InterpreterCompletion(command, command)); } } return voices; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6fcb3b2/alluxio/src/test/java/org/apache/zeppelin/alluxio/AlluxioInterpreterTest.java ---------------------------------------------------------------------- diff --git a/alluxio/src/test/java/org/apache/zeppelin/alluxio/AlluxioInterpreterTest.java b/alluxio/src/test/java/org/apache/zeppelin/alluxio/AlluxioInterpreterTest.java index 61d97b5..5cbe72f 100644 --- a/alluxio/src/test/java/org/apache/zeppelin/alluxio/AlluxioInterpreterTest.java +++ b/alluxio/src/test/java/org/apache/zeppelin/alluxio/AlluxioInterpreterTest.java @@ -77,12 +77,22 @@ public class AlluxioInterpreterTest { @Test public void testCompletion() { - List expectedResultOne = Arrays.asList("cat", "chgrp", - "chmod", "chown", "copyFromLocal", "copyToLocal", "count", - "createLineage"); - List expectedResultTwo = Arrays.asList("copyFromLocal", - "copyToLocal", "count"); - List expectedResultThree = Arrays.asList("copyFromLocal", "copyToLocal"); + List expectedResultOne = Arrays.asList( + new InterpreterCompletion("cat", "cat"), + new InterpreterCompletion("chgrp", "chgrp"), + new InterpreterCompletion("chmod", "chmod"), + new InterpreterCompletion("chown", "chown"), + new InterpreterCompletion("copyFromLocal", "copyFromLocal"), + new InterpreterCompletion("copyToLocal", "copyToLocal"), + new InterpreterCompletion("count", "count"), + new InterpreterCompletion("createLineage", "createLineage")); + List expectedResultTwo = Arrays.asList( + new InterpreterCompletion("copyFromLocal", "copyFromLocal"), + new InterpreterCompletion("copyToLocal", "copyToLocal"), + new InterpreterCompletion("count", "count")); + List expectedResultThree = Arrays.asList( + new InterpreterCompletion("copyFromLocal", "copyFromLocal"), + new InterpreterCompletion("copyToLocal", "copyToLocal")); List expectedResultNone = new ArrayList<String>(); List<InterpreterCompletion> resultOne = alluxioInterpreter.completion("c", 0); @@ -95,7 +105,12 @@ public class AlluxioInterpreterTest { Assert.assertEquals(expectedResultTwo, resultTwo); Assert.assertEquals(expectedResultThree, resultThree); Assert.assertEquals(expectedResultNone, resultNotMatch); - Assert.assertEquals(alluxioInterpreter.keywords, resultAll); + + List allCompletionList = new ArrayList<>(); + for (InterpreterCompletion ic : resultAll) { + allCompletionList.add(ic.getName()); + } + Assert.assertEquals(alluxioInterpreter.keywords, allCompletionList); } @Test
