feat: Add tests for java

kkoomen · Jun 9, 2019 · c7eda6f · c7eda6f
1 parent 352b1d0
commit c7eda6f
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 4 deletions.
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
@@ -9,7 +9,7 @@ set cpoptions&vim
 let b:doge_patterns = []
 
 " ==============================================================================
-" Matches regular function expressions and class methods.
+" Matches class methods.
 " ==============================================================================
 "
 " Matches the following scenarios:
@@ -22,7 +22,7 @@ let b:doge_patterns = []
 "
 "   void MyParameterizedFunction(String param1, int param2, Boolean ...params) {}
 call add(b:doge_patterns, {
-\  'match': '\m^\%(public\|private\|protected\)\?\s*\%(static\)\?\s*\%(final\)\?\s*\%(\([[:alnum:]_]\+\)\%(<[[:alnum:][:space:]_,]*>\)\?\)\s*\([[:alnum:]_]\+\)\s*(\(.\{-}\))\s*{',
+\  'match': '\m^\%(\%(public\|private\|protected\)\s*\)\?\%(static\s*\)\?\%(final\s*\)\?\%(\([[:alnum:]_]\+\)\?\%(<[[:alnum:][:space:]_,]*>\)\?\)\?\s\+\([[:alnum:]_]\+\)(\(.\{-}\))\s*{',
 \  'match_group_names': ['returnType', 'funcName', 'parameters'],
 \  'parameters': {
 \    'match': '\m\%(\([[:alnum:]_]\+\)\%(<[[:alnum:][:space:]_,]\+>\)\?\)\%(\s\+[.]\{3}\s\+\|\s\+[.]\{3}\|[.]\{3}\s\+\|\s\+\)\([[:alnum:]_]\+\)',
@@ -35,7 +35,7 @@ call add(b:doge_patterns, {
 \      '/**',
 \      ' * TODO',
 \      ' * {parameters}',
-\      '! * @return {returnType} TODO',
+\      '! * @return {returnType|void} TODO',
 \      ' */',
 \    ],
 \  },

diff --git a/playground/test.java b/playground/test.java
@@ -38,7 +38,7 @@ private ListResultBean<MstRelation> getAllRelation(int parentId) {
    * @param int type TODO
    * @return List TODO
    */
-  private List<ElementDto> createSortedList(Map<Integer, ElementDto> map, int type) {
+  private List<Element> createSortedList(Map<Integer, ElementDto> map, int type) {
     //
   }
 
@@ -88,3 +88,18 @@ void MyParameterizedFunction(String param1, int param2, Boolean ... params) {}
  * @return void TODO
  */
 void MyParameterizedFunction(String param1, int param2, Boolean ...params) {}
+
+/**
+ * TODO
+ * @return List TODO
+ */
+List<Element> createSortedList() {}
+
+/**
+ * TODO
+ * @param IndexSettings indexSettings TODO
+ * @param Environment env TODO
+ * @param String name TODO
+ * @param Settings settings TODO
+ */
+public UkrainianAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {}
diff --git a/test/filetypes/java/class-methods.vader b/test/filetypes/java/class-methods.vader
@@ -0,0 +1,78 @@
+# ==============================================================================
+# Method without parameters.
+# ==============================================================================
+Given java (method without parameters):
+  class Test {
+    List<Element> createSortedList() {}
+  }
+
+Do (trigger doge):
+  :2\<CR>
+  \<C-d>
+
+Expect java (method with 'TODO' and a @return tag):
+  class Test {
+    /**
+     * TODO
+     * @return List TODO
+     */
+    List<Element> createSortedList() {}
+  }
+
+# ==============================================================================
+# Methods without return type.
+# ==============================================================================
+Given java (mtehod without return type):
+  class Test {
+    public createSortedList() {}
+  }
+
+Do (trigger doge):
+  :2\<CR>
+  \<C-d>
+
+Expect java (method with 'TODO' and a @return tag containing 'void'):
+  class Test {
+    /**
+     * TODO
+     * @return void TODO
+     */
+    public createSortedList() {}
+  }
+
+# ==============================================================================
+# Methods with parameters.
+# ==============================================================================
+Given java (method without return type):
+  class Test {
+    private static MstRelation MyParameterizedMethod(String param1, int param2, Boolean ...params) {}
+
+    ListResultBean<MstRelation> MyParameterizedMethod(String param1, int param2, Boolean... params) {}
+  }
+
+Do (trigger doge):
+  :2\<CR>
+  \<C-d>
+  :11\<CR>
+  \<C-d>
+
+Expect java (generated comment where the @return tag should be void):
+  class Test {
+    /**
+     * TODO
+     * @param String param1 TODO
+     * @param int param2 TODO
+     * @param Boolean params TODO
+     * @return MstRelation TODO
+     */
+    private static MstRelation MyParameterizedMethod(String param1, int param2, Boolean ...params) {}
+
+    /**
+     * TODO
+     * @param String param1 TODO
+     * @param int param2 TODO
+     * @param Boolean params TODO
+     * @return ListResultBean TODO
+     */
+    ListResultBean<MstRelation> MyParameterizedMethod(String param1, int param2, Boolean... params) {}
+  }