diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/app_import_test.go | 6 | ||||
| -rw-r--r-- | java/java_test.go | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/java/app_import_test.go b/java/app_import_test.go index a29606f89..528fffe94 100644 --- a/java/app_import_test.go +++ b/java/app_import_test.go @@ -363,11 +363,14 @@ func TestAndroidAppImport_Filename(t *testing.T) { a := variant.Module().(*AndroidAppImport) expectedValues := []string{test.expected} - actualValues := android.AndroidMkEntriesForTest(t, ctx, a)[0].EntryMap["LOCAL_INSTALLED_MODULE_STEM"] + entries := android.AndroidMkEntriesForTest(t, ctx, a)[0] + actualValues := entries.EntryMap["LOCAL_INSTALLED_MODULE_STEM"] if !reflect.DeepEqual(actualValues, expectedValues) { t.Errorf("Incorrect LOCAL_INSTALLED_MODULE_STEM value '%s', expected '%s'", actualValues, expectedValues) } + android.AssertStringEquals(t, "unexpected LOCAL_SOONG_MODULE_TYPE", "android_app_import", entries.EntryMap["LOCAL_SOONG_MODULE_TYPE"][0]) + rule := variant.Rule("genProvenanceMetaData") android.AssertStringEquals(t, "Invalid input", test.expectedArtifactPath, rule.Inputs[0].String()) android.AssertStringEquals(t, "Invalid output", test.expectedMetaDataPath, rule.Output.String()) @@ -560,6 +563,7 @@ func TestAndroidAppImport_frameworkRes(t *testing.T) { } else if actualSoongResourceExportPackage[0] != expectedSoongResourceExportPackage { t.Errorf("LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE mismatch, actual: %s, expected: %s", actualSoongResourceExportPackage[0], expectedSoongResourceExportPackage) } + android.AssertStringEquals(t, "unexpected LOCAL_SOONG_MODULE_TYPE", "android_app_import", entries.EntryMap["LOCAL_SOONG_MODULE_TYPE"][0]) } func TestAndroidAppImport_relativeInstallPath(t *testing.T) { diff --git a/java/java_test.go b/java/java_test.go index 05cc23e29..68b749b6d 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -615,6 +615,13 @@ func TestPrebuilts(t *testing.T) { android.AssertPathRelativeToTopEquals(t, "baz dex jar build path", expectedDexJar, bazDexJar) ctx.ModuleForTests("qux", "android_common").Rule("Cp") + + entries := android.AndroidMkEntriesForTest(t, ctx, fooModule.Module())[0] + android.AssertStringEquals(t, "unexpected LOCAL_SOONG_MODULE_TYPE", "java_library", entries.EntryMap["LOCAL_SOONG_MODULE_TYPE"][0]) + entries = android.AndroidMkEntriesForTest(t, ctx, barModule.Module())[0] + android.AssertStringEquals(t, "unexpected LOCAL_SOONG_MODULE_TYPE", "java_import", entries.EntryMap["LOCAL_SOONG_MODULE_TYPE"][0]) + entries = android.AndroidMkEntriesForTest(t, ctx, ctx.ModuleForTests("sdklib", "android_common").Module())[0] + android.AssertStringEquals(t, "unexpected LOCAL_SOONG_MODULE_TYPE", "java_sdk_library_import", entries.EntryMap["LOCAL_SOONG_MODULE_TYPE"][0]) } func assertDeepEquals(t *testing.T, message string, expected interface{}, actual interface{}) { |