From f23e346f6cff3162b3b9ca8e73ddea8ac2f4ca89 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 11 Mar 2021 08:14:44 +0000 Subject: [PATCH] Convert system modules tests to use fixtures Bug: 182402568 Test: m nothing Change-Id: I0535e60a692925b141e465d8e1ec92be21d54c88 --- java/system_modules_test.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/java/system_modules_test.go b/java/system_modules_test.go index 23d6c7bef..d2fa2b152 100644 --- a/java/system_modules_test.go +++ b/java/system_modules_test.go @@ -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) } }