Fix bug on symbolic link

- Always use file names put on command line

Bug: 18629512
Change-Id: I95fffdc8f053577bc52dc7f8194d09a68b53b15e

1 files changed, 4 insertions, 3 deletions

diff --git a/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java b/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java
index 5d52bce..66b2336 100644
--- a/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java
+++ b/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java
@@ -151,13 +151,13 @@ public class FileAccessErrorTest {
           AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()),
           te.getOutputDexFolder(), /* zipFile = */ false, te.getSourceFolder());
       Assert.fail();
-    } catch (FrontendCompilationException e) {
+    } catch (JackUserException e) {
       // Failure is ok since source file is not readable
+      Assert.assertTrue(e.getMessage().contains("is not readable"));
     } finally {
       if (!a.setReadable(true)) {
         Assert.fail("Fails to change file permissions of " + a.getAbsolutePath());
       }
-      Assert.assertTrue(errOut.toString().contains("Permission denied"));
     }
   }
 
@@ -231,7 +231,8 @@ public class FileAccessErrorTest {
       Assert.fail();
     } catch (JackUserException e) {
       // Failure is ok since source file is not readable
-      Assert.assertTrue(e.getMessage().contains("A.java is missing"));
+      Assert.assertTrue(e.getMessage().contains("A.java"));
+      Assert.assertTrue(e.getMessage().contains("does not exist"));
     }
   }
 }