commit 1ad91a15dfff6ea67e1840e8f13ded70d53872e9
author cpovirk <cpovirk@google.com> Wed Apr 24 05:51:36 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Apr 24 05:52:52 2019 -0700
tree 0a030d474e831e97561a459a6e42968959a20c71
parent 5be73427ef40c3a7b1847babaccea28d667b7dba

Automatic code cleanup.

PiperOrigin-RevId: 245029534

src/test/java/com/google/devtools/build/skyframe/CycleInfoSubject.java

diff --git a/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubject.java b/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubject.java
index e82479f..ed0e9bc 100644
--- a/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubject.java
+++ b/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubject.java
@@ -16,7 +16,6 @@
 import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.IterableSubject;
 import com.google.common.truth.Subject;
-import com.google.common.truth.Truth;
 import javax.annotation.Nullable;
 
 /**
@@ -28,11 +27,12 @@
   }
 
   public IterableSubject hasPathToCycleThat() {
-    return Truth.assertThat(getSubject().getPathToCycle())
+    return check("getPathToCycle()")
+        .that(getSubject().getPathToCycle())
         .named("Path to cycle in " + actualAsString());
   }
 
   public IterableSubject hasCycleThat() {
-    return Truth.assertThat(getSubject().getCycle()).named("Cycle in " + actualAsString());
+    return check("getCycle()").that(getSubject().getCycle()).named("Cycle in " + actualAsString());
   }
 }

src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubject.java

diff --git a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubject.java b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubject.java
index c5f3f5a..da8f1fd 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubject.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubject.java
@@ -19,7 +19,6 @@
 import com.google.common.truth.IterableSubject;
 import com.google.common.truth.Subject;
 import com.google.common.truth.ThrowableSubject;
-import com.google.common.truth.Truth;
 
 /**
  * {@link Subject} for {@link ErrorInfo}. Please add to this class if you need more
@@ -31,12 +30,16 @@
   }
 
   public ThrowableSubject hasExceptionThat() {
-    return Truth.assertThat(getSubject().getException()).named("Exception in " + actualAsString());
+    return check("getException()")
+        .that(getSubject().getException())
+        .named("Exception in " + actualAsString());
   }
 
   public IterableSubject hasCycleInfoThat() {
     isNotNull();
-    return Truth.assertThat(getSubject().getCycleInfo()).named("CycleInfo in " + actualAsString());
+    return check("getCycleInfo()")
+        .that(getSubject().getCycleInfo())
+        .named("CycleInfo in " + actualAsString());
   }
 
   public void rootCauseOfExceptionIs(SkyKey key) {

src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java

diff --git a/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java b/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java
index 7b4c6eb..07298b2 100644
--- a/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java
+++ b/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java
@@ -32,7 +32,7 @@
   }
 
   public DefaultSubject hasVersionThat() {
-    return assertThat(getSubject().getVersion()).named(detail("Version"));
+    return check("getVersion()").that(getSubject().getVersion()).named(detail("Version"));
   }
 
   public IterableSubject hasTemporaryDirectDepsThat() {