Inline test-only PackageFunction constructor to the tests where it is needed.
PiperOrigin-RevId: 375953063
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
index 40d20b5..f324591 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
@@ -17,7 +17,6 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Throwables;
import com.google.common.cache.Cache;
import com.google.common.collect.ImmutableList;
@@ -190,28 +189,6 @@
this.incrementalityIntent = incrementalityIntent;
}
- @VisibleForTesting
- public PackageFunction(
- PackageFactory packageFactory,
- CachingPackageLocator pkgLocator,
- AtomicBoolean showLoadingProgress,
- Cache<PackageIdentifier, LoadedPackageCacheEntry> packageFunctionCache,
- Cache<PackageIdentifier, CompiledBuildFile> compiledBuildFileCache,
- AtomicInteger numPackagesLoaded,
- @Nullable BzlLoadFunction bzlLoadFunctionForInlining) {
- this(
- packageFactory,
- pkgLocator,
- showLoadingProgress,
- packageFunctionCache,
- compiledBuildFileCache,
- numPackagesLoaded,
- bzlLoadFunctionForInlining,
- /*packageProgress=*/ null,
- ActionOnIOExceptionReadingBuildFile.UseOriginalIOException.INSTANCE,
- IncrementalityIntent.INCREMENTAL);
- }
-
public void setBzlLoadFunctionForInliningForTesting(BzlLoadFunction bzlLoadFunctionForInlining) {
this.bzlLoadFunctionForInlining = bzlLoadFunctionForInlining;
}
diff --git a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageHelperTest.java b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageHelperTest.java
index 34ed81f..f5bbf76 100644
--- a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageHelperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageHelperTest.java
@@ -152,7 +152,18 @@
directories,
/*bzlLoadFunctionForInlining=*/ null));
skyFunctions.put(
- SkyFunctions.PACKAGE, new PackageFunction(null, null, null, null, null, null, null));
+ SkyFunctions.PACKAGE,
+ new PackageFunction(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ /*packageProgress=*/ null,
+ PackageFunction.ActionOnIOExceptionReadingBuildFile.UseOriginalIOException.INSTANCE,
+ PackageFunction.IncrementalityIntent.INCREMENTAL));
skyFunctions.put(
SkyFunctions.EXTERNAL_PACKAGE,
new ExternalPackageFunction(BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER));
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 362d828..b30e5cd 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
@@ -170,7 +170,18 @@
.put(SkyFunctions.REPOSITORY_DIRECTORY, delegatorFunction)
.put(
SkyFunctions.PACKAGE,
- new PackageFunction(null, null, null, null, null, null, null))
+ new PackageFunction(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ /*packageProgress=*/ null,
+ PackageFunction.ActionOnIOExceptionReadingBuildFile.UseOriginalIOException
+ .INSTANCE,
+ PackageFunction.IncrementalityIntent.INCREMENTAL))
.put(
SkyFunctions.PACKAGE_LOOKUP,
new PackageLookupFunction(
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 df0c207..694b29f 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,7 +112,18 @@
.put(SkyFunctions.ACTION_EXECUTION, new SimpleActionExecutionFunction())
.put(
SkyFunctions.PACKAGE,
- new PackageFunction(null, null, null, null, null, null, null))
+ new PackageFunction(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ /*packageProgress=*/ null,
+ PackageFunction.ActionOnIOExceptionReadingBuildFile.UseOriginalIOException
+ .INSTANCE,
+ PackageFunction.IncrementalityIntent.INCREMENTAL))
.put(
SkyFunctions.PACKAGE_LOOKUP,
new PackageLookupFunction(
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 b68a2f3..67cfaa7 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
@@ -111,7 +111,18 @@
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY,
BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER));
skyFunctions.put(
- SkyFunctions.PACKAGE, new PackageFunction(null, null, null, null, null, null, null));
+ SkyFunctions.PACKAGE,
+ new PackageFunction(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ /*packageProgress=*/ null,
+ PackageFunction.ActionOnIOExceptionReadingBuildFile.UseOriginalIOException.INSTANCE,
+ PackageFunction.IncrementalityIntent.INCREMENTAL));
skyFunctions.put(
SkyFunctions.IGNORED_PACKAGE_PREFIXES,
new IgnoredPackagePrefixesFunction(
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 f84c214..4cc4731 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
@@ -181,7 +181,18 @@
.put(FileValue.FILE, new FileFunction(pkgLocatorRef))
.put(
SkyFunctions.PACKAGE,
- new PackageFunction(null, null, null, null, null, null, null))
+ new PackageFunction(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ /*packageProgress=*/ null,
+ PackageFunction.ActionOnIOExceptionReadingBuildFile.UseOriginalIOException
+ .INSTANCE,
+ PackageFunction.IncrementalityIntent.INCREMENTAL))
.put(
SkyFunctions.PACKAGE_LOOKUP,
new PackageLookupFunction(
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 8b54594..4e07552 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
@@ -145,7 +145,18 @@
FileSymlinkInfiniteExpansionUniquenessFunction.NAME,
new FileSymlinkInfiniteExpansionUniquenessFunction());
skyFunctions.put(
- SkyFunctions.PACKAGE, new PackageFunction(null, null, null, null, null, null, null));
+ SkyFunctions.PACKAGE,
+ new PackageFunction(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ /*packageProgress=*/ null,
+ PackageFunction.ActionOnIOExceptionReadingBuildFile.UseOriginalIOException.INSTANCE,
+ PackageFunction.IncrementalityIntent.INCREMENTAL));
skyFunctions.put(
SkyFunctions.PACKAGE_LOOKUP,
new PackageLookupFunction(
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 31932ec..e6f7f09 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
@@ -119,7 +119,18 @@
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY,
BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER));
skyFunctions.put(
- SkyFunctions.PACKAGE, new PackageFunction(null, null, null, null, null, null, null));
+ SkyFunctions.PACKAGE,
+ new PackageFunction(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ /*packageProgress=*/ null,
+ PackageFunction.ActionOnIOExceptionReadingBuildFile.UseOriginalIOException.INSTANCE,
+ PackageFunction.IncrementalityIntent.INCREMENTAL));
skyFunctions.put(
FileStateValue.FILE_STATE,
new FileStateFunction(
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 6778af8..1944074 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
@@ -166,7 +166,18 @@
new IgnoredPackagePrefixesFunction(
/*ignoredPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
skyFunctions.put(
- SkyFunctions.PACKAGE, new PackageFunction(null, null, null, null, null, null, null));
+ SkyFunctions.PACKAGE,
+ new PackageFunction(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ /*packageProgress=*/ null,
+ PackageFunction.ActionOnIOExceptionReadingBuildFile.UseOriginalIOException.INSTANCE,
+ PackageFunction.IncrementalityIntent.INCREMENTAL));
skyFunctions.put(
WorkspaceFileValue.WORKSPACE_FILE,
new WorkspaceFileFunction(
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 151d07d..3417196 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
@@ -278,7 +278,18 @@
BugReporter.defaultInstance()))
.put(
SkyFunctions.PACKAGE,
- new PackageFunction(null, null, null, null, null, null, null))
+ new PackageFunction(
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ /*packageProgress=*/ null,
+ PackageFunction.ActionOnIOExceptionReadingBuildFile.UseOriginalIOException
+ .INSTANCE,
+ PackageFunction.IncrementalityIntent.INCREMENTAL))
.put(
SkyFunctions.PACKAGE_LOOKUP,
new PackageLookupFunction(
