diff options
Diffstat (limited to 'src/test/java/com/google')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryFunctionTest.java | 4 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java | 14 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryFunctionTest.java index 722067011e..929531ed43 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryFunctionTest.java @@ -125,12 +125,12 @@ public class RepositoryFunctionTest extends BuildViewTestCase { RootedPath path = RootedPath.toRootedPath(rootDirectory, scratch.file("foo", "bar")); // Digest should be returned if the FileStateValue has it. - FileStateValue fsv = new RegularFileStateValue(3, 100, new byte[] {1, 2, 3, 4}, null); + FileStateValue fsv = new RegularFileStateValue(3, new byte[] {1, 2, 3, 4}, null); FileValue fv = new RegularFileValue(path, fsv); assertThat(RepositoryFunction.fileValueToMarkerValue(fv)).isEqualTo("01020304"); // Digest should also be returned if the FileStateValue doesn't have it. - fsv = new RegularFileStateValue(3, 100, null, new FileContentsProxy(100, 200)); + fsv = new RegularFileStateValue(3, null, new FileContentsProxy(100, 200)); fv = new RegularFileValue(path, fsv); String expectedDigest = BaseEncoding.base16().lowerCase().encode(path.asPath().getDigest()); assertThat(RepositoryFunction.fileValueToMarkerValue(fv)).isEqualTo(expectedDigest); 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 052b59105a..0a0b460cd4 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 @@ -452,8 +452,6 @@ public class FileFunctionTest { p.setLastModifiedTime(0L); FileValue a = valueForPath(p); p.setLastModifiedTime(1L); - assertThat(valueForPath(p)).isNotEqualTo(a); - p.setLastModifiedTime(0L); assertThat(valueForPath(p)).isEqualTo(a); FileSystemUtils.writeContentAsLatin1(p, "content"); // Same digest, but now non-empty. @@ -471,7 +469,7 @@ public class FileFunctionTest { assertThat(value.getDigest()).isNull(); p.setLastModifiedTime(10L); - assertThat(valueForPath(p)).isNotEqualTo(value); + assertThat(valueForPath(p)).isEqualTo(value); p.setLastModifiedTime(0L); assertThat(valueForPath(p)).isEqualTo(value); @@ -499,16 +497,6 @@ public class FileFunctionTest { } @Test - public void testFileModificationModTime() throws Exception { - fastDigest = false; - Path p = file("file"); - FileValue a = valueForPath(p); - p.setLastModifiedTime(42); - FileValue b = valueForPath(p); - assertThat(a.equals(b)).isFalse(); - } - - @Test public void testFileModificationDigest() throws Exception { fastDigest = true; Path p = file("file"); |