zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-28 16:30:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use new Truth failWithActual() method

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

9
javatests/google/registry/testing/EppMetricSubject.java
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 static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
@ -50,7 +51,7 @@ public class EppMetricSubject extends Subject<EppMetricSubject, EppMetric> {
public And<EppMetricSubject> hasNoStatus() {
if (actual().getStatus().isPresent()) {
fail("has no status");
failWithActual(simpleFact("expected to have no status"));
}
return new And<>(this);
}
@ -61,7 +62,7 @@ public class EppMetricSubject extends Subject<EppMetricSubject, EppMetric> {
public And<EppMetricSubject> hasNoTld() {
if (actual().getTld().isPresent()) {
fail("has no tld");
failWithActual(simpleFact("expected to have no tld"));
}
return new And<>(this);
}
@ -69,9 +70,9 @@ public class EppMetricSubject extends Subject<EppMetricSubject, EppMetric> {
private <E> And<EppMetricSubject> hasValue(E expected, Optional<E> actual, String verb) {
checkArgumentNotNull(expected, "Expected value cannot be null");
if (actual == null) {
fail("is non-null", expected);
failWithActual("expected to be non-null", expected);
} else if (!actual.isPresent()) {
fail("has value", expected);
failWithActual("expected to have value", expected);
} else if (!Objects.equals(expected, actual.get())) {
failWithBadResults(verb, expected, verb, actual);
}