diff options
| author | 2020-05-27 16:24:08 +0000 | |
|---|---|---|
| committer | 2020-05-27 16:24:08 +0000 | |
| commit | 5903b669adfee73a35aa63b2f99168c04ffb2d80 (patch) | |
| tree | 641448ec26ab3d5e237bd80212533f20fc9aed2c /apex/apex_test.go | |
| parent | fd0d56af248efd65d4579e21ca009ec2e1171db7 (diff) | |
| parent | 81faaaf65b2d08f94708aea2bbc743f7996fdc48 (diff) | |
Merge "Add test to ensure test data written for flat apex"
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 5d08f37ab..9633f2713 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -3456,9 +3456,9 @@ func TestApexWithTests(t *testing.T) { ensureContains(t, copyCmds, "image.apex/bin/test/mytest3") // Ensure the module is correctly translated. - apexBundle := ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().(*apexBundle) - data := android.AndroidMkDataForTest(t, config, "", apexBundle) - name := apexBundle.BaseModuleName() + bundle := ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().(*apexBundle) + data := android.AndroidMkDataForTest(t, config, "", bundle) + name := bundle.BaseModuleName() prefix := "TARGET_" var builder strings.Builder data.Custom(&builder, name, prefix, "", data) @@ -3470,6 +3470,12 @@ func TestApexWithTests(t *testing.T) { ensureContains(t, androidMk, "LOCAL_MODULE := apex_manifest.pb.myapex\n") ensureContains(t, androidMk, "LOCAL_MODULE := apex_pubkey.myapex\n") ensureContains(t, androidMk, "LOCAL_MODULE := myapex\n") + + flatBundle := ctx.ModuleForTests("myapex", "android_common_myapex_flattened").Module().(*apexBundle) + data = android.AndroidMkDataForTest(t, config, "", flatBundle) + data.Custom(&builder, name, prefix, "", data) + flatAndroidMk := builder.String() + ensureContains(t, flatAndroidMk, "LOCAL_TEST_DATA := :baz :bar/baz\n") } func TestInstallExtraFlattenedApexes(t *testing.T) { |