From db284be91325477f2f4b0bf075c9a1e4bc713f8b Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 11 Mar 2021 08:07:46 +0000 Subject: Separate system modules tests into their own file java_test.go is getting too big. Bug: 182402568 Test: m nothing Change-Id: I9c3818f1d747a230fcb66687319a3a14d557a57c --- java/java_test.go | 64 ------------------------------------------------------- 1 file changed, 64 deletions(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index e8c4a0f50..670eefc76 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -2434,70 +2434,6 @@ func TestPatchModule(t *testing.T) { }) } -func TestJavaSystemModules(t *testing.T) { - ctx, _ := testJava(t, ` - java_system_modules { - name: "system-modules", - libs: ["system-module1", "system-module2"], - } - java_library { - name: "system-module1", - srcs: ["a.java"], - sdk_version: "none", - system_modules: "none", - } - java_library { - name: "system-module2", - srcs: ["b.java"], - sdk_version: "none", - system_modules: "none", - } - `) - - // check the existence of the module - systemModules := ctx.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) - } - } -} - -func TestJavaSystemModulesImport(t *testing.T) { - ctx, _ := testJava(t, ` - java_system_modules_import { - name: "system-modules", - libs: ["system-module1", "system-module2"], - } - java_import { - name: "system-module1", - jars: ["a.jar"], - } - java_import { - name: "system-module2", - jars: ["b.jar"], - } - `) - - // check the existence of the module - systemModules := ctx.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) - } - } -} - func TestJavaLibraryWithSystemModules(t *testing.T) { ctx, _ := testJava(t, ` java_library { -- cgit v1.2.3-59-g8ed1b