fixed unit tests and some compiler warnings

OpenASR · Jun 27, 2018 · 48e77de · 48e77de
1 parent fc336a4
commit 48e77de
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,9 @@
 default:
 	@docker run --rm -v $(PWD):/idear -w /idear idear ./gradlew buildPlugin
 
+test:
+	@docker run --rm -v $(PWD):/idear -w /idear idear ./gradlew test
+
 docker:
+	@rm -rf build out
 	@docker build -t idear .
diff --git a/src/main/java/org/openasr/idear/actions/ActionRoutines.kt b/src/main/java/org/openasr/idear/actions/ActionRoutines.kt
@@ -99,10 +99,10 @@ object ActionRoutines {
     fun routineCheck(c: String) =
             SurroundWithNoNullCheckRecognizer().let {
                 if (it.isMatching(c))
-                    DataManager.getInstance().dataContextFromFocus
-                            .doWhenDone({ dataContext: DataContext ->
+                    DataManager.getInstance().dataContextFromFocusAsync
+                            .then { dataContext: DataContext -> {
                                 run(it, c, dataContext)
-                            } as Consumer<DataContext>)
+                            }}
             }
 
     fun routineStep(c: String) {

diff --git a/src/main/java/org/openasr/idear/nlp/PatternBasedNlpProvider.kt b/src/main/java/org/openasr/idear/nlp/PatternBasedNlpProvider.kt
@@ -38,42 +38,42 @@ import java.awt.event.KeyEvent.*
 
 class PatternBasedNlpProvider : NlpProvider {
     /**
-     * @param u - the command as spoken
+     * @param utterance - the command as spoken
      */
-    override fun processUtterance(u: String) {
+    override fun processUtterance(utterance: String) {
         when {
-            u == HI_IDEA -> TTSService.say("Hi, again!")
-            u.startsWith(OPEN) -> routineOpen(u)
-            u.startsWith(NAVIGATE) -> invokeAction("GotoDeclaration")
-            u.startsWith(EXECUTE) -> invokeAction("Run")
-            u == WHERE_AM_I -> WhereAmIAction()
-            u.startsWith(FOCUS) -> routineFocus(u)
-            u.startsWith(GOTO) -> routineGoto(u)
-            u.startsWith(EXPAND) -> invokeAction(ACTION_EDITOR_SELECT_WORD_AT_CARET)
-            u.startsWith(SHRINK) -> invokeAction(ACTION_EDITOR_UNSELECT_WORD_AT_CARET)
-            u.startsWith(PRESS) -> routinePress(u)
-            u.startsWith("release") -> routineReleaseKey(u)
-            u.startsWith("following") -> routineFollowing(u)
-            u.startsWith("extract this") -> routineExtract(u)
-            u.startsWith("inspect code") -> invokeAction("CodeInspection.OnEditor")
-            u.startsWith("speech pause") -> pauseSpeech()
-            u == SHOW_USAGES -> invokeAction("ShowUsages")
+            utterance == HI_IDEA -> TTSService.say("Hi, again!")
+            utterance.startsWith(OPEN) -> routineOpen(utterance)
+            utterance.startsWith(NAVIGATE) -> invokeAction("GotoDeclaration")
+            utterance.startsWith(EXECUTE) -> invokeAction("Run")
+            utterance == WHERE_AM_I -> WhereAmIAction()
+            utterance.startsWith(FOCUS) -> routineFocus(utterance)
+            utterance.startsWith(GOTO) -> routineGoto(utterance)
+            utterance.startsWith(EXPAND) -> invokeAction(ACTION_EDITOR_SELECT_WORD_AT_CARET)
+            utterance.startsWith(SHRINK) -> invokeAction(ACTION_EDITOR_UNSELECT_WORD_AT_CARET)
+            utterance.startsWith(PRESS) -> routinePress(utterance)
+            utterance.startsWith("release") -> routineReleaseKey(utterance)
+            utterance.startsWith("following") -> routineFollowing(utterance)
+            utterance.startsWith("extract this") -> routineExtract(utterance)
+            utterance.startsWith("inspect code") -> invokeAction("CodeInspection.OnEditor")
+            utterance.startsWith("speech pause") -> pauseSpeech()
+            utterance == SHOW_USAGES -> invokeAction("ShowUsages")
 //            u.startsWith(OKAY_IDEA) -> routineOkIdea()
 //            u.startsWith(OKAY_GOOGLE) -> fireGoogleSearch()
-            "break point" in u -> routineHandleBreakpoint(u)
-            u.startsWith(DEBUG) -> IDEService.type(VK_CONTROL, VK_SHIFT, VK_F9)
-            u.startsWith("step") -> routineStep(u)
-            u.startsWith("resume") -> invokeAction("Resume")
-            u.startsWith("tell me a joke") -> tellJoke()
-            "check" in u -> routineCheck(u)
-            "tell me about yourself" in u -> routineAbout()
+            "break point" in utterance -> routineHandleBreakpoint(utterance)
+            utterance.startsWith(DEBUG) -> IDEService.type(VK_CONTROL, VK_SHIFT, VK_F9)
+            utterance.startsWith("step") -> routineStep(utterance)
+            utterance.startsWith("resume") -> invokeAction("Resume")
+            utterance.startsWith("tell me a joke") -> tellJoke()
+            "check" in utterance -> routineCheck(utterance)
+            "tell me about yourself" in utterance -> routineAbout()
 //            "add new class" in u -> routineAddNewClass()
-            "print line" in u -> routinePrintln()
+            "print line" in utterance -> routinePrintln()
 //            "new string" in u -> routineNewString()
 //            "enter " in u -> routineEnter(u)
-            "public static void main" in u -> routinePsvm()
-            u.endsWith("of line") -> routineOfLine(u)
-            u.startsWith("find in") -> routineFind(u)
+            "public static void main" in utterance -> routinePsvm()
+            utterance.endsWith("of line") -> routineOfLine(utterance)
+            utterance.startsWith("find in") -> routineFind(utterance)
         }
     }
 }
diff --git a/src/test/kotlin/org.openasr.idear/NlpParserTest.kt b/src/test/kotlin/org.openasr.idear/NlpParserTest.kt
@@ -48,7 +48,7 @@ class NlpParserTest {
         @BeforeClass
         @JvmStatic
         fun setUp() {
-            myParser = NlpParserService(null) //"en-parser-chunking.bin")
+            myParser = NlpParserService("src/main/resources/en-parser-chunking.bin")
             myParser!!.init()
         }
     }