diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe')
5 files changed, 33 insertions, 45 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java index 790429a735..1b725b367a 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java @@ -35,7 +35,7 @@ import com.google.devtools.build.lib.analysis.actions.SpawnActionTemplate; import com.google.devtools.build.lib.analysis.actions.SpawnActionTemplate.OutputPathMapper; import com.google.devtools.build.lib.events.NullEventHandler; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; -import com.google.devtools.build.lib.skyframe.ArtifactValue.OwnedArtifact; +import com.google.devtools.build.lib.skyframe.ArtifactSkyKey.OwnedArtifact; import com.google.devtools.build.lib.testutil.FoundationTestCase; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.vfs.Path; @@ -49,22 +49,20 @@ import com.google.devtools.build.skyframe.SkyFunction; 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.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** Tests for {@link ActionTemplateExpansionFunction}. */ @RunWith(JUnit4.class) public final class ActionTemplateExpansionFunctionTest extends FoundationTestCase { - private Map<Artifact, ArtifactValue> artifactValueMap; + private Map<Artifact, TreeArtifactValue> artifactValueMap; private SequentialBuildDriver driver; @Before @@ -225,9 +223,9 @@ public final class ActionTemplateExpansionFunctionTest extends FoundationTestCas /** Dummy ArtifactFunction that just returns injected values */ private static class DummyArtifactFunction implements SkyFunction { - private final Map<Artifact, ArtifactValue> artifactValueMap; + private final Map<Artifact, TreeArtifactValue> artifactValueMap; - DummyArtifactFunction(Map<Artifact, ArtifactValue> artifactValueMap) { + DummyArtifactFunction(Map<Artifact, TreeArtifactValue> artifactValueMap) { this.artifactValueMap = artifactValueMap; } @Override diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java index 1ba51c8bde..dcd7a3359b 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java @@ -49,12 +49,6 @@ import com.google.devtools.build.skyframe.EvaluationResult; import com.google.devtools.build.skyframe.SkyFunction; 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.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -62,6 +56,10 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for {@link ArtifactFunction}. @@ -185,8 +183,8 @@ public class ArtifactFunctionTest extends ArtifactFunctionTestCase { file(input1.getPath(), "source contents"); evaluate( Iterables.toArray( - ArtifactValue.mandatoryKeys(ImmutableSet.of(input2, input1, input2)), SkyKey.class)); - ArtifactValue value = evaluateArtifactValue(output); + ArtifactSkyKey.mandatoryKeys(ImmutableSet.of(input2, input1, input2)), SkyKey.class)); + SkyValue value = evaluateArtifactValue(output); assertThat(((AggregatingArtifactValue) value).getInputs()) .containsExactly(Pair.of(input1, create(input1)), Pair.of(input2, create(input2))); } @@ -247,7 +245,7 @@ public class ArtifactFunctionTest extends ArtifactFunctionTestCase { try { value.getModifiedTime(); fail("mtime for non-empty file should not be stored."); - } catch (IllegalStateException e) { + } catch (UnsupportedOperationException e) { // Expected. } } @@ -451,14 +449,13 @@ public class ArtifactFunctionTest extends ArtifactFunctionTestCase { return ((FileArtifactValue) evaluateArtifactValue(artifact)); } - private ArtifactValue evaluateArtifactValue(Artifact artifact) throws Throwable { + private SkyValue evaluateArtifactValue(Artifact artifact) throws Throwable { return evaluateArtifactValue(artifact, /*isMandatory=*/ true); } - private ArtifactValue evaluateArtifactValue(Artifact artifact, boolean mandatory) - throws Throwable { - SkyKey key = ArtifactValue.key(artifact, mandatory); - EvaluationResult<ArtifactValue> result = evaluate(ImmutableList.of(key).toArray(new SkyKey[0])); + private SkyValue evaluateArtifactValue(Artifact artifact, boolean mandatory) throws Throwable { + SkyKey key = ArtifactSkyKey.key(artifact, mandatory); + EvaluationResult<SkyValue> result = evaluate(ImmutableList.of(key).toArray(new SkyKey[0])); if (result.hasError()) { throw result.getError().getException(); } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java index 17a273ebe5..de989417da 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java @@ -40,12 +40,6 @@ import com.google.devtools.build.skyframe.EvaluationProgressReceiver.EvaluationS import com.google.devtools.build.skyframe.SkyFunction.Environment; 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.io.InputStream; import java.io.OutputStream; @@ -53,8 +47,11 @@ import java.nio.charset.StandardCharsets; import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; - 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 SkyframeAwareAction}. */ @RunWith(JUnit4.class) @@ -740,7 +737,7 @@ public class SkyframeAwareActionTest extends TimestampBuilderTestCase { // ArtifactFunction(genfiles/gen0) | return FileValue(genfiles/foo:non-existent) // CONFIGURED_TARGET://foo:gen0 | // ACTION_EXECUTION:gen0_action | MockFunction() - // return ArtifactValue(genfiles/gen0) | FILE:genfiles/foo + // return ArtifactSkyKey(genfiles/gen0) | FILE:genfiles/foo // | FILE:genfiles/foo/bar/gen1 // ActionExecutionFunction(gen1_action) | env.valuesMissing():yes ==> return // ARTIFACT:genfiles/gen0 | diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index de3984d617..037a9e8620 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java @@ -73,9 +73,6 @@ import com.google.devtools.build.skyframe.SkyFunctionException; 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 java.io.IOException; import java.io.PrintStream; import java.util.ArrayList; @@ -88,8 +85,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; - import javax.annotation.Nullable; +import org.junit.Before; /** * The common code that's shared between various builder tests. @@ -203,9 +200,8 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { return new Builder() { private void setGeneratingActions() { if (evaluator.getExistingValueForTesting(OWNER_KEY) == null) { - differencer.inject(ImmutableMap.of( - OWNER_KEY, - new ActionLookupValue(ImmutableList.copyOf(actions)))); + differencer.inject( + ImmutableMap.of(OWNER_KEY, new ActionLookupValue(ImmutableList.copyOf(actions)))); } } @@ -229,11 +225,12 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { executor, keepGoing, /*explain=*/ false, - new ActionCacheChecker(actionCache, null, ALWAYS_EXECUTE_FILTER, false), null); + new ActionCacheChecker(actionCache, null, ALWAYS_EXECUTE_FILTER, false), + null); List<SkyKey> keys = new ArrayList<>(); for (Artifact artifact : artifacts) { - keys.add(ArtifactValue.key(artifact, true)); + keys.add(ArtifactSkyKey.key(artifact, true)); } setGeneratingActions(); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java index 3fe2c2b412..8d8b5115e7 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java @@ -188,10 +188,9 @@ public class TreeArtifactMetadataTest extends ArtifactFunctionTestCase { return output; } - private ArtifactValue evaluateArtifactValue(Artifact artifact, boolean mandatory) - throws Exception { - SkyKey key = ArtifactValue.key(artifact, mandatory); - EvaluationResult<ArtifactValue> result = evaluate(key); + private SkyValue evaluateArtifactValue(Artifact artifact, boolean mandatory) throws Exception { + SkyKey key = ArtifactSkyKey.key(artifact, mandatory); + EvaluationResult<SkyValue> result = evaluate(key); if (result.hasError()) { throw result.getError().getException(); } |