Upstream TestStorage.isTestStoragePath to PlatformTestStorage

The TestStorage.isTestStoragePath will only work in environments where
the TestStorage service is active. Upstream it so it can be handled in all
possible storage situations.

PiperOrigin-RevId: 603726706

Author: brettchabot

core/javatests/androidx/test/core/graphics/BitmapStorageTest.kt

@@ -79,5 +79,9 @@ class BitmapStorageTest {
     override fun openInternalOutputFile(pathname: String?): OutputStream {
       TODO("Not yet implemented")
     }
+
+    override fun isTestStorageFilePath(pathname: String): Boolean {
+      TODO("Not yet implemented")
+    }
   }
 }

ext/junit/CHANGELOG.md

@@ -6,6 +6,8 @@
 
 **Bug Fixes**
 
+* Use PlatformTestStorage instead of TestStorage in DeleteFilesRule 
+
 **New Features**
 
 **Breaking Changes**

ext/junit/java/androidx/test/ext/junit/rules/DeleteFilesRule.java

@@ -19,7 +19,7 @@
 import android.os.Build;
 import android.os.Environment;
 import androidx.test.core.app.ApplicationProvider;
-import androidx.test.services.storage.TestStorage;
+import androidx.test.platform.io.PlatformTestStorageRegistry;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -107,7 +107,7 @@ private static void deleteFilesRecursively(Set<File> existingFiles, File directo
     if (files != null) {
       for (File file : files) {
         if (file.isDirectory()) {
-          if (TestStorage.isTestStorageFilePath(file.getPath())) {
+          if (PlatformTestStorageRegistry.getInstance().isTestStorageFilePath(file.getPath())) {
             continue;
           }
           deleteFilesRecursively(existingFiles, file);

runner/android_junit_runner/javatests/androidx/test/internal/runner/RunnerArgsTest.java

@@ -755,5 +755,10 @@ public InputStream openInternalInputFile(String pathname) throws IOException {
     public OutputStream openInternalOutputFile(String pathname) throws IOException {
       throw new UnsupportedOperationException();
     }
+
+    @Override
+    public boolean isTestStorageFilePath(String pathname) {
+      return false;
+    }
   }
 }

runner/monitor/CHANGELOG.md

@@ -12,6 +12,7 @@
 
 **API Changes**
 * Make DeviceController an public API from ExperimentalTestApi
+* Upstream TestStorage.isTestStoragePath to PlatformTestStorage
 
 **Breaking API Changes**
 

runner/monitor/java/androidx/test/platform/io/FileTestStorage.java

@@ -17,6 +17,7 @@
 
 import android.os.Bundle;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import androidx.test.annotation.ExperimentalTestApi;
 import androidx.test.platform.app.InstrumentationRegistry;
 import java.io.File;
@@ -140,4 +141,10 @@ public InputStream openInternalInputFile(String pathname) throws IOException {
   public OutputStream openInternalOutputFile(String pathname) throws IOException {
     return openOutputFile(pathname);
   }
+
+  @Override
+  public boolean isTestStorageFilePath(@NonNull String pathname) {
+    String outputDir = outputDirCalculator.getOutputDir().getAbsolutePath();
+    return pathname.startsWith(outputDir);
+  }
 }

runner/monitor/java/androidx/test/platform/io/PlatformTestStorage.java

@@ -15,6 +15,7 @@
  */
 package androidx.test.platform.io;
 
+import androidx.annotation.NonNull;
 import androidx.test.annotation.ExperimentalTestApi;
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,6 +37,7 @@
  */
 @ExperimentalTestApi
 public interface PlatformTestStorage {
+
   /**
    * Provides an InputStream to a test file dependency.
    *
@@ -103,4 +105,13 @@ public interface PlatformTestStorage {
    * @return an OutputStream to the given output file.
    */
   OutputStream openInternalOutputFile(String pathname) throws IOException;
+
+  /**
+   * Returns true if {@code pathname} corresponds to a file or directory that is in a directory
+   * where the storage stores files.
+   *
+   * @param pathname path to a file or directory. Should not be null. This is an absolute path to a
+   *     file that may be a part of the storage service.
+   */
+  boolean isTestStorageFilePath(@NonNull String pathname);
 }

runner/monitor/java/androidx/test/platform/io/PlatformTestStorageRegistry.java

@@ -17,6 +17,7 @@
 
 import static androidx.test.internal.util.Checks.checkNotNull;
 
+import androidx.annotation.NonNull;
 import androidx.test.annotation.ExperimentalTestApi;
 import androidx.test.internal.platform.ServiceLoaderWrapper;
 import java.io.IOException;
@@ -116,6 +117,11 @@ public OutputStream openInternalOutputFile(String pathname) throws IOException {
       return new NullOutputStream();
     }
 
+    @Override
+    public boolean isTestStorageFilePath(@NonNull String pathname) {
+      return false;
+    }
+
     static class NullInputStream extends InputStream {
       @Override
       public int read() {

services/CHANGELOG.md

@@ -12,6 +12,8 @@
 
 **API Changes**
 
+* Upstream TestStorage.isTestStoragePath to PlatformTestStorage
+
 **Breaking API Changes**
 
 **Known Issues**

services/storage/java/androidx/test/services/storage/TestStorage.java

@@ -120,7 +120,8 @@ public static Uri getOutputFileUri(@NonNull String pathname) {
    * @param pathname path to a file or directory. Should not be null. This is an absolute path to a
    *     file that may be a part of the storage service.
    */
-  public static boolean isTestStorageFilePath(@NonNull String pathname) {
+  @Override
+  public boolean isTestStorageFilePath(@NonNull String pathname) {
     File onDevicePathRoot =
         new File(HostedFile.getRootDirectory(), TestStorageConstants.ON_DEVICE_PATH_ROOT);
     // Append a trailing slash because ON_DEVICE_PATH_ROOT has a trailing slash. If pathname already