diff options
| author |  cnsun <cnsun@google.com> | 2018-05-16 11:24:33 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-16 11:26:16 -0700 |
| commit | 14c8de626fbd5a63cf843b98c3bef055071d361c (patch) | |
| tree | 4c58527122905644c69d27e732fff8c8df2a30df /src/test/java/com/google/devtools | |
| parent | 6390584b919e995e73a7412a92354d07e2755e0f (diff) | |
Make ImportDepsCheckingLevel.ERROR essentially the same as STRICT_ERROR, checking direct dependencies.
RELNOTES: None.
PiperOrigin-RevId: 196860008
Diffstat (limited to 'src/test/java/com/google/devtools')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java index b427c7c988..8ee5e085c0 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java @@ -235,14 +235,10 @@ public class AarImportTest extends BuildViewTestCase { "--checking_mode=error", "--rule_label", "--jdeps_output"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/bar/classes_and_libs_merged.jar"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/baz/java/baz-ijar.jar"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/baz/classes_and_libs_merged.jar"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/foo/classes_and_libs_merged.jar"); ensureArgumentsHaveClassEntryOptionWithSuffix( arguments, "/intermediate/classes_and_libs_merged.jar"); assertThat(arguments.stream().filter(arg -> "--classpath_entry".equals(arg)).count()) - .isEqualTo(5); + .isEqualTo(1); } @Test @@ -278,14 +274,10 @@ public class AarImportTest extends BuildViewTestCase { "--checking_mode=error", "--rule_label", "--jdeps_output"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/bar/classes_and_libs_merged.jar"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/baz/java/baz-ijar.jar"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/baz/classes_and_libs_merged.jar"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/foo/classes_and_libs_merged.jar"); ensureArgumentsHaveClassEntryOptionWithSuffix( arguments, "/intermediate/classes_and_libs_merged.jar"); assertThat(arguments.stream().filter(arg -> "--classpath_entry".equals(arg)).count()) - .isEqualTo(5); + .isEqualTo(1); } @Test |