aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/testutil/EventIterableSubject.java
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-11-10 19:40:08 +0100
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-11-10 23:28:08 +0100
commit694105dc2b6056c6c8330d9a0d3af9cff7edf7d5 (patch)
tree2de2a527317ed7b600e82a69f065a15143c007ff /src/test/java/com/google/devtools/build/lib/testutil/EventIterableSubject.java
parent970dea8b62557c664f741be1718242218fc79d3c (diff)
Replace truth.FailureStrategy with truth.FailureMetadata in bazel's Subjects.
Also changed truth.SubjectFactory to truth.Subject.Factory (plain renaming) and use method reference instead of anonymous class to create the factory when applicable. FailureMetadata, an opaque object to its users, is introduced to replace FailureStrategy in in custom Subject in order to resolve some existing flaws of FailureStrategy as well as enable new features to be added to Truth. New API is available in Truth-0.36, if there is a build/pom.xml, it's also updated to use this version. PiperOrigin-RevId: 175308179
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/testutil/EventIterableSubject.java')
-rw-r--r--src/test/java/com/google/devtools/build/lib/testutil/EventIterableSubject.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/EventIterableSubject.java b/src/test/java/com/google/devtools/build/lib/testutil/EventIterableSubject.java
index 534c173f35..d53c0ae317 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/EventIterableSubject.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/EventIterableSubject.java
@@ -16,7 +16,7 @@ package com.google.devtools.build.lib.testutil;
import static com.google.common.truth.Truth.assertThat;
import com.google.common.collect.Iterables;
-import com.google.common.truth.FailureStrategy;
+import com.google.common.truth.FailureMetadata;
import com.google.common.truth.IterableSubject;
import com.google.common.truth.Subject;
import com.google.devtools.build.lib.events.Event;
@@ -27,8 +27,8 @@ import javax.annotation.Nullable;
* String} objects as opposed to the harder-to-assert-on {@link Event} objects.
*/
class EventIterableSubject extends Subject<EventIterableSubject, Iterable<Event>> {
- EventIterableSubject(FailureStrategy failureStrategy, @Nullable Iterable<Event> actual) {
- super(failureStrategy, actual);
+ EventIterableSubject(FailureMetadata failureMetadata, @Nullable Iterable<Event> actual) {
+ super(failureMetadata, actual);
}
IterableSubject hasEventsThat() {