From 81faaaf65b2d08f94708aea2bbc743f7996fdc48 Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Wed, 20 May 2020 09:57:08 -0700 Subject: [PATCH] Add test to ensure test data written for flat apex Bug: 155820504 Test: apex_test Change-Id: Id0db24ad139962523532e16934bd95bed06073a8 --- apex/apex_test.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apex/apex_test.go b/apex/apex_test.go index 3c25b523c..9bd520fdc 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -3331,9 +3331,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) @@ -3345,6 +3345,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) {