diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/skyframe')
3 files changed, 66 insertions, 2 deletions
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 f29537d032..1298c480f3 100644 --- a/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java @@ -14,6 +14,7 @@ package com.google.devtools.build.skyframe; import static com.google.common.truth.Truth.assertThat; +import static com.google.devtools.build.skyframe.NodeEntrySubjectFactory.assertThatNodeEntry; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -573,7 +574,7 @@ public class InMemoryNodeEntryTest { } @Test - public void noPruneWhenDepsChange() { + public void pruneWhenDepsChange() { NodeEntry entry = new InMemoryNodeEntry(); entry.addReverseDepAndCheckIfDone(null); // Start evaluation. SkyKey dep = key("dep"); @@ -593,7 +594,7 @@ public class InMemoryNodeEntryTest { assertTrue(entry.signalDep(IntVersion.of(1L))); setValue(entry, new IntegerValue(5), /*errorInfo=*/null, /*graphVersion=*/1L); assertTrue(entry.isDone()); - assertEquals("Version increments when deps change", IntVersion.of(1L), entry.getVersion()); + assertThatNodeEntry(entry).hasVersionThat().isEqualTo(IntVersion.of(0L)); } @Test diff --git a/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java b/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java new file mode 100644 index 0000000000..537d738c94 --- /dev/null +++ b/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java @@ -0,0 +1,33 @@ +// Copyright 2016 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package com.google.devtools.build.skyframe; + +import com.google.common.truth.DefaultSubject; +import com.google.common.truth.FailureStrategy; +import com.google.common.truth.Subject; +import com.google.common.truth.Truth; + +/** + * {@link Subject} for {@link NodeEntry}. Please add to this class if you need more + * functionality! + */ +public class NodeEntrySubject extends Subject<NodeEntrySubject, NodeEntry> { + public NodeEntrySubject(FailureStrategy failureStrategy, NodeEntry nodeEntry) { + super(failureStrategy, nodeEntry); + } + + DefaultSubject hasVersionThat() { + return Truth.assertThat(getSubject().getVersion()).named("Version for " + getDisplaySubject()); + } +} diff --git a/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubjectFactory.java b/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubjectFactory.java new file mode 100644 index 0000000000..7278085a96 --- /dev/null +++ b/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubjectFactory.java @@ -0,0 +1,30 @@ +// Copyright 2016 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package com.google.devtools.build.skyframe; + +import com.google.common.truth.FailureStrategy; +import com.google.common.truth.SubjectFactory; +import com.google.common.truth.Truth; + +/** {@link SubjectFactory} for {@link NodeEntry} objects, providing {@link NodeEntrySubject}s. */ +public class NodeEntrySubjectFactory extends SubjectFactory<NodeEntrySubject, NodeEntry> { + public static NodeEntrySubject assertThatNodeEntry(NodeEntry nodeEntry) { + return Truth.assertAbout(new NodeEntrySubjectFactory()).that(nodeEntry); + } + + @Override + public NodeEntrySubject getSubject(FailureStrategy failureStrategy, NodeEntry nodeEntry) { + return new NodeEntrySubject(failureStrategy, nodeEntry); + } +} |