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

Commit 29888b1b authored by Paul Duffin's avatar Paul Duffin
Browse files

Migrate system_modules_test.go from NormalizePathsForTesting 

Bug: 183650682
Test: m nothing
Change-Id: I9ccbbe521a449cb88ab13cde10161a41cfcf244c
parent cf8d7db0

java/system_modules_test.go

+10 −10
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ import ( 
	"android/soong/android"

)



func getModuleHeaderJarsAsNormalizedPaths(result *android.TestResult, moduleNames ...string) []string {

func getModuleHeaderJarsAsRelativeToTopPaths(result *android.TestResult, moduleNames ...string) []string {

	paths := []string{}

	for _, moduleName := range moduleNames {

		module := result.Module(moduleName, "android_common")

		info := result.ModuleProvider(module, JavaInfoProvider).(JavaInfo)

		paths = append(paths, result.NormalizePathsForTesting(info.HeaderJars)...)

		paths = append(paths, info.HeaderJars.RelativeToTop().Strings()...)

	}

	return paths

}
@@ -57,8 +57,8 @@ func TestJavaSystemModules(t *testing.T) { 
	sourceInputs := sourceSystemModules.Rule("jarsTosystemModules").Inputs



	// The expected paths are the header jars from the source input modules.

	expectedSourcePaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2")

	android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, result.NormalizePathsForTesting(sourceInputs))

	expectedSourcePaths := getModuleHeaderJarsAsRelativeToTopPaths(result, "system-module1", "system-module2")

	android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, sourceInputs.RelativeToTop().Strings())

}



var addPrebuiltSystemModules = android.FixtureAddTextFile("prebuilts/Android.bp", `
@@ -84,8 +84,8 @@ func TestJavaSystemModulesImport(t *testing.T) { 
	prebuiltInputs := prebuiltSystemModules.Rule("jarsTosystemModules").Inputs



	// The expected paths are the header jars from the renamed prebuilt input modules.

	expectedPrebuiltPaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2")

	android.AssertArrayString(t, "renamed prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs))

	expectedPrebuiltPaths := getModuleHeaderJarsAsRelativeToTopPaths(result, "system-module1", "system-module2")

	android.AssertArrayString(t, "renamed prebuilt system modules inputs", expectedPrebuiltPaths, prebuiltInputs.RelativeToTop().Strings())

}



func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) {
@@ -99,14 +99,14 @@ func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) { 
	sourceInputs := sourceSystemModules.Rule("jarsTosystemModules").Inputs



	// The expected paths are the header jars from the source input modules.

	expectedSourcePaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2")

	android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, result.NormalizePathsForTesting(sourceInputs))

	expectedSourcePaths := getModuleHeaderJarsAsRelativeToTopPaths(result, "system-module1", "system-module2")

	android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, sourceInputs.RelativeToTop().Strings())



	// check the existence of the renamed prebuilt module

	prebuiltSystemModules := result.ModuleForTests("prebuilt_system-modules", "android_common")

	prebuiltInputs := prebuiltSystemModules.Rule("jarsTosystemModules").Inputs



	// The expected paths are the header jars from the renamed prebuilt input modules.

	expectedPrebuiltPaths := getModuleHeaderJarsAsNormalizedPaths(result, "prebuilt_system-module1", "prebuilt_system-module2")

	android.AssertArrayString(t, "prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs))

	expectedPrebuiltPaths := getModuleHeaderJarsAsRelativeToTopPaths(result, "prebuilt_system-module1", "prebuilt_system-module2")

	android.AssertArrayString(t, "prebuilt system modules inputs", expectedPrebuiltPaths, prebuiltInputs.RelativeToTop().Strings())

}