diff options
author | 2017-12-14 12:51:10 -0800 | |
---|---|---|
committer | 2017-12-14 12:53:23 -0800 | |
commit | 82e68b75304438c96ff878a0c2b8d18b42002486 (patch) | |
tree | 0984b21536f07a5ab3a8ae62235201c58afb431b /src/test/java/com/google/devtools/build/lib/packages | |
parent | b5fd7611017f95e1303aa1f2c4a0a2962f2cc4eb (diff) |
Make FileSystem operate on LocalPath instead of Path.
PiperOrigin-RevId: 179082062
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java | 3 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryTestBase.java | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java index bbb8be7e82..7f1f342d5e 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java @@ -28,6 +28,7 @@ import com.google.devtools.build.lib.packages.util.PackageFactoryApparatus; import com.google.devtools.build.lib.packages.util.PackageFactoryTestBase; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.testutil.TestUtils; +import com.google.devtools.build.lib.vfs.LocalPath; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.ArrayList; @@ -999,7 +1000,7 @@ public class PackageFactoryTest extends PackageFactoryTestBase { scratch.file("/e/BUILD", "sh_library(name = 'e', data = glob(['*.txt']))"); Path parentDir = buildFile.getParentDirectory(); scratch.file("/e/data.txt"); - throwOnReaddir = parentDir; + throwOnReaddir = LocalPath.create(parentDir.getPathString()); try { packages.createPackage("e", buildFile); } catch (NoSuchPackageException expected) { diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryTestBase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryTestBase.java index eb614fc49c..fa5e7605ac 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryTestBase.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryTestBase.java @@ -39,6 +39,7 @@ import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.vfs.Dirent; import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.FileSystemUtils; +import com.google.devtools.build.lib.vfs.LocalPath; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; import java.io.FileNotFoundException; @@ -80,7 +81,7 @@ public abstract class PackageFactoryTestBase { protected abstract PackageFactoryApparatus createPackageFactoryApparatus(); - protected Path throwOnReaddir = null; + protected LocalPath throwOnReaddir = null; protected static AttributeMap attributes(Rule rule) { return RawAttributeMapper.of(rule); @@ -122,7 +123,8 @@ public abstract class PackageFactoryTestBase { FileSystem fs = new InMemoryFileSystem() { @Override - public Collection<Dirent> readdir(Path path, boolean followSymlinks) throws IOException { + public Collection<Dirent> readdir(LocalPath path, boolean followSymlinks) + throws IOException { if (path.equals(throwOnReaddir)) { throw new FileNotFoundException(path.getPathString()); } |