diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/skyframe')
8 files changed, 38 insertions, 39 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 index 3598909e11..f9fc3972a1 100644 --- a/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubject.java +++ b/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubject.java @@ -13,19 +13,18 @@ // limitations under the License. package com.google.devtools.build.skyframe; -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.common.truth.Truth; - import javax.annotation.Nullable; /** * {@link Subject} for {@link CycleInfo}. Please add to this class if you need more functionality! */ public class CycleInfoSubject extends Subject<CycleInfoSubject, CycleInfo> { - CycleInfoSubject(FailureStrategy failureStrategy, @Nullable CycleInfo cycleInfo) { - super(failureStrategy, cycleInfo); + CycleInfoSubject(FailureMetadata failureMetadata, @Nullable CycleInfo cycleInfo) { + super(failureMetadata, cycleInfo); } public IterableSubject hasPathToCycleThat() { diff --git a/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubjectFactory.java b/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubjectFactory.java index 45d9d218ad..93014c56d8 100644 --- a/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubjectFactory.java +++ b/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubjectFactory.java @@ -13,18 +13,18 @@ // 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.FailureMetadata; +import com.google.common.truth.Subject; import com.google.common.truth.Truth; -/** {@link SubjectFactory} for {@link CycleInfo}, providing {@link CycleInfoSubject}. */ -public class CycleInfoSubjectFactory extends SubjectFactory<CycleInfoSubject, CycleInfo> { +/** {@link Subject.Factory} for {@link CycleInfo}, providing {@link CycleInfoSubject}. */ +public class CycleInfoSubjectFactory implements Subject.Factory<CycleInfoSubject, CycleInfo> { public static CycleInfoSubject assertThat(CycleInfo cycleInfo) { return Truth.assertAbout(new CycleInfoSubjectFactory()).that(cycleInfo); } @Override - public CycleInfoSubject getSubject(FailureStrategy failureStrategy, CycleInfo cycleInfo) { - return new CycleInfoSubject(failureStrategy, cycleInfo); + public CycleInfoSubject createSubject(FailureMetadata failureMetadata, CycleInfo cycleInfo) { + return new CycleInfoSubject(failureMetadata, cycleInfo); } } 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 e3fd258b11..2e886787bc 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubject.java +++ b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubject.java @@ -13,7 +13,7 @@ // limitations under the License. package com.google.devtools.build.skyframe; -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.common.truth.ThrowableSubject; @@ -24,8 +24,8 @@ import com.google.common.truth.Truth; * functionality! */ public class ErrorInfoSubject extends Subject<ErrorInfoSubject, ErrorInfo> { - public ErrorInfoSubject(FailureStrategy failureStrategy, ErrorInfo errorInfo) { - super(failureStrategy, errorInfo); + public ErrorInfoSubject(FailureMetadata failureMetadata, ErrorInfo errorInfo) { + super(failureMetadata, errorInfo); } public ThrowableSubject hasExceptionThat() { diff --git a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubjectFactory.java b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubjectFactory.java index 5234050c1e..60f9460c25 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubjectFactory.java +++ b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubjectFactory.java @@ -13,18 +13,18 @@ // 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.FailureMetadata; +import com.google.common.truth.Subject; import com.google.common.truth.Truth; -/** {@link SubjectFactory} for {@link ErrorInfo} objects, providing {@link ErrorInfoSubject}s. */ -public class ErrorInfoSubjectFactory extends SubjectFactory<ErrorInfoSubject, ErrorInfo> { +/** {@link Subject.Factory} for {@link ErrorInfo} objects, providing {@link ErrorInfoSubject}s. */ +public class ErrorInfoSubjectFactory implements Subject.Factory<ErrorInfoSubject, ErrorInfo> { public static ErrorInfoSubject assertThatErrorInfo(ErrorInfo errorInfo) { return Truth.assertAbout(new ErrorInfoSubjectFactory()).that(errorInfo); } @Override - public ErrorInfoSubject getSubject(FailureStrategy failureStrategy, ErrorInfo errorInfo) { - return new ErrorInfoSubject(failureStrategy, errorInfo); + public ErrorInfoSubject createSubject(FailureMetadata failureMetadata, ErrorInfo errorInfo) { + return new ErrorInfoSubject(failureMetadata, errorInfo); } } 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 c86d6cfd48..f422b7ab2f 100644 --- a/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubject.java +++ b/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubject.java @@ -18,7 +18,7 @@ import static com.google.devtools.build.skyframe.ErrorInfoSubjectFactory.assertT import com.google.common.collect.ImmutableList; import com.google.common.truth.DefaultSubject; -import com.google.common.truth.FailureStrategy; +import com.google.common.truth.FailureMetadata; import com.google.common.truth.IterableSubject; import com.google.common.truth.Subject; @@ -28,8 +28,8 @@ import com.google.common.truth.Subject; */ public class EvaluationResultSubject extends Subject<EvaluationResultSubject, EvaluationResult<?>> { public EvaluationResultSubject( - FailureStrategy failureStrategy, EvaluationResult<?> evaluationResult) { - super(failureStrategy, evaluationResult); + FailureMetadata failureMetadata, EvaluationResult<?> evaluationResult) { + super(failureMetadata, evaluationResult); } public void hasError() { diff --git a/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubjectFactory.java b/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubjectFactory.java index 2bb7e4b7e9..9863f5261a 100644 --- a/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubjectFactory.java +++ b/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubjectFactory.java @@ -13,24 +13,24 @@ // 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.FailureMetadata; +import com.google.common.truth.Subject; import com.google.common.truth.Truth; /** - * {@link SubjectFactory} for {@link EvaluationResult} objects, providing - * {@link EvaluationResultSubject}s. + * {@link Subject.Factory} for {@link EvaluationResult} objects, providing {@link + * EvaluationResultSubject}s. */ public class EvaluationResultSubjectFactory - extends SubjectFactory<EvaluationResultSubject, EvaluationResult<?>> { + implements Subject.Factory<EvaluationResultSubject, EvaluationResult<?>> { public static EvaluationResultSubject assertThatEvaluationResult( EvaluationResult<?> evaluationResult) { return Truth.assertAbout(new EvaluationResultSubjectFactory()).that(evaluationResult); } @Override - public EvaluationResultSubject getSubject( - FailureStrategy failureStrategy, EvaluationResult<?> evaluationResult) { - return new EvaluationResultSubject(failureStrategy, evaluationResult); + public EvaluationResultSubject createSubject( + FailureMetadata failureMetadata, EvaluationResult<?> evaluationResult) { + return new EvaluationResultSubject(failureMetadata, evaluationResult); } } 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 744cb0672a..78bdd21063 100644 --- a/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java +++ b/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java @@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.Iterables; import com.google.common.truth.ComparableSubject; import com.google.common.truth.DefaultSubject; -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 javax.annotation.Nullable; @@ -28,8 +28,8 @@ import javax.annotation.Nullable; * functionality! */ class NodeEntrySubject extends Subject<NodeEntrySubject, NodeEntry> { - NodeEntrySubject(FailureStrategy failureStrategy, NodeEntry nodeEntry) { - super(failureStrategy, nodeEntry); + NodeEntrySubject(FailureMetadata failureMetadata, NodeEntry nodeEntry) { + super(failureMetadata, nodeEntry); } DefaultSubject hasVersionThat() { diff --git a/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubjectFactory.java b/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubjectFactory.java index 7278085a96..f38c31163b 100644 --- a/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubjectFactory.java +++ b/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubjectFactory.java @@ -13,18 +13,18 @@ // 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.FailureMetadata; +import com.google.common.truth.Subject; import com.google.common.truth.Truth; -/** {@link SubjectFactory} for {@link NodeEntry} objects, providing {@link NodeEntrySubject}s. */ -public class NodeEntrySubjectFactory extends SubjectFactory<NodeEntrySubject, NodeEntry> { +/** {@link Subject.Factory} for {@link NodeEntry} objects, providing {@link NodeEntrySubject}s. */ +public class NodeEntrySubjectFactory implements Subject.Factory<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); + public NodeEntrySubject createSubject(FailureMetadata failureMetadata, NodeEntry nodeEntry) { + return new NodeEntrySubject(failureMetadata, nodeEntry); } } |