diff options
author | Michajlo Matijkiw <michajlo@google.com> | 2015-06-25 22:00:25 +0000 |
---|---|---|
committer | Han-Wen Nienhuys <hanwen@google.com> | 2015-06-26 15:30:05 +0000 |
commit | 02830406e9c58d80fd51901ae799f71df264d076 (patch) | |
tree | aee3f9c896f4f967046307d40714e66a37617365 /src/test/java/com/google/devtools/build/skyframe | |
parent | 6b0341e35d19024fa8471452c5a2a3ce405063ed (diff) |
Remove unused SkyFunctionName isComputed.
Removing since we don't appear to need it. Replaced SkyFunctionName.computed
with create to simplify changing everything. Moved all constructors using new
to use create for consistency. Chose create over new since it was less changes.
--
MOS_MIGRATED_REVID=96914199
Diffstat (limited to 'src/test/java/com/google/devtools/build/skyframe')
7 files changed, 8 insertions, 9 deletions
diff --git a/src/test/java/com/google/devtools/build/skyframe/CyclesReporterTest.java b/src/test/java/com/google/devtools/build/skyframe/CyclesReporterTest.java index 35bda02f15..6671dfbc66 100644 --- a/src/test/java/com/google/devtools/build/skyframe/CyclesReporterTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/CyclesReporterTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean; @RunWith(JUnit4.class) public class CyclesReporterTest { - private static final SkyKey DUMMY_KEY = new SkyKey(SkyFunctionName.computed("func"), "key"); + private static final SkyKey DUMMY_KEY = new SkyKey(SkyFunctionName.create("func"), "key"); @Test public void nullEventHandler() { diff --git a/src/test/java/com/google/devtools/build/skyframe/GraphConcurrencyTest.java b/src/test/java/com/google/devtools/build/skyframe/GraphConcurrencyTest.java index 66a1355f8e..1c9c8812f1 100644 --- a/src/test/java/com/google/devtools/build/skyframe/GraphConcurrencyTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/GraphConcurrencyTest.java @@ -47,7 +47,7 @@ import java.util.concurrent.Executors; public abstract class GraphConcurrencyTest { private static final SkyFunctionName SKY_FUNCTION_NAME = - new SkyFunctionName("GraphConcurrencyTestKey", /*isComputed=*/false); + SkyFunctionName.create("GraphConcurrencyTestKey"); private ProcessableGraph graph; private ThrowableRecordingRunnableWrapper wrapper; protected abstract ProcessableGraph getGraph(); diff --git a/src/test/java/com/google/devtools/build/skyframe/GraphTester.java b/src/test/java/com/google/devtools/build/skyframe/GraphTester.java index 6095bb8b80..b62acfef76 100644 --- a/src/test/java/com/google/devtools/build/skyframe/GraphTester.java +++ b/src/test/java/com/google/devtools/build/skyframe/GraphTester.java @@ -42,8 +42,7 @@ import javax.annotation.Nullable; */ public class GraphTester { - // TODO(bazel-team): Split this for computing and non-computing values? - public static final SkyFunctionName NODE_TYPE = new SkyFunctionName("Type", false); + public static final SkyFunctionName NODE_TYPE = SkyFunctionName.create("Type"); private final Map<SkyKey, TestFunction> values = new HashMap<>(); private final Set<SkyKey> modifiedValues = new LinkedHashSet<>(); diff --git a/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java b/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java index c6caa610d3..6d8d1d3b0f 100644 --- a/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java @@ -47,7 +47,7 @@ import javax.annotation.Nullable; @RunWith(JUnit4.class) public class InMemoryNodeEntryTest { - private static final SkyFunctionName NODE_TYPE = new SkyFunctionName("Type", false); + private static final SkyFunctionName NODE_TYPE = SkyFunctionName.create("Type"); private static final NestedSet<TaggedEvents> NO_EVENTS = NestedSetBuilder.<TaggedEvents>emptySet(Order.STABLE_ORDER); diff --git a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java index 35a11882de..e3c1069403 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java @@ -1483,8 +1483,8 @@ public class ParallelEvaluatorTest { @Test public void testFunctionCrashTrace() throws Exception { - final SkyFunctionName childType = new SkyFunctionName("child", false); - final SkyFunctionName parentType = new SkyFunctionName("parent", false); + final SkyFunctionName childType = SkyFunctionName.create("child"); + final SkyFunctionName parentType = SkyFunctionName.create("parent"); class ChildFunction implements SkyFunction { @Override diff --git a/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilTest.java b/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilTest.java index c537d58fec..efcbbec28c 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilTest.java @@ -32,7 +32,7 @@ import java.util.List; @RunWith(Parameterized.class) public class ReverseDepsUtilTest { - private static final SkyFunctionName NODE_TYPE = new SkyFunctionName("Type", false); + private static final SkyFunctionName NODE_TYPE = SkyFunctionName.create("Type"); private final int numElements; @Parameters diff --git a/src/test/java/com/google/devtools/build/skyframe/SkyKeyTest.java b/src/test/java/com/google/devtools/build/skyframe/SkyKeyTest.java index 0eeed132c2..d5b8335d84 100644 --- a/src/test/java/com/google/devtools/build/skyframe/SkyKeyTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/SkyKeyTest.java @@ -36,7 +36,7 @@ public class SkyKeyTest { assertThat(hashCodeSpy.getNumberOfTimesHashCodeCalled()).isEqualTo(0); // When a SkyKey is constructed with that HashCodeSpy as its argument, - SkyKey originalKey = new SkyKey(new SkyFunctionName("TEMP", true), hashCodeSpy); + SkyKey originalKey = new SkyKey(SkyFunctionName.create("TEMP"), hashCodeSpy); // Then the HashCodeSpy reports that its hashcode method was called once. assertThat(hashCodeSpy.getNumberOfTimesHashCodeCalled()).isEqualTo(1); |