From 70d3bee3e03918cf1225fde603aa54385dba8085 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Sun, 21 Mar 2021 11:26:05 +0000
Subject: [PATCH] Remove emptyFixtureFactory from apex and java

Bug: 183235980
Test: m nothing
Change-Id: I350b45e2f57430fb158f4141a566e75de17208cd
---
 apex/apex_test.go                   |  6 ++----
 java/java_test.go                   | 20 +++++++++++++++++---
 java/platform_compat_config_test.go |  4 ++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/apex/apex_test.go b/apex/apex_test.go
index 7ef1eaa67..b15966085 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -117,8 +117,6 @@ var withUnbundledBuild = android.FixtureModifyProductVariables(
 	},
 )
 
-var emptyFixtureFactory = android.NewFixtureFactory(&buildDir)
-
 var apexFixtureFactory = android.NewFixtureFactory(
 	&buildDir,
 	// General preparers in alphabetical order as test infrastructure will enforce correct
@@ -1188,7 +1186,7 @@ var prepareForTestOfRuntimeApexWithHwasan = android.GroupFixturePreparers(
 )
 
 func TestRuntimeApexShouldInstallHwasanIfLibcDependsOnIt(t *testing.T) {
-	result := emptyFixtureFactory.Extend(prepareForTestOfRuntimeApexWithHwasan).RunTestWithBp(t, `
+	result := android.GroupFixturePreparers(prepareForTestOfRuntimeApexWithHwasan).RunTestWithBp(t, `
 		cc_library {
 			name: "libc",
 			no_libcrt: true,
@@ -1234,7 +1232,7 @@ func TestRuntimeApexShouldInstallHwasanIfLibcDependsOnIt(t *testing.T) {
 }
 
 func TestRuntimeApexShouldInstallHwasanIfHwaddressSanitized(t *testing.T) {
-	result := emptyFixtureFactory.Extend(
+	result := android.GroupFixturePreparers(
 		prepareForTestOfRuntimeApexWithHwasan,
 		android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
 			variables.SanitizeDevice = []string{"hwaddress"}
diff --git a/java/java_test.go b/java/java_test.go
index 99a96e121..913ed8713 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -48,10 +48,24 @@ func tearDown() {
 	os.RemoveAll(buildDir)
 }
 
-var emptyFixtureFactory = android.NewFixtureFactory(&buildDir)
+// Legacy factory to use to create fixtures for tests in this package.
+//
+// deprecated: See prepareForJavaTest
+var javaFixtureFactory = android.NewFixtureFactory(
+	&buildDir,
+	prepareForJavaTest,
+)
 
-// Factory to use to create fixtures for tests in this package.
-var javaFixtureFactory = emptyFixtureFactory.Extend(
+// Legacy preparer used for running tests within the java package.
+//
+// This includes everything that was needed to run any test in the java package prior to the
+// introduction of the test fixtures. Tests that are being converted to use fixtures directly
+// rather than through the testJava...() methods should avoid using this and instead use the
+// various preparers directly, using android.GroupFixturePreparers(...) to group them when
+// necessary.
+//
+// deprecated
+var prepareForJavaTest = android.GroupFixturePreparers(
 	genrule.PrepareForTestWithGenRuleBuildComponents,
 	// Get the CC build components but not default modules.
 	cc.PrepareForTestWithCcBuildComponents,
diff --git a/java/platform_compat_config_test.go b/java/platform_compat_config_test.go
index 0c5d001ac..1ff6ac304 100644
--- a/java/platform_compat_config_test.go
+++ b/java/platform_compat_config_test.go
@@ -21,7 +21,7 @@ import (
 )
 
 func TestPlatformCompatConfig(t *testing.T) {
-	result := emptyFixtureFactory.RunTest(t,
+	result := android.GroupFixturePreparers(
 		PrepareForTestWithPlatformCompatConfig,
 		android.FixtureWithRootAndroidBp(`
 			platform_compat_config {
@@ -34,7 +34,7 @@ func TestPlatformCompatConfig(t *testing.T) {
 				name: "myconfig3",
 			}
 		`),
-	)
+	).RunTest(t)
 
 	checkMergedCompatConfigInputs(t, result, "myconfig",
 		"out/soong/.intermediates/myconfig1/myconfig1_meta.xml",