Internal Code Change

PiperOrigin-RevId: 593418066
android · Dec 26, 2023 · f2f0dcd · f2f0dcd
1 parent 4585f84
commit f2f0dcd
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/runner/BUILD
@@ -1,14 +1,14 @@
 # Description: Tests for Runner
 
-load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
 load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
 load("//build_extensions:axt_android_application_test.bzl", "axt_android_application_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
 load(
     "//build_extensions:phone_devices.bzl",
     "apis",
     "devices",
 )
-load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
 
 package(
     default_applicable_licenses = ["//:license"],
@@ -281,7 +281,6 @@ axt_android_local_test(
     deps = [
         "//runner/android_junit_runner",
         "@maven//:com_google_truth_truth",
-        "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
     ],
 )
 

diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/SdkSuppressTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/SdkSuppressTest.java
@@ -21,13 +21,14 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.internal.runner.TestRequestBuilder.DeviceBuild;
+import java.util.ArrayList;
 import java.util.List;
-import kotlin.collections.CollectionsKt;
 import org.junit.Test;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
 import org.junit.runner.Result;
 import org.junit.runner.RunWith;
+import org.junit.runner.notification.Failure;
 
 @RunWith(AndroidJUnit4.class)
 public class SdkSuppressTest {
@@ -187,9 +188,10 @@ public void testSdkSuppress() throws Exception {
     Request request = builder.addTestClass(SampleSdkSuppress.class.getName()).build();
     Result result = new JUnitCore().run(request);
 
-    List<String> failingMethods =
-        CollectionsKt.map(
-            result.getFailures(), failure -> failure.getDescription().getMethodName());
+    List<String> failingMethods = new ArrayList<>();
+    for (Failure failure : result.getFailures()) {
+      failingMethods.add(failure.getDescription().getMethodName());
+    }
 
     assertThat(failingMethods)
         .containsExactly(
@@ -209,9 +211,10 @@ public void testSdkSuppress_codeName() throws Exception {
     Request request = builder.addTestClass(SampleSdkSuppress.class.getName()).build();
     Result result = new JUnitCore().run(request);
 
-    List<String> failingMethods =
-        CollectionsKt.map(
-            result.getFailures(), failure -> failure.getDescription().getMethodName());
+    List<String> failingMethods = new ArrayList<>();
+    for (Failure failure : result.getFailures()) {
+      failingMethods.add(failure.getDescription().getMethodName());
+    }
 
     assertThat(failingMethods)
         .containsExactly(
@@ -241,9 +244,10 @@ public void testSdkSuppress_classAllNotFiltered() throws Exception {
     Request request = builder.addTestClass(SampleSdkSuppressOnClass.class.getName()).build();
     Result result = new JUnitCore().run(request);
 
-    List<String> failingMethods =
-        CollectionsKt.map(
-            result.getFailures(), failure -> failure.getDescription().getMethodName());
+    List<String> failingMethods = new ArrayList<>();
+    for (Failure failure : result.getFailures()) {
+      failingMethods.add(failure.getDescription().getMethodName());
+    }
 
     assertThat(failingMethods).containsExactly("noSdkSuppress");
   }
@@ -265,9 +269,10 @@ public void testSdkSuppress_classAndMethodMaxMin() throws Exception {
         builder.addTestClass(SampleSdkSuppressOnClassAndMethodMaxMin.class.getName()).build();
     Result result = new JUnitCore().run(request);
 
-    List<String> failingMethods =
-        CollectionsKt.map(
-            result.getFailures(), failure -> failure.getDescription().getMethodName());
+    List<String> failingMethods = new ArrayList<>();
+    for (Failure failure : result.getFailures()) {
+      failingMethods.add(failure.getDescription().getMethodName());
+    }
 
     assertThat(failingMethods).containsExactly("maxSdk18");
   }

diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/BUILD b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/BUILD
@@ -1,6 +1,6 @@
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
-load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
 load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 package(default_applicable_licenses = ["//services:license"])
 
@@ -42,7 +42,6 @@ axt_android_library_test(
         "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
-        "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
     ],
 )
 

diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandTest.java b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandTest.java
@@ -25,10 +25,10 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import kotlin.collections.CollectionsKt;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -80,7 +80,7 @@ public void testExecuteShellCommand_setEnvVar() throws Exception {
 
   @Test
   public void testExecuteShellCommand_setParams() throws Exception {
-    List<String> params = CollectionsKt.listOf("-c", "2", "localhost");
+    List<String> params = Arrays.asList("-c", "2", "localhost");
     String results = execShellCommand("ping", params, null, false);
     assertThat(results, containsString("127.0.0.1"));
   }