StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migrate system_modules_test.go from NormalizePathsForTesting"

Browse Source
This commit is contained in:
Paul Duffin
2021-03-30 16:42:55 +00:00
committed by Gerrit Code Review
parent 58367574a5 29888b1bf0
commit 87d3bae657
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/system_modules_test.go
View File

@@ -20,12 +20,12 @@ import (
"android/soong/android" "android/soong/android"
) )
func getModuleHeaderJarsAsNormalizedPaths(result *android.TestResult, moduleNames ...string) []string { func getModuleHeaderJarsAsRelativeToTopPaths(result *android.TestResult, moduleNames ...string) []string {
paths := []string{} paths := []string{}
for _, moduleName := range moduleNames { for _, moduleName := range moduleNames {
module := result.Module(moduleName, "android_common") module := result.Module(moduleName, "android_common")
info := result.ModuleProvider(module, JavaInfoProvider).(JavaInfo) info := result.ModuleProvider(module, JavaInfoProvider).(JavaInfo)
paths = append(paths, result.NormalizePathsForTesting(info.HeaderJars)...) paths = append(paths, info.HeaderJars.RelativeToTop().Strings()...)
} }
return paths return paths
} }
@@ -57,8 +57,8 @@ func TestJavaSystemModules(t *testing.T) {
sourceInputs := sourceSystemModules.Rule("jarsTosystemModules").Inputs sourceInputs := sourceSystemModules.Rule("jarsTosystemModules").Inputs
// The expected paths are the header jars from the source input modules. // The expected paths are the header jars from the source input modules.
expectedSourcePaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2") expectedSourcePaths := getModuleHeaderJarsAsRelativeToTopPaths(result, "system-module1", "system-module2")
android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, result.NormalizePathsForTesting(sourceInputs)) android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, sourceInputs.RelativeToTop().Strings())
} }
var addPrebuiltSystemModules = android.FixtureAddTextFile("prebuilts/Android.bp", ` var addPrebuiltSystemModules = android.FixtureAddTextFile("prebuilts/Android.bp", `
@@ -84,8 +84,8 @@ func TestJavaSystemModulesImport(t *testing.T) {
prebuiltInputs := prebuiltSystemModules.Rule("jarsTosystemModules").Inputs prebuiltInputs := prebuiltSystemModules.Rule("jarsTosystemModules").Inputs
// The expected paths are the header jars from the renamed prebuilt input modules. // The expected paths are the header jars from the renamed prebuilt input modules.
expectedPrebuiltPaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2") expectedPrebuiltPaths := getModuleHeaderJarsAsRelativeToTopPaths(result, "system-module1", "system-module2")
android.AssertArrayString(t, "renamed prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs)) android.AssertArrayString(t, "renamed prebuilt system modules inputs", expectedPrebuiltPaths, prebuiltInputs.RelativeToTop().Strings())
} }
func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) { func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) {
@@ -99,14 +99,14 @@ func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) {
sourceInputs := sourceSystemModules.Rule("jarsTosystemModules").Inputs sourceInputs := sourceSystemModules.Rule("jarsTosystemModules").Inputs
// The expected paths are the header jars from the source input modules. // The expected paths are the header jars from the source input modules.
expectedSourcePaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2") expectedSourcePaths := getModuleHeaderJarsAsRelativeToTopPaths(result, "system-module1", "system-module2")
android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, result.NormalizePathsForTesting(sourceInputs)) android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, sourceInputs.RelativeToTop().Strings())
// check the existence of the renamed prebuilt module // check the existence of the renamed prebuilt module
prebuiltSystemModules := result.ModuleForTests("prebuilt_system-modules", "android_common") prebuiltSystemModules := result.ModuleForTests("prebuilt_system-modules", "android_common")
prebuiltInputs := prebuiltSystemModules.Rule("jarsTosystemModules").Inputs prebuiltInputs := prebuiltSystemModules.Rule("jarsTosystemModules").Inputs
// The expected paths are the header jars from the renamed prebuilt input modules. // The expected paths are the header jars from the renamed prebuilt input modules.
expectedPrebuiltPaths := getModuleHeaderJarsAsNormalizedPaths(result, "prebuilt_system-module1", "prebuilt_system-module2") expectedPrebuiltPaths := getModuleHeaderJarsAsRelativeToTopPaths(result, "prebuilt_system-module1", "prebuilt_system-module2")
android.AssertArrayString(t, "prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs)) android.AssertArrayString(t, "prebuilt system modules inputs", expectedPrebuiltPaths, prebuiltInputs.RelativeToTop().Strings())
} }