diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/pkgcache')
7 files changed, 31 insertions, 20 deletions
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 7ebb3c2cb1..aaf0c5f9b3 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 @@ -40,6 +40,7 @@ import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.ModifiedFileSet; import com.google.devtools.build.lib.vfs.Path; +import com.google.devtools.build.lib.vfs.Root; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; import com.google.devtools.common.options.OptionsParser; import java.nio.charset.StandardCharsets; @@ -137,7 +138,7 @@ public class BuildFileModificationTest extends FoundationTestCase { private void invalidatePackages() throws InterruptedException { skyframeExecutor.invalidateFilesUnderPathForTesting( - reporter, ModifiedFileSet.EVERYTHING_MODIFIED, rootDirectory); + reporter, ModifiedFileSet.EVERYTHING_MODIFIED, Root.fromPath(rootDirectory)); } private Package getPackage(String packageName) diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IOExceptionsTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IOExceptionsTest.java index 184f22201b..40324ad625 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/IOExceptionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IOExceptionsTest.java @@ -28,6 +28,7 @@ import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.ModifiedFileSet; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; +import com.google.devtools.build.lib.vfs.Root; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; import com.google.devtools.build.skyframe.EvaluationResult; import com.google.devtools.build.skyframe.SkyKey; @@ -75,7 +76,7 @@ public class IOExceptionsTest extends PackageLoadingTestCase { protected void syncPackages() throws Exception { skyframeExecutor.invalidateFilesUnderPathForTesting( - reporter, ModifiedFileSet.EVERYTHING_MODIFIED, rootDirectory); + reporter, ModifiedFileSet.EVERYTHING_MODIFIED, Root.fromPath(rootDirectory)); } @Override 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 6e83bbedca..d4373b4f5e 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 @@ -51,6 +51,7 @@ import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.ModifiedFileSet; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; +import com.google.devtools.build.lib.vfs.Root; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; import com.google.devtools.build.skyframe.SkyFunction; import com.google.devtools.build.skyframe.SkyFunctionName; @@ -439,8 +440,8 @@ public class IncrementalLoadingTest { private class ManualDiffAwarenessFactory implements DiffAwareness.Factory { @Nullable @Override - public DiffAwareness maybeCreate(Path pathEntry) { - return pathEntry == workspace ? new ManualDiffAwareness() : null; + public DiffAwareness maybeCreate(Root pathEntry) { + return pathEntry.asPath().equals(workspace) ? new ManualDiffAwareness() : null; } } @@ -494,7 +495,7 @@ public class IncrementalLoadingTest { skyframeExecutor.preparePackageLoading( new PathPackageLocator( outputBase, - ImmutableList.of(workspace), + ImmutableList.of(Root.fromPath(workspace)), BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY), packageCacheOptions, Options.getDefaults(SkylarkSemanticsOptions.class), @@ -585,7 +586,7 @@ public class IncrementalLoadingTest { skyframeExecutor.preparePackageLoading( new PathPackageLocator( outputBase, - ImmutableList.of(workspace), + ImmutableList.of(Root.fromPath(workspace)), BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY), packageCacheOptions, Options.getDefaults(SkylarkSemanticsOptions.class), @@ -595,7 +596,7 @@ public class IncrementalLoadingTest { ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); skyframeExecutor.invalidateFilesUnderPathForTesting( - new Reporter(new EventBus()), modifiedFileSet, workspace); + new Reporter(new EventBus()), modifiedFileSet, Root.fromPath(workspace)); ((SequencedSkyframeExecutor) skyframeExecutor).handleDiffs(new Reporter(new EventBus())); changes.clear(); 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 3a4943a8c9..c2180ef14f 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 @@ -55,6 +55,7 @@ import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.ModifiedFileSet; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; +import com.google.devtools.build.lib.vfs.Root; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; import com.google.devtools.common.options.Options; import com.google.devtools.common.options.OptionsParser; @@ -749,7 +750,8 @@ public class LoadingPhaseRunnerTest { builder.modify(workspacePath); } ModifiedFileSet modified = builder.build(); - skyframeExecutor.invalidateFilesUnderPathForTesting(storedErrors, modified, workspace); + skyframeExecutor.invalidateFilesUnderPathForTesting( + storedErrors, modified, Root.fromPath(workspace)); changes.clear(); } 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 8fd9d55c8e..9134e4df79 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 @@ -48,6 +48,7 @@ import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor; import com.google.devtools.build.lib.vfs.ModifiedFileSet; import com.google.devtools.build.lib.vfs.Path; +import com.google.devtools.build.lib.vfs.Root; import com.google.devtools.common.options.InvocationPolicyEnforcer; import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.OptionsParsingException; @@ -170,7 +171,7 @@ public class PackageCacheTest extends FoundationTestCase { private void invalidatePackages() throws InterruptedException { skyframeExecutor.invalidateFilesUnderPathForTesting( - reporter, ModifiedFileSet.EVERYTHING_MODIFIED, rootDirectory); + reporter, ModifiedFileSet.EVERYTHING_MODIFIED, Root.fromPath(rootDirectory)); } private Package getPackage(String packageName) @@ -336,7 +337,7 @@ public class PackageCacheTest extends FoundationTestCase { Package oldPkg = getPackage("pkg"); assertThat(getPackage("pkg")).isSameAs(oldPkg); // change not yet visible assertThat(oldPkg.getFilename()).isEqualTo(buildFile1); - assertThat(oldPkg.getSourceRoot()).isEqualTo(rootDirectory); + assertThat(oldPkg.getSourceRoot()).isEqualTo(Root.fromPath(rootDirectory)); buildFile1.delete(); invalidatePackages(); @@ -344,7 +345,7 @@ public class PackageCacheTest extends FoundationTestCase { Package newPkg = getPackage("pkg"); assertThat(newPkg).isNotSameAs(oldPkg); assertThat(newPkg.getFilename()).isEqualTo(buildFile2); - assertThat(newPkg.getSourceRoot()).isEqualTo(scratch.dir("/otherroot")); + assertThat(newPkg.getSourceRoot()).isEqualTo(Root.fromPath(scratch.dir("/otherroot"))); // TODO(bazel-team): (2009) test BUILD file moves in the other direction too. } diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PathPackageLocatorTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PathPackageLocatorTest.java index 13faa5fd77..1cac35349c 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/PathPackageLocatorTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PathPackageLocatorTest.java @@ -24,6 +24,7 @@ import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants; import com.google.devtools.build.lib.testutil.FoundationTestCase; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; +import com.google.devtools.build.lib.vfs.Root; import com.google.devtools.build.lib.vfs.UnixGlob; import java.io.IOException; import java.util.Arrays; @@ -159,12 +160,12 @@ public class PathPackageLocatorTest extends FoundationTestCase { locator = new PathPackageLocator( outputBase, - ImmutableList.of(rootDir1, rootDir2), + ImmutableList.of(Root.fromPath(rootDir1), Root.fromPath(rootDir2)), BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY); locatorWithSymlinks = new PathPackageLocator( outputBase, - ImmutableList.of(rootDir3), + ImmutableList.of(Root.fromPath(rootDir3)), BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY); } @@ -308,10 +309,10 @@ public class PathPackageLocatorTest extends FoundationTestCase { BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY) .getPathEntries()) .containsExactly( - belowClient, - clientPath, - workspace.getRelative("somewhere"), - clientPath.getRelative("below")) + Root.fromPath(belowClient), + Root.fromPath(clientPath), + Root.fromPath(workspace.getRelative("somewhere")), + Root.fromPath(clientPath.getRelative("below"))) .inOrder(); } diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/TargetPatternEvaluatorTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/TargetPatternEvaluatorTest.java index fb8a3cb622..f6ec361cd6 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/TargetPatternEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/TargetPatternEvaluatorTest.java @@ -32,6 +32,7 @@ import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.vfs.ModifiedFileSet; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; +import com.google.devtools.build.lib.vfs.Root; import java.util.Arrays; import java.util.Set; import org.junit.Before; @@ -136,12 +137,15 @@ public class TargetPatternEvaluatorTest extends AbstractTargetPatternEvaluatorTe } private void invalidate(String file) throws InterruptedException { - skyframeExecutor.invalidateFilesUnderPathForTesting(reporter, - ModifiedFileSet.builder().modify(PathFragment.create(file)).build(), rootDirectory); + skyframeExecutor.invalidateFilesUnderPathForTesting( + reporter, + ModifiedFileSet.builder().modify(PathFragment.create(file)).build(), + Root.fromPath(rootDirectory)); } private void invalidate(ModifiedFileSet modifiedFileSet) throws InterruptedException { - skyframeExecutor.invalidateFilesUnderPathForTesting(reporter, modifiedFileSet, rootDirectory); + skyframeExecutor.invalidateFilesUnderPathForTesting( + reporter, modifiedFileSet, Root.fromPath(rootDirectory)); } private void setDeletedPackages(Set<PackageIdentifier> deletedPackages) { |