Make TestsRegExFilter available for internal usage.

runner/android_junit_runner/java/androidx/test/BUILD

@@ -1,6 +1,7 @@
 # Description: Build rules for building androidx.test from source
 
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("@rules_java//java:defs.bzl", "java_library")
 load("//build_extensions:api_checks.bzl", "api_checks")
 load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
@@ -27,7 +28,8 @@ licenses(["notice"])
 android_library(
     name = "runner",
     srcs = glob(
-        ["**/*.java"],
+        include = ["**/*.java"],
+        exclude = ["filters/*.java"],
     ),
     custom_package = "androidx.test.runner",
     idl_srcs = glob(["**/*.aidl"]),
@@ -36,9 +38,11 @@ android_library(
         "proguard_library.cfg",
     ],
     exports = [
+        ":filters",
         "//runner/monitor",
     ],
     deps = [
+        ":filters",
         "//opensource/androidx:annotation",
         "//runner/monitor",
         "//services/events/java/androidx/test/services/events",
@@ -49,6 +53,18 @@ android_library(
     ],
 )
 
+java_library(
+    name = "filters",
+    srcs = glob(["filters/*.java"]),
+    visibility = [
+        "//visibility:public",
+    ],
+    deps = [
+        "//opensource/androidx:annotation",
+        "@maven//:junit_junit",
+    ],
+)
+
 # Generate rules for the release artifacts.
 axt_android_aar(
     name = "runner_aar",

runner/android_junit_runner/java/androidx/test/internal/runner/filters/TestsRegExFilter.java → runner/android_junit_runner/java/androidx/test/filters/TestsRegExFilter.java

@@ -13,13 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.test.internal.runner.filters;
+package androidx.test.filters;
 
-import androidx.test.filters.AbstractFilter;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import java.util.regex.Pattern;
 import org.junit.runner.Description;
 
-/** A JUnit filter for filtering tests whose name match one of the given regular expression */
+/**
+ * A JUnit filter for filtering tests whose name match one of the given regular expression.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
 public final class TestsRegExFilter extends AbstractFilter {
 
   private Pattern pattern = null;

runner/android_junit_runner/java/androidx/test/internal/runner/TestRequestBuilder.java

@@ -24,12 +24,12 @@
 import androidx.test.filters.CustomFilter;
 import androidx.test.filters.RequiresDevice;
 import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.TestsRegExFilter;
 import androidx.test.internal.runner.ClassPathScanner.ChainedClassNameFilter;
 import androidx.test.internal.runner.ClassPathScanner.ExcludeClassNamesFilter;
 import androidx.test.internal.runner.ClassPathScanner.ExcludePackageNameFilter;
 import androidx.test.internal.runner.ClassPathScanner.ExternalClassNameFilter;
 import androidx.test.internal.runner.ClassPathScanner.InclusivePackageNamesFilter;
-import androidx.test.internal.runner.filters.TestsRegExFilter;
 import androidx.test.internal.util.Checks;
 import androidx.tracing.Trace;
 import java.io.IOException;

runner/android_junit_runner/javatests/androidx/test/internal/runner/filters/BUILD → runner/android_junit_runner/javatests/androidx/test/filters/BUILD

@@ -1,8 +1,8 @@
 # Description: Tests for Runner
 
 load(
-    "//build_extensions:android_library_test.bzl",
-    "axt_android_library_test",
+    "//build_extensions:axt_android_local_test.bzl",
+    "axt_android_local_test",
 )
 
 package(
@@ -12,17 +12,16 @@ package(
 
 licenses(["notice"])
 
-axt_android_library_test(
+axt_android_local_test(
     name = "TestsRegExFilterTest",
     srcs = [
         "TestsRegExFilterTest.java",
     ],
     deps = [
         "//core",
         "//ext/junit",
-        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/java/androidx/test:filters",
         "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
         "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
     ],
 )

runner/android_junit_runner/javatests/androidx/test/internal/runner/filters/TestsRegExFilterTest.java → runner/android_junit_runner/javatests/androidx/test/filters/TestsRegExFilterTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.test.internal.runner.filters;
+package androidx.test.filters;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -30,15 +30,15 @@ public static class TestFixture {}
 
   @Test
   public void emptyPasses() {
-    TestsRegExFilter filter = new TestsRegExFilter();
+    androidx.test.filters.TestsRegExFilter filter = new androidx.test.filters.TestsRegExFilter();
     Description d = Description.createTestDescription(TestFixture.class, "any");
     ;
     assertThat(filter.evaluateTest(d)).isTrue();
   }
 
   @Test
   public void partialClassName() {
-    TestsRegExFilter filter = new TestsRegExFilter();
+    androidx.test.filters.TestsRegExFilter filter = new androidx.test.filters.TestsRegExFilter();
     filter.setPattern("TestFixture");
     Description d = Description.createTestDescription(TestFixture.class, "any");
 
@@ -47,7 +47,7 @@ public void partialClassName() {
 
   @Test
   public void partialClassName_noMatch() {
-    TestsRegExFilter filter = new TestsRegExFilter();
+    androidx.test.filters.TestsRegExFilter filter = new androidx.test.filters.TestsRegExFilter();
     filter.setPattern("NotTheClassImLookingFor");
     Description d = Description.createTestDescription(TestFixture.class, "any");
 
@@ -56,25 +56,25 @@ public void partialClassName_noMatch() {
 
   @Test
   public void packageMatch() {
-    TestsRegExFilter filter = new TestsRegExFilter();
-    filter.setPattern("androidx.test.internal.runner.filters");
+    androidx.test.filters.TestsRegExFilter filter = new androidx.test.filters.TestsRegExFilter();
+    filter.setPattern("androidx.test.filters");
     Description d = Description.createTestDescription(TestFixture.class, "any");
 
     assertThat(filter.evaluateTest(d)).isTrue();
   }
 
   @Test
   public void package_noMatch() {
-    TestsRegExFilter filter = new TestsRegExFilter();
-    filter.setPattern("androidx.test.internal.runner.filters.notit");
+    androidx.test.filters.TestsRegExFilter filter = new androidx.test.filters.TestsRegExFilter();
+    filter.setPattern("androidx.test.filters.notit");
     Description d = Description.createTestDescription(TestFixture.class, "any");
 
     assertThat(filter.evaluateTest(d)).isFalse();
   }
 
   @Test
   public void methodMatch() {
-    TestsRegExFilter filter = new TestsRegExFilter();
+    androidx.test.filters.TestsRegExFilter filter = new androidx.test.filters.TestsRegExFilter();
     filter.setPattern("TestFixture#any");
     Description d = Description.createTestDescription(TestFixture.class, "any");
 
@@ -87,7 +87,7 @@ public void methodMatch() {
 
   @Test
   public void methodOrMatch() {
-    TestsRegExFilter filter = new TestsRegExFilter();
+    androidx.test.filters.TestsRegExFilter filter = new TestsRegExFilter();
     filter.setPattern("TestFixture#any|TestFixture#excluded");
     Description d = Description.createTestDescription(TestFixture.class, "any");