commit cba16459185325284ccb4077408f764324a9afe1
author Janak Ramakrishnan <janakr@google.com> Fri Jul 29 02:17:02 2016 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Fri Jul 29 10:12:17 2016 +0000
tree 03b220c96962a19bc8f2d90a3d42fbe31bfea117
parent a1f2dab004358f4719d0db82eac9b7b6b35f313c

Remove FileArtifactValue#createWithDigest method now that empty files are always digested.

--
MOS_MIGRATED_REVID=128768429

src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
index 54b65cb..a64ec6d 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
@@ -31,7 +31,6 @@
 import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact;
 import com.google.devtools.build.lib.actions.ArtifactOwner;
 import com.google.devtools.build.lib.actions.Root;
-import com.google.devtools.build.lib.actions.cache.DigestUtils;
 import com.google.devtools.build.lib.actions.util.TestAction;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
@@ -62,12 +61,6 @@
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -77,8 +70,11 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
-
 import javax.annotation.Nullable;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Tests for {@link FilesystemValueChecker}.
@@ -711,11 +707,7 @@
           directoryData.put(output.getParent(), dirDatum);
         }
         FileValue fileValue = ActionMetadataHandler.fileValueFromArtifact(output, null, null);
-        // Always test with digests. TreeArtifact checking behavior doesn't depend on the
-        // presence/absence of digests. FileValue checking w/o digests is already tested.
-        byte[] digest = DigestUtils.getDigestOrFail(output.getPath(), 1);
-        dirDatum.put(output, FileArtifactValue.createWithDigest(
-            output.getPath(), digest, fileValue.getSize()));
+        dirDatum.put(output, FileArtifactValue.create(output, fileValue));
         fileData.put(output, fileValue);
       } catch (IOException e) {
         throw new IllegalStateException(e);