Automatic code cleanup.

PiperOrigin-RevId: 246168944
davido · May 1, 2019 · e0c8c82 · e0c8c82
1 parent 2e97cc3
commit e0c8c82
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubject.java b/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubject.java
@@ -28,11 +28,13 @@ public class CycleInfoSubject extends Subject<CycleInfoSubject, CycleInfo> {
 
   public IterableSubject hasPathToCycleThat() {
     return check("getPathToCycle()")
-        .that(getSubject().getPathToCycle())
-        .named("Path to cycle in " + actualAsString());
+        .withMessage("Path to cycle in " + actualAsString())
+        .that(getSubject().getPathToCycle());
   }
 
   public IterableSubject hasCycleThat() {
-    return check("getCycle()").that(getSubject().getCycle()).named("Cycle in " + actualAsString());
+    return check("getCycle()")
+        .withMessage("Cycle in " + actualAsString())
+        .that(getSubject().getCycle());
   }
 }
diff --git a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubject.java b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubject.java
@@ -31,15 +31,15 @@ public ErrorInfoSubject(FailureMetadata failureMetadata, ErrorInfo errorInfo) {
 
   public ThrowableSubject hasExceptionThat() {
     return check("getException()")
-        .that(getSubject().getException())
-        .named("Exception in " + actualAsString());
+        .withMessage("Exception in " + actualAsString())
+        .that(getSubject().getException());
   }
 
   public IterableSubject hasCycleInfoThat() {
     isNotNull();
     return check("getCycleInfo()")
-        .that(getSubject().getCycleInfo())
-        .named("CycleInfo in " + actualAsString());
+        .withMessage("CycleInfo in " + actualAsString())
+        .that(getSubject().getCycleInfo());
   }
 
   public void rootCauseOfExceptionIs(SkyKey key) {

diff --git a/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubject.java b/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubject.java
@@ -14,11 +14,10 @@
 package com.google.devtools.build.skyframe;
 
 import static com.google.common.truth.Fact.simpleFact;
-import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 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.FailureMetadata;
 import com.google.common.truth.IterableSubject;
 import com.google.common.truth.Subject;
@@ -45,8 +44,8 @@ public void hasNoError() {
     }
   }
 
-  public DefaultSubject hasEntryThat(SkyKey key) {
-    return assertThat(getSubject().get(key)).named("Entry for " + actualAsString());
+  public Subject<?, ?> hasEntryThat(SkyKey key) {
+    return assertWithMessage("Entry for " + actualAsString()).that(getSubject().get(key));
   }
 
   public ErrorInfoSubject hasErrorEntryForKeyThat(SkyKey key) {
@@ -55,14 +54,12 @@ public ErrorInfoSubject hasErrorEntryForKeyThat(SkyKey key) {
   }
 
   public IterableSubject hasDirectDepsInGraphThat(SkyKey parent) throws InterruptedException {
-    return assertThat(
-            getSubject().getWalkableGraph().getDirectDeps(ImmutableList.of(parent)).get(parent))
-        .named("Direct deps for " + parent + " in " + actualAsString());
+    return assertWithMessage("Direct deps for " + parent + " in " + actualAsString())
+        .that(getSubject().getWalkableGraph().getDirectDeps(ImmutableList.of(parent)).get(parent));
   }
 
   public IterableSubject hasReverseDepsInGraphThat(SkyKey child) throws InterruptedException {
-    return assertThat(
-            getSubject().getWalkableGraph().getReverseDeps(ImmutableList.of(child)).get(child))
-        .named("Reverse deps for " + child + " in " + actualAsString());
+    return assertWithMessage("Reverse deps for " + child + " in " + actualAsString())
+        .that(getSubject().getWalkableGraph().getReverseDeps(ImmutableList.of(child)).get(child));
   }
 }
diff --git a/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java b/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java
@@ -13,11 +13,10 @@
 // limitations under the License.
 package com.google.devtools.build.skyframe;
 
-import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import com.google.common.collect.Iterables;
 import com.google.common.truth.ComparableSubject;
-import com.google.common.truth.DefaultSubject;
 import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.IterableSubject;
 import com.google.common.truth.Subject;
@@ -31,19 +30,19 @@ public class NodeEntrySubject extends Subject<NodeEntrySubject, NodeEntry> {
     super(failureMetadata, nodeEntry);
   }
 
-  public DefaultSubject hasVersionThat() {
-    return check("getVersion()").that(getSubject().getVersion()).named(detail("Version"));
+  public Subject<?, ?> hasVersionThat() {
+    return check("getVersion()").withMessage(detail("Version")).that(getSubject().getVersion());
   }
 
   public IterableSubject hasTemporaryDirectDepsThat() {
-    return assertThat(Iterables.concat(getSubject().getTemporaryDirectDeps()))
-        .named(detail("TemporaryDirectDeps"));
+    return assertWithMessage(detail("TemporaryDirectDeps"))
+        .that(Iterables.concat(getSubject().getTemporaryDirectDeps()));
   }
 
   public ComparableSubject<?, NodeEntry.DependencyState> addReverseDepAndCheckIfDone(
       @Nullable SkyKey reverseDep) throws InterruptedException {
-    return assertThat(getSubject().addReverseDepAndCheckIfDone(reverseDep))
-        .named(detail("AddReverseDepAndCheckIfDone"));
+    return assertWithMessage(detail("AddReverseDepAndCheckIfDone"))
+        .that(getSubject().addReverseDepAndCheckIfDone(reverseDep));
   }
 
   private String detail(String descriptor) {