summaryrefslogtreecommitdiff
path: root/java/app_test.go
diff options
context:
space:
mode:
author Ulyana Trafimovich <skvadrik@google.com> 2021-03-02 13:47:03 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-03-02 13:47:03 +0000
commitae5cdfffa35ccf73d81057652029cdb42d3ac458 (patch)
tree1a33b83bf6405a061096bde3f03835f07882494c /java/app_test.go
parent71284b60ae1208cd2f413618edcaa74a4ceba13c (diff)
parenteea486a58033a4d444363ec07ccf35645abaad0c (diff)
Merge "Respect `provides_uses_lib` for modules added via `[optional_]uses_libs`"
Diffstat (limited to 'java/app_test.go')
-rw-r--r--java/app_test.go8
1 files changed, 3 insertions, 5 deletions
diff --git a/java/app_test.go b/java/app_test.go
index 89d77742d..c5a618c95 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -2357,10 +2357,9 @@ func TestUsesLibraries(t *testing.T) {
`--uses-library qux ` +
`--uses-library quuz ` +
`--uses-library foo ` + // TODO(b/132357300): "foo" should not be passed to manifest_fixer
- `--uses-library non-sdk-lib ` + // TODO(b/132357300): "non-sdk-lib" should not be passed to manifest_fixer
+ `--uses-library com.non.sdk.lib ` + // TODO(b/132357300): "com.non.sdk.lib" should not be passed to manifest_fixer
`--uses-library bar ` + // TODO(b/132357300): "bar" should not be passed to manifest_fixer
- `--uses-library runtime-library ` +
- `--uses-library com.non.sdk.lib` // TODO(b/132357300): "com.non.sdk.lib" should not be passed to manifest_fixer
+ `--uses-library runtime-library`
if actualManifestFixerArgs != expectManifestFixerArgs {
t.Errorf("unexpected manifest_fixer args:\n\texpect: %q\n\tactual: %q",
expectManifestFixerArgs, actualManifestFixerArgs)
@@ -2369,11 +2368,10 @@ func TestUsesLibraries(t *testing.T) {
// Test that all libraries are verified (library order matters).
verifyCmd := app.Rule("verify_uses_libraries").RuleParams.Command
verifyArgs := `--uses-library foo ` +
- `--uses-library non-sdk-lib ` + // TODO(b/132357300): "non-sdk-lib" should not be here
+ `--uses-library com.non.sdk.lib ` +
`--uses-library qux ` +
`--uses-library quuz ` +
`--uses-library runtime-library ` +
- `--uses-library com.non.sdk.lib ` +
`--optional-uses-library bar ` +
`--optional-uses-library baz `
if !strings.Contains(verifyCmd, verifyArgs) {