Use new Truth failWithActual() method

Migrate Truth subjects from the old fail(String, Object) to the new failWithActual(String, Object), tweaking verbs for the new grammar.

Before:
  fail("has foo", expected);

After:
  failWithActual("expected to have foo", expected);

Open-source note: The fail*() methods used by this CL were added in Truth 0.41.

More information:
  []
Tested:
    TAP --sample for global presubmit queue
    []

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=244418884
This commit is contained in:
cpovirk 2019-04-19 14:05:12 -07:00 committed by jianglai
parent 24bb78bd16
commit a46227b201
5 changed files with 25 additions and 20 deletions

View file

@ -14,6 +14,7 @@
package google.registry.testing;
import static com.google.common.truth.Fact.simpleFact;
import static com.google.common.truth.Truth.assertAbout;
import com.google.common.truth.FailureMetadata;
@ -67,7 +68,7 @@ public class HistoryEntrySubject extends Subject<HistoryEntrySubject, HistoryEnt
public And<HistoryEntrySubject> hasPeriod() {
if (actual().getPeriod() == null) {
fail("has a period");
failWithActual(simpleFact("expected to have a period"));
}
return new And<>(this);
}
@ -80,7 +81,7 @@ public class HistoryEntrySubject extends Subject<HistoryEntrySubject, HistoryEnt
public And<HistoryEntrySubject> hasNoXml() {
if (actual().getXmlBytes() != null) {
fail("has no xml");
failWithActual(simpleFact("expected to have no xml"));
}
return new And<>(this);
}
@ -92,7 +93,8 @@ public class HistoryEntrySubject extends Subject<HistoryEntrySubject, HistoryEnt
public And<HistoryEntrySubject> hasMetadataRequestedByRegistrar(
boolean requestedByRegistrar) {
if (actual().getRequestedByRegistrar() != requestedByRegistrar) {
fail("has metadata requestedByRegistrar with value", requestedByRegistrar);
failWithActual(
"expected to have metadata requestedByRegistrar with value", requestedByRegistrar);
}
return new And<>(this);
}