Fix that:

1. adb shell am instrument -w -e class com.android.foo.FooTest#testFoo -e notClass com.android.foo.FooTest#testFoo com.android.foo/androidx.test.runner.AndroidJUnitRunner
2. adb shell am instrument -w -e class com.android.foo.FooTest -e notClass com.android.foo.FooTest com.android.foo/androidx.test.runner.AndroidJUnitRunner

should perform the same result (no tests run).

PiperOrigin-RevId: 599690321

Author: copybara-androidxtest

runner/android_junit_runner/CHANGELOG.md

@@ -8,6 +8,7 @@
 
 * Attempt to clarify limitations and deprecation reasons in RequiresDevice documentation
 * Remove all support for Android SDKs < 19. Minimum is API 19 (Android Kit Kat 4.4)
+* Fix that "-e class" and "-e notClass" on the same class/method should perform the same result (no tests run)
 
 **New Features**
 

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

@@ -811,7 +811,6 @@ public Request build() {
     Trace.beginSection("build test request");
     try {
       includedPackages.removeAll(excludedPackages);
-      includedClasses.removeAll(excludedClasses);
       validate(includedClasses);
 
       boolean scanningPath = includedClasses.isEmpty();
@@ -828,6 +827,15 @@ public Request build() {
         Log.d(TAG, "Using class path scanning to discover tests");
         classNames = getClassNamesFromClassPath();
       } else {
+        // If the set of excludedClasses is equal to the set of includedClasses, no tests should
+        // run (that's what includeMethods and excludeMethods do currently).
+        // E.g.,
+        // 1. adb shell am instrument -w -e class com.android.foo.FooTest#testFoo -e notClass
+        // com.android.foo.FooTest#testFoo com.android.foo/androidx.test.runner.AndroidJUnitRunner
+        // 2. adb shell am instrument -w -e class com.android.foo.FooTest -e notClass
+        // com.android.foo.FooTest com.android.foo/androidx.test.runner.AndroidJUnitRunner
+        // should perform the same result (no tests run).
+        includedClasses.removeAll(excludedClasses);
         classNames = includedClasses;
       }
 

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

@@ -66,9 +66,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
@@ -1056,15 +1054,18 @@ public void testParameterizedMethods() throws Exception {
     Assert.assertEquals(3, result.getRunCount());
   }
 
-  /** Verify adding and removing same class is rejected */
+  /** Verify adding a class method and removing same class leaves no tests. */
   @Test
   public void testFilterClassAddMethod() {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage(TestRequestBuilder.MISSING_ARGUMENTS_MSG);
-    builder
-        .addTestMethod(SampleRunnerFilterSizeTest.class.getName(), "testSmall")
-        .removeTestClass(SampleRunnerFilterSizeTest.class.getName())
-        .build();
+    Request request =
+        builder
+            .addTestMethod(SampleRunnerFilterSizeTest.class.getName(), "testSmall")
+            .removeTestClass(SampleRunnerFilterSizeTest.class.getName())
+            .build();
+
+    JUnitCore testRunner = new JUnitCore();
+    Result result = testRunner.run(request);
+    Assert.assertEquals(0, result.getRunCount());
   }
 
   /** Verify that including and excluding different methods leaves 1 method. */
@@ -1122,12 +1123,15 @@ public void testClassAndNotClass_different() {
   /** Verify that including and excluding the same class leaves no tests. */
   @Test
   public void testClassAndNotClass_same() {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage(TestRequestBuilder.MISSING_ARGUMENTS_MSG);
-    builder
-        .addTestClass(SampleRunnerFilterSizeTest.class.getName())
-        .removeTestClass(SampleRunnerFilterSizeTest.class.getName())
-        .build();
+    Request request =
+        builder
+            .addTestClass(SampleRunnerFilterSizeTest.class.getName())
+            .removeTestClass(SampleRunnerFilterSizeTest.class.getName())
+            .build();
+
+    JUnitCore testRunner = new JUnitCore();
+    Result result = testRunner.run(request);
+    Assert.assertEquals(0, result.getRunCount());
   }
 
   /** Verify that exclusion filter is filtering out a single test in a class and leaves the rest */
@@ -1275,8 +1279,6 @@ public void testNoApkPath() throws Exception {
         () -> builder.addTestPackage("androidx.test.internal.runner").build());
   }
 
-  @Rule public ExpectedException thrown = ExpectedException.none();
-
   /** Take intersection of test package and class */
   @Test
   public void testBothPackageAndClass() throws Exception {
@@ -1864,6 +1866,7 @@ private void setClassPathScanningResults(String... names) throws IOException {
   private static class RecordingRunListener extends RunListener {
     ArrayList<String> methods = new ArrayList<>();
 
+    @Override
     public void testFinished(Description description) {
       methods.add(description.getClassName() + "#" + description.getMethodName());
     }