diff options
| author | Paul Duffin <paulduffin@google.com> | 2020-05-08 15:52:37 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2020-05-13 08:52:56 +0100 |
| commit | dd9d0740fa8b7e2cc9c8e73c07210d8168d600cc (patch) | |
| tree | 1f9179365106e8ef1bd1ae2408482728e19ec522 /java/java_test.go | |
| parent | 1b1e8069ec08a9f54cf0f8aa4ed95cab2781b3db (diff) | |
java_sdk_library: Remove some almost single use constants
The constants are only used in one place in the code and in the test.
This change switches the test code to use the apiScope methods to
generate the names and then inlines the constants in those methods. It
makes it easier to see the naming convention.
Test: m nothing
Bug: 155480189
Change-Id: I966e82b8ae67624da168e05f5a2b062b832cb8cd
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/java_test.go b/java/java_test.go index 0033f319d..5e43ce5c4 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -1177,12 +1177,12 @@ func TestJavaSdkLibrary(t *testing.T) { // check the existence of the internal modules ctx.ModuleForTests("foo", "android_common") - ctx.ModuleForTests("foo"+sdkStubsLibrarySuffix, "android_common") - ctx.ModuleForTests("foo"+sdkStubsLibrarySuffix+sdkSystemApiSuffix, "android_common") - ctx.ModuleForTests("foo"+sdkStubsLibrarySuffix+sdkTestApiSuffix, "android_common") - ctx.ModuleForTests("foo"+sdkStubsSourceSuffix, "android_common") - ctx.ModuleForTests("foo"+sdkStubsSourceSuffix+sdkSystemApiSuffix, "android_common") - ctx.ModuleForTests("foo"+sdkStubsSourceSuffix+sdkTestApiSuffix, "android_common") + ctx.ModuleForTests(apiScopePublic.stubsLibraryModuleName("foo"), "android_common") + ctx.ModuleForTests(apiScopeSystem.stubsLibraryModuleName("foo"), "android_common") + ctx.ModuleForTests(apiScopeTest.stubsLibraryModuleName("foo"), "android_common") + ctx.ModuleForTests(apiScopePublic.stubsSourceModuleName("foo"), "android_common") + ctx.ModuleForTests(apiScopeSystem.stubsSourceModuleName("foo"), "android_common") + ctx.ModuleForTests(apiScopeTest.stubsSourceModuleName("foo"), "android_common") ctx.ModuleForTests("foo"+sdkXmlFileSuffix, "android_common") ctx.ModuleForTests("foo.api.public.28", "") ctx.ModuleForTests("foo.api.system.28", "") |