Remove some unnecessary params. RELNOTES: None PiperOrigin-RevId: 191354727
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java index 768afe2..f913c45 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -197,7 +197,7 @@ PackageFactory pkgFactory = analysisMock .getPackageFactoryBuilderForTesting(directories) - .build(ruleClassProvider, scratch.getFileSystem()); + .build(ruleClassProvider); useConfiguration(); skyframeExecutor = createSkyframeExecutor(pkgFactory, ruleClassProvider.getBuildInfoFactories());
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 7e4f954..765a095 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -238,7 +238,7 @@ if (!doPackageLoadingChecks) { pkgFactoryBuilder.disableChecks(); } - pkgFactory = pkgFactoryBuilder.build(ruleClassProvider, scratch.getFileSystem()); + pkgFactory = pkgFactoryBuilder.build(ruleClassProvider); tsgm = new TimestampGranularityMonitor(BlazeClock.instance()); skyframeExecutor = SequencedSkyframeExecutor.create(
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java index 06fabd6..e1c054d 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -111,7 +111,7 @@ pkgFactory = analysisMock .getPackageFactoryBuilderForTesting(directories) - .build(ruleClassProvider, scratch.getFileSystem()); + .build(ruleClassProvider); AnalysisTestUtil.DummyWorkspaceStatusActionFactory workspaceStatusActionFactory = new AnalysisTestUtil.DummyWorkspaceStatusActionFactory(directories); skyframeExecutor =
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 e43be1d..7902de2 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
@@ -100,7 +100,7 @@ loadingMock .getPackageFactoryBuilderForTesting(directories) .setEnvironmentExtensions(getEnvironmentExtensions()) - .build(ruleClassProvider, scratch.getFileSystem()); + .build(ruleClassProvider); skyframeExecutor = createSkyframeExecutor(); setUpSkyframe(); }
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java index be5068b..d8f1999 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
@@ -83,7 +83,7 @@ SequencedSkyframeExecutor.create( analysisMock .getPackageFactoryBuilderForTesting(directories) - .build(ruleClassProvider, scratch.getFileSystem()), + .build(ruleClassProvider), fileSystem, directories, actionKeyContext,
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java index 1a00c81..d37d72a 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
@@ -477,7 +477,7 @@ SequencedSkyframeExecutor.create( loadingMock .getPackageFactoryBuilderForTesting(directories) - .build(ruleClassProvider, fs), + .build(ruleClassProvider), fs, directories, actionKeyContext,
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java index e7c6535..4e030ac 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
@@ -725,7 +725,7 @@ ConfiguredRuleClassProvider ruleClassProvider = analysisMock.createRuleClassProvider(); PackageFactory pkgFactory = - analysisMock.getPackageFactoryBuilderForTesting(directories).build(ruleClassProvider, fs); + analysisMock.getPackageFactoryBuilderForTesting(directories).build(ruleClassProvider); PackageCacheOptions options = Options.getDefaults(PackageCacheOptions.class); storedErrors = new StoredEventHandler(); BuildOptions defaultBuildOptions;
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java index 85ac153..a48e9ec 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
@@ -100,7 +100,7 @@ } skyframeExecutor = SequencedSkyframeExecutor.create( - packageFactoryBuilder.build(ruleClassProvider, fileSystem), + packageFactoryBuilder.build(ruleClassProvider), fileSystem, directories, actionKeyContext,
diff --git a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java index fefefea..7b3cbd5 100644 --- a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java +++ b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
@@ -124,7 +124,7 @@ .setEnvironmentExtensions( ImmutableList.<EnvironmentExtension>of( new PackageFactory.EmptyEnvironmentExtension())) - .build(ruleClassProvider, scratch.getFileSystem()), + .build(ruleClassProvider), directories)); skyFunctions.put( SkyFunctions.PACKAGE, new PackageFunction(null, null, null, null, null, null, null));
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java index 0c9357d..d49ddc2 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
@@ -118,8 +118,7 @@ TestRuleClassProvider.getRuleClassProvider(), TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING .builder(directories) - .build( - TestRuleClassProvider.getRuleClassProvider(), root.getFileSystem()), + .build(TestRuleClassProvider.getRuleClassProvider()), directories)) .put(SkyFunctions.LOCAL_REPOSITORY_LOOKUP, new LocalRepositoryLookupFunction()) .put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction())
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java index 681e4aa..84b2cd9 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java
@@ -112,8 +112,7 @@ TestRuleClassProvider.getRuleClassProvider(), TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING .builder(directories) - .build( - TestRuleClassProvider.getRuleClassProvider(), root.getFileSystem()), + .build(TestRuleClassProvider.getRuleClassProvider()), directories)) .put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()) .put(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java index 7563137..7982b2d 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
@@ -125,7 +125,7 @@ .setEnvironmentExtensions( ImmutableList.<EnvironmentExtension>of( new PackageFactory.EmptyEnvironmentExtension())) - .build(ruleClassProvider, scratch.getFileSystem()), + .build(ruleClassProvider), directories)); skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()); skyFunctions.put(SkyFunctions.LOCAL_REPOSITORY_LOOKUP, new LocalRepositoryLookupFunction());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java index 2c0c772..3ddda58 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
@@ -167,7 +167,7 @@ TestRuleClassProvider.getRuleClassProvider(), TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING .builder(directories) - .build(TestRuleClassProvider.getRuleClassProvider(), fs), + .build(TestRuleClassProvider.getRuleClassProvider()), directories)) .put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()) .put(SkyFunctions.LOCAL_REPOSITORY_LOOKUP, new LocalRepositoryLookupFunction())
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 a0c16e4..014ba2a 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
@@ -138,7 +138,7 @@ TestRuleClassProvider.getRuleClassProvider(), TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING .builder(directories) - .build(TestRuleClassProvider.getRuleClassProvider(), fs), + .build(TestRuleClassProvider.getRuleClassProvider()), directories)); skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java index 02d5a0e..f690e65 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
@@ -178,7 +178,7 @@ .setEnvironmentExtensions( ImmutableList.<EnvironmentExtension>of( new PackageFactory.EmptyEnvironmentExtension())) - .build(ruleClassProvider, fs), + .build(ruleClassProvider), directories)); skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()); skyFunctions.put(SkyFunctions.LOCAL_REPOSITORY_LOOKUP, new LocalRepositoryLookupFunction());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java index b6eec17..be292bd 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
@@ -108,7 +108,7 @@ .setEnvironmentExtensions( ImmutableList.<EnvironmentExtension>of( new PackageFactory.EmptyEnvironmentExtension())) - .build(ruleClassProvider, scratch.getFileSystem()), + .build(ruleClassProvider), directories)); skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()); skyFunctions.put(SkyFunctions.LOCAL_REPOSITORY_LOOKUP, new LocalRepositoryLookupFunction());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java index 0613eed..978da79 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
@@ -138,7 +138,7 @@ .setEnvironmentExtensions( ImmutableList.<EnvironmentExtension>of( new PackageFactory.EmptyEnvironmentExtension())) - .build(ruleClassProvider, scratch.getFileSystem()), + .build(ruleClassProvider), directories)); skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()); skyFunctions.put(SkyFunctions.LOCAL_REPOSITORY_LOOKUP, new LocalRepositoryLookupFunction());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java index 27ae6a9..b307d09 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
@@ -80,7 +80,7 @@ SequencedSkyframeExecutor.create( AnalysisMock.get() .getPackageFactoryBuilderForTesting(directories) - .build(ruleClassProvider, fileSystem), + .build(ruleClassProvider), fileSystem, directories, new ActionKeyContext(),
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java index d271842..8ea4fd0 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
@@ -139,7 +139,7 @@ ruleClassProvider, analysisMock .getPackageFactoryBuilderForTesting(directories) - .build(ruleClassProvider, scratch.getFileSystem()), + .build(ruleClassProvider), directories)); skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()); skyFunctions.put(SkyFunctions.LOCAL_REPOSITORY_LOOKUP, new LocalRepositoryLookupFunction());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index 8554b25..94ab81d 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
@@ -221,9 +221,7 @@ TestRuleClassProvider.getRuleClassProvider(), TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING .builder(directories) - .build( - TestRuleClassProvider.getRuleClassProvider(), - scratch.getFileSystem()), + .build(TestRuleClassProvider.getRuleClassProvider()), directories)) .put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()) .put(
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/PackageFactoryBuilderFactoryForBazelUnitTests.java b/src/test/java/com/google/devtools/build/lib/testutil/PackageFactoryBuilderFactoryForBazelUnitTests.java index eee0d34..63c7a40 100644 --- a/src/test/java/com/google/devtools/build/lib/testutil/PackageFactoryBuilderFactoryForBazelUnitTests.java +++ b/src/test/java/com/google/devtools/build/lib/testutil/PackageFactoryBuilderFactoryForBazelUnitTests.java
@@ -19,7 +19,6 @@ import com.google.devtools.build.lib.packages.PackageFactory; import com.google.devtools.build.lib.packages.RuleClassProvider; import com.google.devtools.build.lib.skyframe.packages.PackageFactoryBuilderWithSkyframeForTesting; -import com.google.devtools.build.lib.vfs.FileSystem; /** * A {@link BuilderFactoryForTesting} implementation that injects a {@link @@ -47,7 +46,7 @@ } @Override - public PackageFactory build(RuleClassProvider ruleClassProvider, FileSystem fs) { + public PackageFactory build(RuleClassProvider ruleClassProvider) { Package.Builder.Helper packageBuilderHelperForTesting = doChecksForTesting ? new BazelPackageBuilderHelperForTesting(ruleClassProvider, directories)