CoreCompatChangeRule: Allow tests without change overrides.

A *Test.java file that uses @EnableCompatChanges or @DisableCompatChanges
annotations on just one test case runs this rule on every test case. The
rule was enforcing that all test cases must have such an annotation, but
most *Test.java will apply annotations to only some of their test cases.
Therefore, this CL drops the check for whether a test case carries at
least one such annotation.

Test: atest CtsLibcoreTestCases:libcore.junit.util.compat.CoreCompatChangeRuleTest

Change-Id: I62331a99855d348aa8cc9272628f680eac333b53

1 files changed, 3 insertions, 3 deletions

diff --git a/test-rules/src/platform_compat/java/libcore/junit/util/CoreCompatChangeRule.java b/test-rules/src/platform_compat/java/libcore/junit/util/CoreCompatChangeRule.java
index 59842c23060..b526707135a 100644
--- a/test-rules/src/platform_compat/java/libcore/junit/util/CoreCompatChangeRule.java
+++ b/test-rules/src/platform_compat/java/libcore/junit/util/CoreCompatChangeRule.java
@@ -79,10 +79,10 @@ public class CoreCompatChangeRule implements TestRule {
         }
         ChangeConfig config = new ChangeConfig(enabled, disabled);
         if (config.isEmpty()) {
-            throw new IllegalArgumentException("Added a CompatChangeRule without specifying any "
-                    + "@EnableCompatChanges or @DisableCompatChanges !");
+            return statement;
+        } else {
+            return createStatementForConfig(statement, config);
         }
-        return createStatementForConfig(statement, config);
     }
 
     protected Statement createStatementForConfig(final Statement statement, ChangeConfig config) {