Migrate calls to TestStorage.get*Uri methods to PlatformTestStorageRegistry.getInstance().get*Uri2.

This is the first of two changes to upstream the static TestStorage.get*Uri methods into the PlatformTestStorage interface instead.

PiperOrigin-RevId: 615481559

Author: brettchabot

espresso/core/javatests/androidx/test/espresso/action/EspressoActionsWithTestFlowTest.java

@@ -30,7 +30,6 @@
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.platform.io.PlatformTestStorageRegistry;
-import androidx.test.services.storage.TestStorage;
 import androidx.test.services.storage.internal.TestStorageUtil;
 import androidx.test.ui.app.LargeViewActivity;
 import androidx.test.ui.app.R;
@@ -88,7 +87,7 @@ public void clickActionTestingOfTestFlowOutput() throws IOException {
       assertThat(testFlowVisualizer.getLastActionIndexAndIncrement()).isEqualTo(2);
       InputStream outputGalleryFile =
           TestStorageUtil.getInputStream(
-              TestStorage.getOutputFileUri("output_gallery.html"),
+              PlatformTestStorageRegistry.getInstance().getOutputFileUri2("output_gallery.html"),
               InstrumentationRegistry.getInstrumentation().getTargetContext().getContentResolver());
       int size = outputGalleryFile.available();
       byte[] directFileContents = new byte[size];
@@ -130,7 +129,8 @@ public void testFlowVisualizerIfFeatureIsOffShowBreakage() {
           FileNotFoundException.class,
           () ->
               TestStorageUtil.getInputStream(
-                  TestStorage.getOutputFileUri("output_gallery.html"),
+                  PlatformTestStorageRegistry.getInstance()
+                      .getOutputFileUri2("output_gallery.html"),
                   InstrumentationRegistry.getInstrumentation()
                       .getTargetContext()
                       .getContentResolver()));

espresso/core/javatests/androidx/test/espresso/base/DefaultFailureHandlerTest.java

@@ -39,7 +39,7 @@
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.services.storage.TestStorage;
+import androidx.test.platform.io.PlatformTestStorageRegistry;
 import androidx.test.services.storage.internal.TestStorageUtil;
 import androidx.test.ui.app.MainActivity;
 import java.io.IOException;
@@ -116,7 +116,7 @@ public void screenshotSaved() throws IOException {
   }
 
   private Bitmap readBitmapFromTestStorage(String pathName) throws IOException {
-    Uri outputFileUri = TestStorage.getOutputFileUri(pathName);
+    Uri outputFileUri = PlatformTestStorageRegistry.getInstance().getOutputFileUri2(pathName);
     try (InputStream input =
         TestStorageUtil.getInputStream(
             outputFileUri, getApplicationContext().getContentResolver())) {

espresso/core/javatests/androidx/test/espresso/internal/data/TestFlowVisualizerTest.java

@@ -26,7 +26,6 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.platform.io.PlatformTestStorage;
 import androidx.test.platform.io.PlatformTestStorageRegistry;
-import androidx.test.services.storage.TestStorage;
 import androidx.test.services.storage.internal.TestStorageUtil;
 import java.io.IOException;
 import java.io.InputStream;
@@ -70,7 +69,7 @@ public void testFlowVisualizerEnsureCorrectOutputForSingleDummyAction() throws I
     testFlowVisualizer.visualize();
     InputStream outputGalleryFile =
         TestStorageUtil.getInputStream(
-            TestStorage.getOutputFileUri("output_gallery.html"),
+            PlatformTestStorageRegistry.getInstance().getOutputFileUri2("output_gallery.html"),
             InstrumentationRegistry.getInstrumentation().getTargetContext().getContentResolver());
     int size = outputGalleryFile.available();
     byte[] directFileContents = new byte[size];

services/storage/javatests/androidx/test/services/storage/TestStorageTest.java

@@ -120,7 +120,7 @@ public void readWriteOverwriteReadFile() throws IOException {
     }
 
     StringBuilder contents = new StringBuilder();
-    Uri outputFileUri = TestStorage.getOutputFileUri("path/to/file");
+    Uri outputFileUri = testStorage.getOutputFileUri2("path/to/file");
     try (InputStream input =
         TestStorageUtil.getInputStream(
             outputFileUri, getApplicationContext().getContentResolver())) {
@@ -145,7 +145,7 @@ public void writeFileInAppendMode() throws IOException {
     }
 
     byte[] data = new byte[11];
-    Uri outputFileUri = TestStorage.getOutputFileUri("path/to/file");
+    Uri outputFileUri = testStorage.getOutputFileUri2("path/to/file");
     try (InputStream input =
         TestStorageUtil.getInputStream(
             outputFileUri, getApplicationContext().getContentResolver())) {