Fix the mscs tests on Windows, and use the improved Simplify for all tests instead.

This commit is contained in:
w0rp
2017-12-19 18:23:09 +00:00
parent 73f61514c9
commit 1568bf8128
68 changed files with 224 additions and 241 deletions

View File

@@ -122,7 +122,7 @@ Execute(The javac callback should detect source directories):
AssertEqual
\ 'cd ' . ale#Escape(expand('%:p:h')) . ' && javac -Xlint'
\ . ' -sourcepath ' . ale#Escape(
\ ale#path#Winify(g:dir . '/java_paths/src/main/java/')
\ ale#path#Simplify(g:dir . '/java_paths/src/main/java/')
\ )
\ . ' -d TEMP %t',
\ GetCommand([])
@@ -136,7 +136,7 @@ Execute(The javac callback should combine detected source directories and classp
\ 'cd ' . ale#Escape(expand('%:p:h')) . ' && javac -Xlint'
\ . ' -cp ' . ale#Escape(join(['/foo/bar.jar', '/xyz/abc.jar'], g:cp_sep))
\ . ' -sourcepath ' . ale#Escape(
\ ale#path#Winify(g:dir . '/java_paths/src/main/java/')
\ ale#path#Simplify(g:dir . '/java_paths/src/main/java/')
\ )
\ . ' -d TEMP %t',
\ GetCommand([
@@ -166,8 +166,8 @@ Execute(The javac callback should include src/test/java for test paths):
AssertEqual
\ 'cd ' . ale#Escape(expand('%:p:h')) . ' && javac -Xlint'
\ . ' -sourcepath ' . ale#Escape(join([
\ ale#path#Winify(g:dir . '/java_paths/src/main/java/'),
\ ale#path#Winify(g:dir . '/java_paths/src/test/java/'),
\ ale#path#Simplify(g:dir . '/java_paths/src/main/java/'),
\ ale#path#Simplify(g:dir . '/java_paths/src/test/java/'),
\ ], g:cp_sep))
\ . ' -d TEMP %t',
\ GetCommand([])
@@ -180,8 +180,8 @@ Execute(The javac callback should include src/main/jaxb when available):
AssertEqual
\ 'cd ' . ale#Escape(expand('%:p:h')) . ' && javac -Xlint'
\ . ' -sourcepath ' . ale#Escape(join([
\ ale#path#Winify(g:dir . '/java_paths_with_jaxb/src/main/java/'),
\ ale#path#Winify(g:dir . '/java_paths_with_jaxb/src/main/jaxb/'),
\ ale#path#Simplify(g:dir . '/java_paths_with_jaxb/src/main/java/'),
\ ale#path#Simplify(g:dir . '/java_paths_with_jaxb/src/main/jaxb/'),
\ ], g:cp_sep))
\ . ' -d TEMP %t',
\ GetCommand([])