commit 8083e32df40d51a9e007d3d7ffb9641ed42cc8d8
author michajlo <michajlo@google.com> Fri Mar 20 13:32:52 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Mar 20 13:34:18 2020 -0700
tree b706945be83e667788aeb91053b756c7ccad2fcf
parent 241d8c06e7a85d65e17cc8d4d623de5c22c9d29e

Break TestConstants' dependency on Package FactoryBuilderForTesting

PackageFactoryForTesting can pull in a lot of deps that a lot of things using
TestConstants don't need, so separate it out.

We should also do the same thing for
TestConstants#processSkyframeExecutorForTesting - I'd prefer to do that
separately.

Apologies for the comically named class, it's based on the constant that it was
created from.

RELNOTES: None
PiperOrigin-RevId: 302089555

src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
index 3814bff..2f75fb4 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
@@ -50,6 +50,7 @@
 import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction;
 import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy;
 import com.google.devtools.build.lib.testutil.TestConstants;
+import com.google.devtools.build.lib.testutil.TestPackageFactoryBuilderFactory;
 import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
 import com.google.devtools.build.lib.testutil.TimestampGranularityUtils;
 import com.google.devtools.build.lib.util.io.OutErr;
@@ -163,7 +164,7 @@
         WorkspaceFileValue.WORKSPACE_FILE,
         new WorkspaceFileFunction(
             TestRuleClassProvider.getRuleClassProvider(),
-            TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING
+            TestPackageFactoryBuilderFactory.getInstance()
                 .builder(directories)
                 .build(TestRuleClassProvider.getRuleClassProvider(), fs),
             directories,