openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Improve name of getModuleHeaderJarsAsNormalizedPaths" am: c7cdd1513c am: 83eb3ba314 am: 14cb8dd965 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628682

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08356e305400519865ba41fb34da5057906ff81b
This commit is contained in:
Paul Duffin 2021-03-12 09:44:03 +00:00 committed by Automerger Merge Worker
parent 0edfd5fb57 14cb8dd965
commit a987df1281
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/system_modules_test.go
View File

@ -20,7 +20,7 @@ import (
"android/soong/android"
)
func normalizedPathsToHeaderJars(result *android.TestResult, moduleNames ...string) []string {
func getModuleHeaderJarsAsNormalizedPaths(result *android.TestResult, moduleNames ...string) []string {
paths := []string{}
for _, moduleName := range moduleNames {
module := result.Module(moduleName, "android_common")
@ -57,7 +57,7 @@ func TestJavaSystemModules(t *testing.T) {
sourceInputs := sourceSystemModules.Rule("jarsTosystemModules").Inputs
// The expected paths are the header jars from the source input modules.
expectedSourcePaths := normalizedPathsToHeaderJars(result, "system-module1", "system-module2")
expectedSourcePaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2")
result.AssertArrayString("source system modules inputs", expectedSourcePaths, result.NormalizePathsForTesting(sourceInputs))
}
@ -84,7 +84,7 @@ func TestJavaSystemModulesImport(t *testing.T) {
prebuiltInputs := prebuiltSystemModules.Rule("jarsTosystemModules").Inputs
// The expected paths are the header jars from the renamed prebuilt input modules.
expectedPrebuiltPaths := normalizedPathsToHeaderJars(result, "system-module1", "system-module2")
expectedPrebuiltPaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2")
result.AssertArrayString("renamed prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs))
}
@ -99,7 +99,7 @@ func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) {
sourceInputs := sourceSystemModules.Rule("jarsTosystemModules").Inputs
// The expected paths are the header jars from the source input modules.
expectedSourcePaths := normalizedPathsToHeaderJars(result, "system-module1", "system-module2")
expectedSourcePaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2")
result.AssertArrayString("source system modules inputs", expectedSourcePaths, result.NormalizePathsForTesting(sourceInputs))
// check the existence of the renamed prebuilt module
@ -107,6 +107,6 @@ func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) {
prebuiltInputs := prebuiltSystemModules.Rule("jarsTosystemModules").Inputs
// The expected paths are the header jars from the renamed prebuilt input modules.
expectedPrebuiltPaths := normalizedPathsToHeaderJars(result, "prebuilt_system-module1", "prebuilt_system-module2")
expectedPrebuiltPaths := getModuleHeaderJarsAsNormalizedPaths(result, "prebuilt_system-module1", "prebuilt_system-module2")
result.AssertArrayString("prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs))
}