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

Commit a1063c09 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge changes I94f66e3e,I233a4fe1,Idbb37485 

* changes:
  Group all the preparations needed for testing dexpreopt
  Separate methods used for fixture based and legacy tests
  Use more inclusive language in dexpreopt/testing.go
parents 70204f9f 9fc9f534

dexpreopt/testing.go

+48 −9
Original line number Diff line number Diff line
@@ -15,39 +15,78 @@ 
package dexpreopt



import (

	"fmt"



	"android/soong/android"

)



type dummyToolBinary struct {

type fakeToolBinary struct {

	android.ModuleBase

}



func (m *dummyToolBinary) GenerateAndroidBuildActions(ctx android.ModuleContext) {}

func (m *fakeToolBinary) GenerateAndroidBuildActions(ctx android.ModuleContext) {}



func (m *dummyToolBinary) HostToolPath() android.OptionalPath {

func (m *fakeToolBinary) HostToolPath() android.OptionalPath {

	return android.OptionalPathForPath(android.PathForTesting("dex2oat"))

}



func dummyToolBinaryFactory() android.Module {

	module := &dummyToolBinary{}

func fakeToolBinaryFactory() android.Module {

	module := &fakeToolBinary{}

	android.InitAndroidArchModule(module, android.HostSupported, android.MultilibFirst)

	return module

}



func RegisterToolModulesForTest(ctx android.RegistrationContext) {

	ctx.RegisterModuleType("dummy_tool_binary", dummyToolBinaryFactory)

	ctx.RegisterModuleType("fake_tool_binary", fakeToolBinaryFactory)

}



func BpToolModulesForTest() string {

	return `

		dummy_tool_binary {

		fake_tool_binary {

			name: "dex2oatd",

		}

	`

}



// Prepares a test fixture by enabling dexpreopt.

var PrepareForTestWithDexpreopt = FixtureModifyGlobalConfig(func(*GlobalConfig) {})

func CompatLibDefinitionsForTest() string {

	bp := ""



	// For class loader context and <uses-library> tests.

	dexpreoptModules := []string{"android.test.runner"}

	dexpreoptModules = append(dexpreoptModules, CompatUsesLibs...)

	dexpreoptModules = append(dexpreoptModules, OptionalCompatUsesLibs...)



	for _, extra := range dexpreoptModules {

		bp += fmt.Sprintf(`

			java_library {

				name: "%s",

				srcs: ["a.java"],

				sdk_version: "none",

				system_modules: "stable-core-platform-api-stubs-system-modules",

				compile_dex: true,

				installable: true,

			}

		`, extra)

	}



	return bp

}



var PrepareForTestWithDexpreoptCompatLibs = android.GroupFixturePreparers(

	android.FixtureAddFile("defaults/dexpreopt/compat/a.java", nil),

	android.FixtureAddTextFile("defaults/dexpreopt/compat/Android.bp", CompatLibDefinitionsForTest()),

)



var PrepareForTestWithFakeDex2oatd = android.GroupFixturePreparers(

	android.FixtureRegisterWithContext(RegisterToolModulesForTest),

	android.FixtureAddTextFile("defaults/dexpreopt/Android.bp", BpToolModulesForTest()),

)



// Prepares a test fixture by enabling dexpreopt, registering the fake_tool_binary module type and

// using that to define the `dex2oatd` module.

var PrepareForTestByEnablingDexpreopt = android.GroupFixturePreparers(

	FixtureModifyGlobalConfig(func(*GlobalConfig) {}),

)



// FixtureModifyGlobalConfig enables dexpreopt (unless modified by the mutator) and modifies the

// configuration.

java/java_test.go

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ var prepareForJavaTest = android.GroupFixturePreparers( 
	android.FixtureRegisterWithContext(func(ctx android.RegistrationContext) {

		ctx.RegisterPreSingletonType("sdk_versions", sdkPreSingletonFactory)

	}),

	dexpreopt.PrepareForTestWithDexpreopt,

	PrepareForTestWithDexpreopt,

)



func TestMain(m *testing.M) {
@@ -68,7 +68,7 @@ func TestMain(m *testing.M) { 
func testJavaError(t *testing.T, pattern string, bp string) (*android.TestContext, android.Config) {

	t.Helper()

	result := android.GroupFixturePreparers(

		prepareForJavaTest, dexpreopt.PrepareForTestWithDexpreopt).

		prepareForJavaTest, dexpreopt.PrepareForTestByEnablingDexpreopt).

		ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(pattern)).

		RunTestWithBp(t, bp)

	return result.TestContext, result.Config

java/testing.go

+46 −26
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ var PrepareForTestWithJavaBuildComponents = android.GroupFixturePreparers( 
	// Make sure that mutators and module types, e.g. prebuilt mutators available.

	android.PrepareForTestWithAndroidBuildComponents,

	// Make java build components available to the test.

	android.FixtureRegisterWithContext(RegisterRequiredBuildComponentsForTest),

	android.FixtureRegisterWithContext(registerRequiredBuildComponentsForTest),

	android.FixtureRegisterWithContext(registerJavaPluginBuildComponents),

)
@@ -52,7 +52,16 @@ var PrepareForTestWithJavaDefaultModules = android.GroupFixturePreparers( 
	// Make sure that all the module types used in the defaults are registered.

	PrepareForTestWithJavaBuildComponents,

	// The java default module definitions.

	android.FixtureAddTextFile(defaultJavaDir+"/Android.bp", GatherRequiredDepsForTest()),

	android.FixtureAddTextFile(defaultJavaDir+"/Android.bp", gatherRequiredDepsForTest()),

	// Add dexpreopt compat libs (android.test.base, etc.) and a fake dex2oatd module.

	dexpreopt.PrepareForTestWithDexpreoptCompatLibs,

	dexpreopt.PrepareForTestWithFakeDex2oatd,

)



// Provides everything needed by dexpreopt.

var PrepareForTestWithDexpreopt = android.GroupFixturePreparers(

	PrepareForTestWithJavaDefaultModules,

	dexpreopt.PrepareForTestByEnablingDexpreopt,

)



var PrepareForTestWithOverlayBuildComponents = android.FixtureRegisterWithContext(registerOverlayBuildComponents)
@@ -178,7 +187,22 @@ func prebuiltApisFilesForLibs(apiLevels []string, sdkLibs []string) map[string][ 
//

// In particular this must register all the components that are used in the `Android.bp` snippet

// returned by GatherRequiredDepsForTest()

//

// deprecated: Use test fixtures instead, e.g. PrepareForTestWithJavaBuildComponents

func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) {

	registerRequiredBuildComponentsForTest(ctx)



	// Make sure that any tool related module types needed by dexpreopt have been registered.

	dexpreopt.RegisterToolModulesForTest(ctx)

}



// registerRequiredBuildComponentsForTest registers the build components used by

// PrepareForTestWithJavaDefaultModules.

//

// As functionality is moved out of here into separate FixturePreparer instances they should also

// be moved into GatherRequiredDepsForTest for use by tests that have not yet switched to use test

// fixtures.

func registerRequiredBuildComponentsForTest(ctx android.RegistrationContext) {

	RegisterAARBuildComponents(ctx)

	RegisterAppBuildComponents(ctx)

	RegisterAppImportBuildComponents(ctx)
@@ -193,15 +217,32 @@ func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) { 
	RegisterSdkLibraryBuildComponents(ctx)

	RegisterStubsBuildComponents(ctx)

	RegisterSystemModulesBuildComponents(ctx)



	// Make sure that any tool related module types needed by dexpreopt have been registered.

	dexpreopt.RegisterToolModulesForTest(ctx)

}



// Gather the module definitions needed by tests that depend upon code from this package.

//

// Returns an `Android.bp` snippet that defines the modules that are needed by this package.

//

// deprecated: Use test fixtures instead, e.g. PrepareForTestWithJavaDefaultModules

func GatherRequiredDepsForTest() string {

	bp := gatherRequiredDepsForTest()



	// For class loader context and <uses-library> tests.

	bp += dexpreopt.CompatLibDefinitionsForTest()



	// Make sure that any tools needed for dexpreopting are defined.

	bp += dexpreopt.BpToolModulesForTest()



	return bp

}



// gatherRequiredDepsForTest gathers the module definitions used by

// PrepareForTestWithJavaDefaultModules.

//

// As functionality is moved out of here into separate FixturePreparer instances they should also

// be moved into GatherRequiredDepsForTest for use by tests that have not yet switched to use test

// fixtures.

func gatherRequiredDepsForTest() string {

	var bp string



	extraModules := []string{
@@ -233,24 +274,6 @@ func GatherRequiredDepsForTest() string { 
		`, extra)

	}



	// For class loader context and <uses-library> tests.

	dexpreoptModules := []string{"android.test.runner"}

	dexpreoptModules = append(dexpreoptModules, dexpreopt.CompatUsesLibs...)

	dexpreoptModules = append(dexpreoptModules, dexpreopt.OptionalCompatUsesLibs...)



	for _, extra := range dexpreoptModules {

		bp += fmt.Sprintf(`

			java_library {

				name: "%s",

				srcs: ["a.java"],

				sdk_version: "none",

				system_modules: "stable-core-platform-api-stubs-system-modules",

				compile_dex: true,

				installable: true,

			}

		`, extra)

	}



	bp += `

		java_library {

			name: "framework",
@@ -287,9 +310,6 @@ func GatherRequiredDepsForTest() string { 
		`, extra)

	}



	// Make sure that any tools needed for dexpreopting are defined.

	bp += dexpreopt.BpToolModulesForTest()



	// Make sure that the dex_bootjars singleton module is instantiated for the tests.

	bp += `

		dex_bootjars {