Use the path resolver when dealing with tree artifacts.

RELNOTES: None
PiperOrigin-RevId: 206157591

3 files changed, 11 insertions, 8 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/exec/SingleBuildFileCacheTest.java b/src/test/java/com/google/devtools/build/lib/exec/SingleBuildFileCacheTest.java
index e7b0937f95..c3fa2dbc4b 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/SingleBuildFileCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/SingleBuildFileCacheTest.java
@@ -72,6 +72,11 @@ public class SingleBuildFileCacheTest {
             byte[] override = md5Overrides.get(path.getPathString());
             return override != null ? override : super.getDigest(path);
           }
+
+          @Override
+          protected byte[] getFastDigest(Path path) throws IOException {
+            return null;
+          }
         };
     underTest = new SingleBuildFileCache("/", fs);
     FileSystemUtils.createEmptyFile(fs.getPath("/empty"));
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/TargetPatternEvaluatorIOTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/TargetPatternEvaluatorIOTest.java
index 37a992d405..f2a7233b69 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/TargetPatternEvaluatorIOTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/TargetPatternEvaluatorIOTest.java
@@ -159,8 +159,12 @@ public class TargetPatternEvaluatorIOTest extends AbstractTargetPatternEvaluator
             }
 
             @Override
-            public long getSize() throws IOException {
-              return stat.getSize();
+            public long getSize()  {
+              try {
+                return stat.getSize();
+              } catch (IOException e) {
+                throw new IllegalStateException(e);
+              }
             }
 
             @Override
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
index f279e84e3e..443c922f94 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
@@ -57,7 +57,6 @@ public abstract class FileSystemTest {
 
   @Before
   public final void createDirectories() throws Exception  {
-    executeBeforeCreatingDirectories();
     testFS = getFreshFileSystem();
     workingDir = testFS.getPath(getTestTmpDir());
     cleanUpWorkingDirectory(workingDir);
@@ -81,11 +80,6 @@ public abstract class FileSystemTest {
     xEmptyDirectory.createDirectory();
   }
 
-  protected void executeBeforeCreatingDirectories() throws Exception {
-    // This method exists because LazyDigestFileSystemTest requires some code to be run before
-    // createDirectories().
-  }
-
   @After
   public final void destroyFileSystem() throws Exception  {
     destroyFileSystem(testFS);