Adapt FileAccessErrorTest to support CaseInsensitiveFS

This is a bit hackish since it uses the Location, but I guess that
for a test it'll do.

Bug: 21486756

(cherry picked from commit 64e246e3b74e6989a4f930192cc7ed81fd2ed667)

Change-Id: Ie301194abc50fcc1db9801e93736579c8d03667c

2 files changed, 19 insertions, 8 deletions

diff --git a/jack-tests/src/com/android/jack/test/helper/IncrementalTestHelper.java b/jack-tests/src/com/android/jack/test/helper/IncrementalTestHelper.java
index 237abf85..a69c4daf 100644
--- a/jack-tests/src/com/android/jack/test/helper/IncrementalTestHelper.java
+++ b/jack-tests/src/com/android/jack/test/helper/IncrementalTestHelper.java
@@ -130,7 +130,7 @@ public class IncrementalTestHelper {
   public void snapshotJackFilesModificationDate() throws LibraryIOException {
     InputJackLibrary compilerStateLib = null;
     try {
-      compilerStateLib = AbstractTestTools.getInputJackLibraryFromDir(compilerStateFolder);
+      compilerStateLib = AbstractTestTools.getInputJackLibrary(compilerStateFolder);
       Iterator<InputVFile> jayceIter = compilerStateLib.iterator(FileType.JAYCE);
       while (jayceIter.hasNext()) {
         InputVFile jayceFile = jayceIter.next();
@@ -151,7 +151,7 @@ public class IncrementalTestHelper {
     List<String> fqnOfRebuiltTypes = new ArrayList<String>();
     InputJackLibrary compilerStateLib = null;
     try {
-      compilerStateLib = AbstractTestTools.getInputJackLibraryFromDir(compilerStateFolder);
+      compilerStateLib = AbstractTestTools.getInputJackLibrary(compilerStateFolder);
       Iterator<InputVFile> jayceIter = compilerStateLib.iterator(FileType.JAYCE);
       while (jayceIter.hasNext()) {
         InputVFile jayceFile = jayceIter.next();
@@ -237,7 +237,7 @@ public class IncrementalTestHelper {
     int size = 0;
     InputJackLibrary compilerStateLib = null;
     try {
-      compilerStateLib = AbstractTestTools.getInputJackLibraryFromDir(compilerStateFolder);
+      compilerStateLib = AbstractTestTools.getInputJackLibrary(compilerStateFolder);
       Iterator<InputVFile> jayceIter = compilerStateLib.iterator(FileType.JAYCE);
       while (jayceIter.hasNext()) {
         size++;
diff --git a/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java b/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java
index 8cb6472e..5ee022a2 100644
--- a/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java
+++ b/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java
@@ -20,6 +20,8 @@ import com.android.jack.JackAbortException;
 import com.android.jack.JackUserException;
 import com.android.jack.Main;
 import com.android.jack.backend.jayce.JayceFileImporter;
+import com.android.jack.library.FileType;
+import com.android.jack.library.InputJackLibrary;
 import com.android.jack.library.LibraryIOException;
 import com.android.jack.library.LibraryReadingException;
 import com.android.jack.test.category.KnownBugs;
@@ -30,16 +32,18 @@ import com.android.sched.util.codec.ListParsingException;
 import com.android.sched.util.codec.ParsingException;
 import com.android.sched.util.config.PropertyIdException;
 import com.android.sched.util.file.WrongPermissionException;
+import com.android.sched.util.location.FileLocation;
+import com.android.sched.vfs.InputVFile;
 
 import junit.framework.Assert;
 
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.util.Iterator;
 
 /**
  * JUnit test checking Jack behavior on file access error.
@@ -168,7 +172,6 @@ public class FileAccessErrorTest {
    * Checks that compilation fails correctly when jack file is not readable.
    */
   @Test
-  @Ignore
   public void testFileAccessError004() throws Exception {
     ErrorTestHelper te = new ErrorTestHelper();
 
@@ -190,10 +193,15 @@ public class FileAccessErrorTest {
 
     jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     ByteArrayOutputStream errOut = new ByteArrayOutputStream();
+    InputJackLibrary jackLib = null;
     try {
-      for (File jackFile : AbstractTestTools.getFiles(te.getJackFolder(), JayceFileImporter.JAYCE_FILE_EXTENSION)) {
-        if (!jackFile.setReadable(false)) {
-          Assert.fail("Fails to change file permissions of " + jackFile.getAbsolutePath());
+      jackLib = AbstractTestTools.getInputJackLibrary(te.getJackFolder());
+      Iterator<InputVFile> jackFileIter = jackLib.iterator(FileType.JAYCE);
+      while (jackFileIter.hasNext()) {
+        InputVFile vFile = jackFileIter.next();
+        File file = new File(((FileLocation) vFile.getLocation()).getPath());
+        if (!file.setReadable(false)) {
+          Assert.fail("Fails to change file permissions of " + file.getAbsolutePath());
         }
       }
 
@@ -206,6 +214,9 @@ public class FileAccessErrorTest {
       Assert.assertTrue(e.getCause() instanceof LibraryReadingException);
       Assert.assertTrue(e.getCause().getCause() instanceof LibraryIOException);
     } finally {
+      if (jackLib != null) {
+        jackLib.close();
+      }
       String errOutput = errOut.toString();
       Assert.assertTrue(errOutput.contains(
           "Error during the library reading phase: I/O error when accessing ")); // user reporting