Introduce TestConstants#PACKAGE_FACTORY_FACTORY_FOR_TESTING for the sake of making it easier to create PackageFactory instances in unit tests.
--
MOS_MIGRATED_REVID=124566862
diff --git a/src/test/java/com/google/devtools/build/lib/packages/EnvironmentGroupTest.java b/src/test/java/com/google/devtools/build/lib/packages/EnvironmentGroupTest.java
index 771322a..c8e0964 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/EnvironmentGroupTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/EnvironmentGroupTest.java
@@ -22,7 +22,6 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.packages.util.PackageLoadingTestCase;
-import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.vfs.Path;
import org.junit.Before;
@@ -54,9 +53,8 @@
" environments = [':foo', ':bar', ':baz'],",
" defaults = [':foo'],",
")");
- PackageFactory pkgFactory = new PackageFactory(TestRuleClassProvider.getRuleClassProvider());
pkg =
- pkgFactory.createPackageForTesting(
+ packageFactory.createPackageForTesting(
PackageIdentifier.createInMainRepo("pkg"), buildfile, getPackageManager(), reporter);
group = (EnvironmentGroup) pkg.getTarget("group");
diff --git a/src/test/java/com/google/devtools/build/lib/packages/OutputFileTest.java b/src/test/java/com/google/devtools/build/lib/packages/OutputFileTest.java
index 7401c16..34a3a9b 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/OutputFileTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/OutputFileTest.java
@@ -19,7 +19,6 @@
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.packages.util.PackageLoadingTestCase;
-import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.vfs.Path;
import org.junit.Before;
@@ -29,15 +28,11 @@
@RunWith(JUnit4.class)
public class OutputFileTest extends PackageLoadingTestCase {
-
- private PackageFactory packageFactory;
private Package pkg;
private Rule rule;
@Before
public final void createRule() throws Exception {
- packageFactory = new PackageFactory(TestRuleClassProvider.getRuleClassProvider());
-
Path buildfile =
scratch.file(
"pkg/BUILD",
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
index e160d6d..ee821a7 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
@@ -85,7 +85,8 @@
} else {
ruleClassProvider = TestRuleClassProvider.getRuleClassProvider();
}
- packageFactory = new PackageFactory(ruleClassProvider, getEnvironmentExtensions());
+ packageFactory = TestConstants.PACKAGE_FACTORY_FACTORY_FOR_TESTING.create(
+ ruleClassProvider, getEnvironmentExtensions(), scratch.getFileSystem());
skyframeExecutor = createSkyframeExecutor(getPreprocessorFactorySupplier());
setUpSkyframe(parsePackageCacheOptions());
}
