2 files changed, 32 insertions, 18 deletions
diff --git a/test/handler/test_scala_handler.vader b/test/handler/test_scala_handler.vader
new file mode 100644
index 00000000..3214bdbc
--- /dev/null
+++ b/test/handler/test_scala_handler.vader
@@ -0,0 +1,32 @@
+After:
+  call ale#linter#Reset()
+
+Execute(The handler should return an empty list with empty input):
+  AssertEqual [], ale#handlers#scala#HandleScalacLintFormat(bufnr(''), [])
+
+Execute(The handler should correctly parse error messages):
+  AssertEqual 
+  \ [
+  \   { 
+  \     'lnum': 4,
+  \     'col':  8,
+  \     'text': ''':'' expected but identifier found.',
+  \     'type': 'E'
+  \   },
+  \   {
+  \     'lnum': 6,
+  \     'col':  2,
+  \     'text': 'identifier expected but eof found.',
+  \     'type': 'E'
+  \   }
+  \ ],
+  \ ale#handlers#scala#HandleScalacLintFormat(bufnr(''),
+  \ [
+  \ "hi.scala:4: error: ':' expected but identifier found.",
+  \ "  Some stupid scala code",
+  \ "       ^",
+  \ "hi.scala:6: error: identifier expected but eof found.",
+  \ ")",
+  \ " ^",
+  \ "two errors found",
+  \ ])
diff --git a/test/handler/test_scalac_handler.vader b/test/handler/test_scalac_handler.vader
deleted file mode 100644
index fd222f67..00000000
--- a/test/handler/test_scalac_handler.vader
+++ /dev/null
@@ -1,18 +0,0 @@
-Before:
-  runtime ale_linters/scala/scalac.vim
-
-After:
-  call ale#linter#Reset()
-
-Given scala(An empty Scala file):
-
-Execute(The default executable and command should be correct):
-  AssertEqual 'scalac', ale_linters#scala#scalac#GetExecutable(bufnr(''))
-  AssertEqual
-  \ ale#Escape('scalac') . ' -Ystop-after:parser %t',
-  \ ale_linters#scala#scalac#GetCommand(bufnr(''))
-
-Given scala.sbt(An empty SBT file):
-Execute(scalac should not be run for sbt files):
-  AssertEqual '', ale_linters#scala#scalac#GetExecutable(bufnr(''))
-  AssertEqual '', ale_linters#scala#scalac#GetCommand(bufnr(''))