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

Merge "Convert system modules tests to use fixtures" am: 6f688d03c8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72ab39aa93ad79fd53f97ca3b3eb08ea327451e8
This commit is contained in:
Paul Duffin
2021-03-11 15:21:42 +00:00
committed by Automerger Merge Worker
parent 7c05abc397 6f688d03c8
commit df0b483089
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/system_modules_test.go
View File

@@ -15,12 +15,11 @@
package java
import (
"strings"
"testing"
)
func TestJavaSystemModules(t *testing.T) {
ctx, _ := testJava(t, `
result := javaFixtureFactory.RunTestWithBp(t, `
java_system_modules {
name: "system-modules",
libs: ["system-module1", "system-module2"],
@@ -40,21 +39,18 @@ func TestJavaSystemModules(t *testing.T) {
`)
// check the existence of the module
systemModules := ctx.ModuleForTests("system-modules", "android_common")
systemModules := result.ModuleForTests("system-modules", "android_common")
cmd := systemModules.Rule("jarsTosystemModules")
// make sure the command compiles against the supplied modules.
for _, module := range []string{"system-module1.jar", "system-module2.jar"} {
if !strings.Contains(cmd.Args["classpath"], module) {
t.Errorf("system modules classpath %v does not contain %q", cmd.Args["classpath"],
module)
}
result.AssertStringDoesContain("system modules classpath", cmd.Args["classpath"], module)
}
}
func TestJavaSystemModulesImport(t *testing.T) {
ctx, _ := testJava(t, `
result := javaFixtureFactory.RunTestWithBp(t, `
java_system_modules_import {
name: "system-modules",
libs: ["system-module1", "system-module2"],
@@ -70,15 +66,12 @@ func TestJavaSystemModulesImport(t *testing.T) {
`)
// check the existence of the module
systemModules := ctx.ModuleForTests("system-modules", "android_common")
systemModules := result.ModuleForTests("system-modules", "android_common")
cmd := systemModules.Rule("jarsTosystemModules")
// make sure the command compiles against the supplied modules.
for _, module := range []string{"system-module1.jar", "system-module2.jar"} {
if !strings.Contains(cmd.Args["classpath"], module) {
t.Errorf("system modules classpath %v does not contain %q", cmd.Args["classpath"],
module)
}
result.AssertStringDoesContain("system modules classpath", cmd.Args["classpath"], module)
}
}