diff options
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/java/java_test.go b/java/java_test.go index 75813e03c..99a96e121 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -64,8 +64,6 @@ var javaFixtureFactory = emptyFixtureFactory.Extend( ctx.RegisterPreSingletonType("overlay", OverlaySingletonFactory) ctx.RegisterPreSingletonType("sdk_versions", sdkPreSingletonFactory) }), - javaMockFS().AddToFixture(), - PrepareForTestWithJavaSdkLibraryFiles, dexpreopt.PrepareForTestWithDexpreopt, ) @@ -245,7 +243,14 @@ func moduleToPath(name string) string { // defaultModuleToPath constructs a path to the turbine generate jar for a default test module that // is defined in PrepareForIntegrationTestWithJava func defaultModuleToPath(name string) string { - return filepath.Join(buildDir, ".intermediates", defaultJavaDir, name, "android_common", "turbine-combined", name+".jar") + switch { + case name == `""`: + return name + case strings.HasSuffix(name, ".jar"): + return name + default: + return filepath.Join(buildDir, ".intermediates", defaultJavaDir, name, "android_common", "turbine-combined", name+".jar") + } } func TestJavaLinkType(t *testing.T) { @@ -1420,7 +1425,9 @@ func TestGeneratedSources(t *testing.T) { } func TestTurbine(t *testing.T) { - ctx, _ := testJava(t, ` + result := javaFixtureFactory. + Extend(FixtureWithPrebuiltApis(map[string][]string{"14": {"foo"}})). + RunTestWithBp(t, ` java_library { name: "foo", srcs: ["a.java"], @@ -1442,30 +1449,20 @@ func TestTurbine(t *testing.T) { } `) - fooTurbine := ctx.ModuleForTests("foo", "android_common").Rule("turbine") - barTurbine := ctx.ModuleForTests("bar", "android_common").Rule("turbine") - barJavac := ctx.ModuleForTests("bar", "android_common").Rule("javac") - barTurbineCombined := ctx.ModuleForTests("bar", "android_common").Description("for turbine") - bazJavac := ctx.ModuleForTests("baz", "android_common").Rule("javac") + fooTurbine := result.ModuleForTests("foo", "android_common").Rule("turbine") + barTurbine := result.ModuleForTests("bar", "android_common").Rule("turbine") + barJavac := result.ModuleForTests("bar", "android_common").Rule("javac") + barTurbineCombined := result.ModuleForTests("bar", "android_common").Description("for turbine") + bazJavac := result.ModuleForTests("baz", "android_common").Rule("javac") - if len(fooTurbine.Inputs) != 1 || fooTurbine.Inputs[0].String() != "a.java" { - t.Errorf(`foo inputs %v != ["a.java"]`, fooTurbine.Inputs) - } + android.AssertArrayString(t, "foo inputs", []string{"a.java"}, fooTurbine.Inputs.Strings()) fooHeaderJar := filepath.Join(buildDir, ".intermediates", "foo", "android_common", "turbine-combined", "foo.jar") - if !strings.Contains(barTurbine.Args["classpath"], fooHeaderJar) { - t.Errorf("bar turbine classpath %v does not contain %q", barTurbine.Args["classpath"], fooHeaderJar) - } - if !strings.Contains(barJavac.Args["classpath"], fooHeaderJar) { - t.Errorf("bar javac classpath %v does not contain %q", barJavac.Args["classpath"], fooHeaderJar) - } - if len(barTurbineCombined.Inputs) != 2 || barTurbineCombined.Inputs[1].String() != fooHeaderJar { - t.Errorf("bar turbine combineJar inputs %v does not contain %q", barTurbineCombined.Inputs, fooHeaderJar) - } - if !strings.Contains(bazJavac.Args["classpath"], "prebuilts/sdk/14/public/android.jar") { - t.Errorf("baz javac classpath %v does not contain %q", bazJavac.Args["classpath"], - "prebuilts/sdk/14/public/android.jar") - } + barTurbineJar := filepath.Join(buildDir, ".intermediates", "bar", "android_common", "turbine", "bar.jar") + android.AssertStringDoesContain(t, "bar turbine classpath", barTurbine.Args["classpath"], fooHeaderJar) + android.AssertStringDoesContain(t, "bar javac classpath", barJavac.Args["classpath"], fooHeaderJar) + android.AssertArrayString(t, "bar turbine combineJar", []string{barTurbineJar, fooHeaderJar}, barTurbineCombined.Inputs.Strings()) + android.AssertStringDoesContain(t, "baz javac classpath", bazJavac.Args["classpath"], "prebuilts/sdk/14/public/android.jar") } func TestSharding(t *testing.T) { |