diff options
| author |  ccalvarin <ccalvarin@google.com> | 2018-07-26 14:38:51 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-26 14:40:16 -0700 |
| commit | 7e87730de985b7099b9b683571d58efdaab70890 (patch) | |
| tree | 42f4bba0c0f6d99455a68fc6beead8d2edb8fc08 /src/test/java/com/google/devtools/build/lib/util | |
| parent | 0ccfde8b8bb646166a4f45c8630e8fe174f764f4 (diff) | |
Remove default MD5 in most of Bazel's virtual filesystems.
This forces the ex-default to be explicit in a lot of tests, but I'd rather that than have the risk of implicit md5-use in production code.
To keep this CL smaller, do not remove the default from UnixFS quite yet.
RELNOTES: None.
PiperOrigin-RevId: 206223521
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/util')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/util/FileTypeTest.java | 3 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/util/FingerprintTest.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/util/FileTypeTest.java b/src/test/java/com/google/devtools/build/lib/util/FileTypeTest.java index 9662ca5fa6..fa6faf8353 100644 --- a/src/test/java/com/google/devtools/build/lib/util/FileTypeTest.java +++ b/src/test/java/com/google/devtools/build/lib/util/FileTypeTest.java @@ -19,6 +19,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.devtools.build.lib.util.FileType.HasFileType; +import com.google.devtools.build.lib.vfs.DigestHashFunction; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; @@ -83,7 +84,7 @@ public class FileTypeTest { @Test public void handlesPathObjects() { - Path readme = new InMemoryFileSystem().getPath("/readme.txt"); + Path readme = new InMemoryFileSystem(DigestHashFunction.MD5).getPath("/readme.txt"); assertThat(TEXT.matches(readme)).isTrue(); } diff --git a/src/test/java/com/google/devtools/build/lib/util/FingerprintTest.java b/src/test/java/com/google/devtools/build/lib/util/FingerprintTest.java index 372b48d80c..c5dd670344 100644 --- a/src/test/java/com/google/devtools/build/lib/util/FingerprintTest.java +++ b/src/test/java/com/google/devtools/build/lib/util/FingerprintTest.java @@ -18,6 +18,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.clock.BlazeClock; +import com.google.devtools.build.lib.vfs.DigestHashFunction; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; @@ -116,7 +117,7 @@ public class FingerprintTest { PathFragment pf = PathFragment.create("/etc/pwd"); assertThat(new Fingerprint().addPath(pf).hexDigestAndReset()) .isEqualTo("63ab5c47c117635407a1af6377e216bc"); - Path p = new InMemoryFileSystem(BlazeClock.instance()).getPath(pf); + Path p = new InMemoryFileSystem(BlazeClock.instance(), DigestHashFunction.MD5).getPath(pf); assertThat(new Fingerprint().addPath(p).hexDigestAndReset()) .isEqualTo("63ab5c47c117635407a1af6377e216bc"); } |