summaryrefslogtreecommitdiff
path: root/test/handler
diff options
context:
space:
mode:
authorw0rp <devw0rp@gmail.com>2017-12-18 13:27:59 +0000
committerw0rp <devw0rp@gmail.com>2017-12-18 13:27:59 +0000
commitfdaac9bd781baf85d04d6b3138a2b80cd7b3a25d (patch)
treec79dc88b5d4a33e273484e6568d674e23bb6a64b /test/handler
parent31241e9ed89ddad6c015d0f9ca9bb8a4de80332e (diff)
downloadale-fdaac9bd781baf85d04d6b3138a2b80cd7b3a25d.zip
Fix #1210 - Fix a Windows path issue which broke TSLint
Diffstat (limited to 'test/handler')
-rw-r--r--test/handler/test_javac_handler.vader10
-rw-r--r--test/handler/test_tslint_handler.vader4
2 files changed, 7 insertions, 7 deletions
diff --git a/test/handler/test_javac_handler.vader b/test/handler/test_javac_handler.vader
index 3997b42c..6189e6e1 100644
--- a/test/handler/test_javac_handler.vader
+++ b/test/handler/test_javac_handler.vader
@@ -12,33 +12,33 @@ Execute(The javac handler should handle cannot find symbol errors):
AssertEqual
\ [
\ {
- \ 'filename': '/tmp/vLPr4Q5/33/foo.java',
+ \ 'filename': ale#path#Simplify('/tmp/vLPr4Q5/33/foo.java'),
\ 'lnum': 1,
\ 'text': 'error: some error',
\ 'type': 'E',
\ },
\ {
- \ 'filename': '/tmp/vLPr4Q5/33/foo.java',
+ \ 'filename': ale#path#Simplify('/tmp/vLPr4Q5/33/foo.java'),
\ 'lnum': 2,
\ 'col': 5,
\ 'text': 'error: cannot find symbol: BadName',
\ 'type': 'E',
\ },
\ {
- \ 'filename': '/tmp/vLPr4Q5/33/foo.java',
+ \ 'filename': ale#path#Simplify('/tmp/vLPr4Q5/33/foo.java'),
\ 'lnum': 34,
\ 'col': 5,
\ 'text': 'error: cannot find symbol: BadName2',
\ 'type': 'E',
\ },
\ {
- \ 'filename': '/tmp/vLPr4Q5/33/foo.java',
+ \ 'filename': ale#path#Simplify('/tmp/vLPr4Q5/33/foo.java'),
\ 'lnum': 37,
\ 'text': 'warning: some warning',
\ 'type': 'W',
\ },
\ {
- \ 'filename': '/tmp/vLPr4Q5/33/foo.java',
+ \ 'filename': ale#path#Simplify('/tmp/vLPr4Q5/33/foo.java'),
\ 'lnum': 42,
\ 'col': 11,
\ 'text': 'error: cannot find symbol: bar()',
diff --git a/test/handler/test_tslint_handler.vader b/test/handler/test_tslint_handler.vader
index bbaef837..8d263efa 100644
--- a/test/handler/test_tslint_handler.vader
+++ b/test/handler/test_tslint_handler.vader
@@ -287,9 +287,9 @@ Execute(The tslint handler should not report no-implicit-dependencies errors):
Execute(The tslint handler should set filename keys for temporary files):
" The temporay filename below is hacked into being a relative path so we can
" test that we resolve the temporary filename first.
- let b:relative_to_root = substitute(expand('%:p'), '\v[^/\\]*([/\\])[^/\\]*', has('win32') ? '..\' : '../', 'g')
+ let b:relative_to_root = substitute(expand('%:p'), '\v[^/\\]*([/\\])[^/\\]*', '../', 'g')
let b:tempname_suffix = substitute(tempname(), '^\v([A-Z]:)?[/\\]', '', '')
- let b:relative_tempname = b:relative_to_root . b:tempname_suffix
+ let b:relative_tempname = substitute(b:relative_to_root . b:tempname_suffix, '\\', '/', 'g')
AssertEqual
\ [