diff options
author | 2017-05-05 16:21:28 +0200 | |
---|---|---|
committer | 2017-05-05 18:36:59 +0200 | |
commit | 26e9d8f9c151f7bc10d5cbf120aaa68fa7cab625 (patch) | |
tree | 3a91ff4119c992b84142f061aaa413d056e9b96c /src/test/java/com/google/devtools/build/lib/packages | |
parent | 2c3c87fab48646167e4233f539540df6b5ed3d04 (diff) |
Automated g4 rollback of commit 9dec9a09d1e4d27e7cff73c440195a32d3b90752.
PiperOrigin-RevId: 155194438
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java | 7 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java b/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java index 217c37565d..f08e502b21 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java @@ -15,7 +15,7 @@ package com.google.devtools.build.lib.packages.util; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.flags.InvocationPolicyEnforcer; -import com.google.devtools.build.lib.skyframe.packages.PackageFactoryBuilderWithSkyframeForTesting; +import com.google.devtools.build.lib.packages.PackageFactory; import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; @@ -29,9 +29,8 @@ public class LoadingMock { return TestConstants.PRODUCT_NAME; } - public PackageFactoryBuilderWithSkyframeForTesting getPackageFactoryBuilderForTesting() { - return (PackageFactoryBuilderWithSkyframeForTesting) - TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING.builder(); + public PackageFactory.FactoryForTesting getPackageFactoryForTesting() { + return TestConstants.PACKAGE_FACTORY_FACTORY_FOR_TESTING; } public ConfiguredRuleClassProvider createRuleClassProvider() { 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 3ebda8ea71..975160dc0d 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 @@ -90,9 +90,8 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { } packageFactory = loadingMock - .getPackageFactoryBuilderForTesting() - .setEnvironmentExtensions(getEnvironmentExtensions()) - .build(ruleClassProvider, scratch.getFileSystem()); + .getPackageFactoryForTesting() + .create(ruleClassProvider, null, getEnvironmentExtensions(), scratch.getFileSystem()); skyframeExecutor = createSkyframeExecutor(); setUpSkyframe(); } |