From 1568bf81281507aaaa8c71af85e244e94bd2924c Mon Sep 17 00:00:00 2001 From: w0rp Date: Tue, 19 Dec 2017 18:23:09 +0000 Subject: Fix the mscs tests on Windows, and use the improved Simplify for all tests instead. --- test/command_callback/test_javac_command_callback.vader | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test/command_callback/test_javac_command_callback.vader') diff --git a/test/command_callback/test_javac_command_callback.vader b/test/command_callback/test_javac_command_callback.vader index fe545307..7823d030 100644 --- a/test/command_callback/test_javac_command_callback.vader +++ b/test/command_callback/test_javac_command_callback.vader @@ -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([]) -- cgit v1.2.3