Initial change to upstream TestStorage get*Uri methods to PlatformTestStorage.

This change is part of series of changes to promote PlatformTestStorage as
the canonical API for managing storage. TestStorage, from an API POV, will
become an implementation detail.

Unfortunately the get*Uri methods are static, so this change requires changing the
methods from static to non-static.

PiperOrigin-RevId: 604438295

Author: brettchabot

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

@@ -16,6 +16,7 @@
 package androidx.test.core.graphics
 
 import android.graphics.Bitmap
+import android.net.Uri
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.io.PlatformTestStorage
 import java.io.IOException
@@ -80,6 +81,14 @@ class BitmapStorageTest {
       TODO("Not yet implemented")
     }
 
+    override fun getInputFileUri2(pathname: String): Uri {
+      TODO("Not yet implemented")
+    }
+
+    override fun getOutputFileUri2(pathname: String): Uri {
+      TODO("Not yet implemented")
+    }
+
     override fun isTestStorageFilePath(pathname: String): Boolean {
       TODO("Not yet implemented")
     }

espresso/core/javatests/androidx/test/espresso/internal/data/BUILD

@@ -14,6 +14,7 @@ axt_android_library_test(
         "TestFlowVisualizerTest.java",
     ],
     deps = [
+        "//core/java/androidx/test/core",
         "//espresso/core/java/androidx/test/espresso",
         "//espresso/core/java/androidx/test/espresso/internal/data",
         "//espresso/core/java/androidx/test/espresso/internal/data/model",

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

@@ -27,6 +27,7 @@
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
 
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -756,6 +757,16 @@ public OutputStream openInternalOutputFile(String pathname) throws IOException {
       throw new UnsupportedOperationException();
     }
 
+    @Override
+    public Uri getInputFileUri2(String pathname) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Uri getOutputFileUri2(String pathname) {
+      throw new UnsupportedOperationException();
+    }
+
     @Override
     public boolean isTestStorageFilePath(String pathname) {
       return false;

runner/monitor/CHANGELOG.md

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

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

@@ -15,6 +15,7 @@
  */
 package androidx.test.platform.io;
 
+import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import androidx.annotation.NonNull;
@@ -142,6 +143,20 @@ public OutputStream openInternalOutputFile(String pathname) throws IOException {
     return openOutputFile(pathname);
   }
 
+  @Override
+  public Uri getInputFileUri2(@NonNull String pathname) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Uri getOutputFileUri2(@NonNull String pathname) {
+    File outputFile = new File(pathname);
+    if (!outputFile.isAbsolute()) {
+      outputFile = new File(outputDirCalculator.getOutputDir(), pathname);
+    }
+    return Uri.fromFile(outputFile);
+  }
+
   @Override
   public boolean isTestStorageFilePath(@NonNull String pathname) {
     String outputDir = outputDirCalculator.getOutputDir().getAbsolutePath();

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

@@ -15,6 +15,7 @@
  */
 package androidx.test.platform.io;
 
+import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.test.annotation.ExperimentalTestApi;
 import java.io.IOException;
@@ -106,6 +107,42 @@ public interface PlatformTestStorage {
    */
   OutputStream openInternalOutputFile(String pathname) throws IOException;
 
+  /**
+   * Provides a Uri to a test file dependency.
+   *
+   * <p>In most of the cases, you would use {@link #openInputFile(String)} for opening up an
+   * InputStream to the input file content immediately. Only use this method if you would like to
+   * store the file Uri and use it for I/O operations later.
+   *
+   * <p><b>Note:</b> temporary API - will be renamed to getInpFileUri in future
+   *
+   * @param pathname path to the test file dependency. Should not be null. This is a relative path
+   *     to where the storage service stores the input files. For example, if the storage service
+   *     stores the input files under "/sdcard/test_input_files", with a pathname
+   *     "/path/to/my_input.txt", the file will end up at
+   *     "/sdcard/test_input_files/path/to/my_input.txt" on device.
+   * @return a content Uri to the test file dependency.
+   *     <p>Note: temporary API - will be renamed to getInputFileUri in future
+   */
+  Uri getInputFileUri2(@NonNull String pathname);
+
+  /**
+   * Provides a Uri to a test output file.
+   *
+   * <p>In most of the cases, you would use {@link #openOutputFile(String)} for opening up an
+   * OutputStream to the output file content immediately. Only use this method if you would like to
+   * store the file Uri and use it for I/O operations later.
+   *
+   * <p><b>Note:</b> temporary API - will be renamed to getOutputFileUri in future
+   *
+   * @param pathname path to the test output file. Should not be null. This is a relative path to
+   *     where the storage service stores the output files. For example, if the storage service
+   *     stores the output files under "/sdcard/test_output_files", with a pathname
+   *     "/path/to/my_output.txt", the file will end up at
+   *     "/sdcard/test_output_files/path/to/my_output.txt" on device.
+   */
+  Uri getOutputFileUri2(@NonNull String pathname);
+
   /**
    * Returns true if {@code pathname} corresponds to a file or directory that is in a directory
    * where the storage stores files.

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

@@ -17,6 +17,7 @@
 
 import static androidx.test.internal.util.Checks.checkNotNull;
 
+import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.test.annotation.ExperimentalTestApi;
 import androidx.test.internal.platform.ServiceLoaderWrapper;
@@ -117,6 +118,16 @@ public OutputStream openInternalOutputFile(String pathname) throws IOException {
       return new NullOutputStream();
     }
 
+    @Override
+    public Uri getInputFileUri2(@NonNull String pathname) {
+      return null;
+    }
+
+    @Override
+    public Uri getOutputFileUri2(@NonNull String pathname) {
+      return null;
+    }
+
     @Override
     public boolean isTestStorageFilePath(@NonNull String pathname) {
       return false;

services/CHANGELOG.md

@@ -13,6 +13,7 @@
 **API Changes**
 
 * Upstream TestStorage.isTestStoragePath to PlatformTestStorage
+* Upstream TestStorage.getInputFileUri and getOutputFileUri  to PlatformTestStorage
 
 **Breaking API Changes**
 

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

@@ -76,6 +76,15 @@ public TestStorage(@NonNull ContentResolver contentResolver) {
     this.contentResolver = contentResolver;
   }
 
+  /**
+   * @deprecated call getInputFileUri2 instead
+   */
+  @Deprecated
+  public static Uri getInputFileUri(@NonNull String pathname) {
+    checkNotNull(pathname);
+    return HostedFile.buildUri(HostedFile.FileHost.TEST_FILE, pathname);
+  }
+
   /**
    * Provides a Uri to a test file dependency.
    *
@@ -90,7 +99,8 @@ public TestStorage(@NonNull ContentResolver contentResolver) {
    *     "/sdcard/test_input_files/path/to/my_input.txt" on device.
    * @return a content Uri to the test file dependency.
    */
-  public static Uri getInputFileUri(@NonNull String pathname) {
+  @Override
+  public Uri getInputFileUri2(@NonNull String pathname) {
     checkNotNull(pathname);
     return HostedFile.buildUri(HostedFile.FileHost.TEST_FILE, pathname);
   }
@@ -108,6 +118,16 @@ public static Uri getInputFileUri(@NonNull String pathname) {
    *     "/path/to/my_output.txt", the file will end up at
    *     "/sdcard/test_output_files/path/to/my_output.txt" on device.
    */
+  @Override
+  public Uri getOutputFileUri2(@NonNull String pathname) {
+    checkNotNull(pathname);
+    return HostedFile.buildUri(HostedFile.FileHost.OUTPUT, pathname);
+  }
+
+  /**
+   * @deprecated call getOutputFileUri2 instead
+   */
+  @Deprecated
   public static Uri getOutputFileUri(@NonNull String pathname) {
     checkNotNull(pathname);
     return HostedFile.buildUri(HostedFile.FileHost.OUTPUT, pathname);