Return ErrorInfoSubject for EvaluationResultSubject#hasErrorEntryForKeyThat instead of DefaultSubject.

--
MOS_MIGRATED_REVID=118261285

2 files changed, 9 insertions, 5 deletions

diff --git a/src/test/java/com/google/devtools/build/skyframe/BUILD b/src/test/java/com/google/devtools/build/skyframe/BUILD
index cbe8e9d905..c4e9e40d67 100644
--- a/src/test/java/com/google/devtools/build/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/skyframe/BUILD
@@ -1,5 +1,7 @@
 TESTUTIL_FILES = [
     "DeterministicInMemoryGraph.java",
+    "ErrorInfoSubject.java",
+    "ErrorInfoSubjectFactory.java",
     "EvaluationResultSubject.java",
     "EvaluationResultSubjectFactory.java",
     "NotifyingInMemoryGraph.java",
diff --git a/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubject.java b/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubject.java
index 7980ef5e95..4d54c0a86b 100644
--- a/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubject.java
+++ b/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubject.java
@@ -13,12 +13,14 @@
 // limitations under the License.
 package com.google.devtools.build.skyframe;
 
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.skyframe.ErrorInfoSubjectFactory.assertThatErrorInfo;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.truth.DefaultSubject;
 import com.google.common.truth.FailureStrategy;
 import com.google.common.truth.IterableSubject;
 import com.google.common.truth.Subject;
-import com.google.common.truth.Truth;
 
 /**
  * {@link Subject} for {@link EvaluationResult}. Please add to this class if you need more
@@ -43,16 +45,16 @@ public class EvaluationResultSubject extends Subject<EvaluationResultSubject, Ev
   }
 
   public DefaultSubject hasEntryThat(SkyKey key) {
-    return Truth.assertThat(getSubject().get(key)).named("Entry for " + getDisplaySubject());
+    return assertThat(getSubject().get(key)).named("Entry for " + getDisplaySubject());
   }
 
-  public DefaultSubject hasErrorEntryForKeyThat(SkyKey key) {
-    return Truth.assertThat(getSubject().getError(key))
+  public ErrorInfoSubject hasErrorEntryForKeyThat(SkyKey key) {
+    return assertThatErrorInfo(getSubject().getError(key))
         .named("Error entry for " + getDisplaySubject());
   }
 
   public IterableSubject hasDirectDepsInGraphThat(SkyKey parent) {
-    return Truth.assertThat(
+    return assertThat(
             getSubject().getWalkableGraph().getDirectDeps(ImmutableList.of(parent)).get(parent))
         .named("Direct deps for " + parent + " in " + getDisplaySubject());
   }