Include various filesystem-related tests when we test under an Androi…

…d emulator. PiperOrigin-RevId: 526118501
google · Apr 21, 2023 · edabd32 · edabd32
1 parent 58eaef7
commit edabd32
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 74 deletions.
diff --git a/android/guava-tests/test/com/google/common/io/ByteStreamsTest.java b/android/guava-tests/test/com/google/common/io/ByteStreamsTest.java
@@ -51,7 +51,6 @@ public void testCopyChannel() throws IOException {
     assertThat(out.toByteArray()).isEqualTo(expected);
   }
 
-  @AndroidIncompatible // Android forbids much filesystem access. Maybe we could make it work?
 
   public void testCopyFileChannel() throws IOException {
     final int chunkSize = 14407; // Random prime, unlikely to match any internal chunk size
@@ -381,7 +380,7 @@ public void testNewDataOutput_writeChars() {
     assertThat(out.toByteArray()).isEqualTo(expected);
   }
 
-  @AndroidIncompatible // https://code.google.com/p/android/issues/detail?id=196848
+  @AndroidIncompatible // https://issuetracker.google.com/issues/37074504
   public void testUtf16Expected() {
     byte[] hardcodedExpected = utf16ExpectedWithBom;
     byte[] computedExpected = "r\u00C9sum\u00C9".getBytes(Charsets.UTF_16);

diff --git a/android/guava-tests/test/com/google/common/io/FileBackedOutputStreamTest.java b/android/guava-tests/test/com/google/common/io/FileBackedOutputStreamTest.java
@@ -28,7 +28,6 @@
  *
  * @author Chris Nokleberg
  */
-@AndroidIncompatible // Android forbids much filesystem access. Maybe we could make it work?
 public class FileBackedOutputStreamTest extends IoTestCase {
 
 
@@ -80,6 +79,7 @@ private void testThreshold(
   }
 
 
+  @AndroidIncompatible // Finalization probably just doesn't happen fast enough?
   public void testFinalizeDeletesFile() throws Exception {
     byte[] data = newPreFilledByteArray(100);
     FileBackedOutputStream out = new FileBackedOutputStream(0, true);

diff --git a/android/guava-tests/test/com/google/common/io/FilesFileTraverserTest.java b/android/guava-tests/test/com/google/common/io/FilesFileTraverserTest.java
@@ -22,50 +22,20 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import junit.framework.TestCase;
 
 /**
  * Tests for {@link Files#fileTraverser()}.
  *
  * @author Jens Nyman
  */
 
-@AndroidIncompatible // Android forbids much filesystem access. Maybe we could make it work?
-public class FilesFileTraverserTest extends TestCase {
+public class FilesFileTraverserTest extends IoTestCase {
 
   private File rootDir;
 
   @Override
   public void setUp() throws IOException {
-    rootDir = Files.createTempDir();
-  }
-
-  @Override
-  public void tearDown() throws IOException {
-    // delete rootDir and its contents
-    java.nio.file.Files.walkFileTree(
-        rootDir.toPath(),
-        new SimpleFileVisitor<Path>() {
-          @Override
-          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-              throws IOException {
-            java.nio.file.Files.deleteIfExists(file);
-            return FileVisitResult.CONTINUE;
-          }
-
-          @Override
-          public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-            if (exc != null) {
-              return FileVisitResult.TERMINATE;
-            }
-            java.nio.file.Files.deleteIfExists(dir);
-            return FileVisitResult.CONTINUE;
-          }
-        });
+    rootDir = createTempDir();
   }
 
   public void testFileTraverser_emptyDirectory() throws Exception {

diff --git a/android/guava-tests/test/com/google/common/io/FilesTest.java b/android/guava-tests/test/com/google/common/io/FilesTest.java
@@ -47,9 +47,9 @@
  * @author Chris Nokleberg
  */
 
-@AndroidIncompatible // Android forbids much filesystem access. Maybe we could make it work?
 public class FilesTest extends IoTestCase {
 
+  @AndroidIncompatible // suites, ByteSourceTester (b/230620681)
   public static TestSuite suite() {
     TestSuite suite = new TestSuite();
     suite.addTest(

diff --git a/android/guava-tests/test/com/google/common/io/ResourcesTest.java b/android/guava-tests/test/com/google/common/io/ResourcesTest.java
@@ -133,7 +133,6 @@ public void testGetResource_relativePath() {
     assertNotNull(Resources.getResource(getClass(), "testdata/i18n.txt"));
   }
 
-  @AndroidIncompatible // Android prevents most access to files
   public void testGetResource_contextClassLoader() throws IOException {
     // Check that we can find a resource if it is visible to the context class
     // loader, even if it is not visible to the loader of the Resources class.

diff --git a/guava-tests/test/com/google/common/io/ByteStreamsTest.java b/guava-tests/test/com/google/common/io/ByteStreamsTest.java
@@ -51,7 +51,6 @@ public void testCopyChannel() throws IOException {
     assertThat(out.toByteArray()).isEqualTo(expected);
   }
 
-  @AndroidIncompatible // Android forbids much filesystem access. Maybe we could make it work?
 
   public void testCopyFileChannel() throws IOException {
     final int chunkSize = 14407; // Random prime, unlikely to match any internal chunk size
@@ -381,7 +380,7 @@ public void testNewDataOutput_writeChars() {
     assertThat(out.toByteArray()).isEqualTo(expected);
   }
 
-  @AndroidIncompatible // https://code.google.com/p/android/issues/detail?id=196848
+  @AndroidIncompatible // https://issuetracker.google.com/issues/37074504
   public void testUtf16Expected() {
     byte[] hardcodedExpected = utf16ExpectedWithBom;
     byte[] computedExpected = "r\u00C9sum\u00C9".getBytes(Charsets.UTF_16);

diff --git a/guava-tests/test/com/google/common/io/FileBackedOutputStreamTest.java b/guava-tests/test/com/google/common/io/FileBackedOutputStreamTest.java
@@ -28,7 +28,6 @@
  *
  * @author Chris Nokleberg
  */
-@AndroidIncompatible // Android forbids much filesystem access. Maybe we could make it work?
 public class FileBackedOutputStreamTest extends IoTestCase {
 
 
@@ -80,6 +79,7 @@ private void testThreshold(
   }
 
 
+  @AndroidIncompatible // Finalization probably just doesn't happen fast enough?
   public void testFinalizeDeletesFile() throws Exception {
     byte[] data = newPreFilledByteArray(100);
     FileBackedOutputStream out = new FileBackedOutputStream(0, true);

diff --git a/guava-tests/test/com/google/common/io/FilesFileTraverserTest.java b/guava-tests/test/com/google/common/io/FilesFileTraverserTest.java
@@ -22,50 +22,20 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import junit.framework.TestCase;
 
 /**
  * Tests for {@link Files#fileTraverser()}.
  *
  * @author Jens Nyman
  */
 
-@AndroidIncompatible // Android forbids much filesystem access. Maybe we could make it work?
-public class FilesFileTraverserTest extends TestCase {
+public class FilesFileTraverserTest extends IoTestCase {
 
   private File rootDir;
 
   @Override
   public void setUp() throws IOException {
-    rootDir = Files.createTempDir();
-  }
-
-  @Override
-  public void tearDown() throws IOException {
-    // delete rootDir and its contents
-    java.nio.file.Files.walkFileTree(
-        rootDir.toPath(),
-        new SimpleFileVisitor<Path>() {
-          @Override
-          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-              throws IOException {
-            java.nio.file.Files.deleteIfExists(file);
-            return FileVisitResult.CONTINUE;
-          }
-
-          @Override
-          public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-            if (exc != null) {
-              return FileVisitResult.TERMINATE;
-            }
-            java.nio.file.Files.deleteIfExists(dir);
-            return FileVisitResult.CONTINUE;
-          }
-        });
+    rootDir = createTempDir();
   }
 
   public void testFileTraverser_emptyDirectory() throws Exception {

diff --git a/guava-tests/test/com/google/common/io/FilesTest.java b/guava-tests/test/com/google/common/io/FilesTest.java
@@ -47,9 +47,9 @@
  * @author Chris Nokleberg
  */
 
-@AndroidIncompatible // Android forbids much filesystem access. Maybe we could make it work?
 public class FilesTest extends IoTestCase {
 
+  @AndroidIncompatible // suites, ByteSourceTester (b/230620681)
   public static TestSuite suite() {
     TestSuite suite = new TestSuite();
     suite.addTest(

diff --git a/guava-tests/test/com/google/common/io/ResourcesTest.java b/guava-tests/test/com/google/common/io/ResourcesTest.java
@@ -133,7 +133,6 @@ public void testGetResource_relativePath() {
     assertNotNull(Resources.getResource(getClass(), "testdata/i18n.txt"));
   }
 
-  @AndroidIncompatible // Android prevents most access to files
   public void testGetResource_contextClassLoader() throws IOException {
     // Check that we can find a resource if it is visible to the context class
     // loader, even if it is not visible to the loader of the Resources class.