Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52bfaa43 authored by Paul Duffin's avatar Paul Duffin
Browse files

Prune test preparers in apex/boot_image_test.go 

Cut down the preparers to only those needed by these tests.

Bug: 177892522
Test: m nothing
Change-Id: I811977b0331dd38c25623aa96e09e85ba5cf7c57
parent 396229f7

apex/apex_test.go

+10 −6
Original line number Diff line number Diff line
@@ -140,13 +140,13 @@ var apexFixtureFactory = android.NewFixtureFactory( 
			],

		}

	`),

	prepareForTestWithMyapex,

	android.FixtureMergeMockFs(android.MockFS{

		"a.java":                 nil,

		"PrebuiltAppFoo.apk":     nil,

		"PrebuiltAppFooPriv.apk": nil,

		"apex_manifest.json":     nil,

		"AndroidManifest.xml":    nil,

		"system/sepolicy/apex/myapex-file_contexts": nil,

		"system/sepolicy/apex/myapex.updatable-file_contexts":         nil,

		"system/sepolicy/apex/myapex2-file_contexts":                  nil,

		"system/sepolicy/apex/otherapex-file_contexts":                nil,
@@ -204,6 +204,10 @@ var apexFixtureFactory = android.NewFixtureFactory( 
	}),

)



var prepareForTestWithMyapex = android.FixtureMergeMockFs(android.MockFS{

	"system/sepolicy/apex/myapex-file_contexts": nil,

})



func setUp() {

	var err error

	buildDir, err = ioutil.TempDir("", "soong_apex_test")

apex/boot_image_test.go

+21 −10
Original line number Diff line number Diff line
@@ -26,23 +26,32 @@ import ( 
// Contains tests for boot_image logic from java/boot_image.go as the ART boot image requires

// modules from the ART apex.



func TestBootImages(t *testing.T) {

	result := apexFixtureFactory.Extend(

		// Configure some libraries in the art and framework boot images.

		dexpreopt.FixtureSetArtBootJars("com.android.art:baz", "com.android.art:quuz"),

		dexpreopt.FixtureSetBootJars("platform:foo", "platform:bar"),

		filesForSdkLibrary.AddToFixture(),

var prepareForTestWithBootImage = android.GroupFixturePreparers(

	java.PrepareForTestWithDexpreopt,

	PrepareForTestWithApexBuildComponents,

)



// Some additional files needed for the art apex.

		android.FixtureMergeMockFs(android.MockFS{

var prepareForTestWithArtApex = android.FixtureMergeMockFs(android.MockFS{

	"com.android.art.avbpubkey":                          nil,

	"com.android.art.pem":                                nil,

	"system/sepolicy/apex/com.android.art-file_contexts": nil,

		}),

})



func TestBootImages(t *testing.T) {

	result := android.GroupFixturePreparers(

		prepareForTestWithBootImage,

		// Configure some libraries in the art and framework boot images.

		dexpreopt.FixtureSetArtBootJars("com.android.art:baz", "com.android.art:quuz"),

		dexpreopt.FixtureSetBootJars("platform:foo", "platform:bar"),

		prepareForTestWithArtApex,



		java.PrepareForTestWithJavaSdkLibraryFiles,

		java.FixtureWithLastReleaseApis("foo"),

	).RunTestWithBp(t, `

		java_sdk_library {

			name: "foo",

			srcs: ["b.java"],

			unsafe_ignore_missing_latest_api: true,

		}



		java_library {
@@ -152,7 +161,9 @@ func checkBootImage(t *testing.T, result *android.TestResult, moduleName string, 
}



func TestBootImageInApex(t *testing.T) {

	result := apexFixtureFactory.Extend(

	result := android.GroupFixturePreparers(

		prepareForTestWithBootImage,

		prepareForTestWithMyapex,

		// Configure some libraries in the framework boot image.

		dexpreopt.FixtureSetBootJars("platform:foo", "platform:bar"),

	).RunTestWithBp(t, `