zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-11 06:54:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Migrate users from the old, deprecated Subject.fail* methods to the new Subject.fail* methods or, in some cases, to Subject.check.

Browse source 
Most of the changes in this CL were made manually.

I've tried to preserve all information (and of course behavior!), but the format and grammar of the messages does change. For example before-and-after messages, see the LSC doc.

In some of the CLs in this round (e.g., jscomp), I don't know a lot about the domain being tested, and the assertions are complex, so please let me know if my new phrasing is wrong or confusing.

Thanks again for your patience with all the Truth changes lately.

END_PUBLIC

More information:
  []

Tested:
    TAP for global presubmit queue
    []

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=248543745
This commit is contained in:
cpovirk 2019-05-16 09:41:11 -07:00 • committed by jianglai
parent 210c08cbb9
commit 37f1734ee2
5 changed files with 43 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

20
javatests/google/registry/testing/EppMetricSubject.java
View file

@ -15,6 +15,7 @@
package google.registry.testing;
import static com.google.common.truth.Fact.simpleFact;
import static com.google.common.truth.OptionalSubject.optionals;
import static com.google.common.truth.Truth.assertAbout;
import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
@ -23,7 +24,6 @@ import com.google.common.truth.Subject;
import google.registry.model.eppoutput.Result.Code;
import google.registry.monitoring.whitebox.EppMetric;
import google.registry.testing.TruthChainer.And;
import java.util.Objects;
import java.util.Optional;
/** Utility methods for asserting things about {@link EppMetric} instances. */
@ -41,15 +41,15 @@ public class EppMetricSubject extends Subject<EppMetricSubject, EppMetric> {
}
public And<EppMetricSubject> hasClientId(String clientId) {
return hasValue(clientId, actual.getClientId(), "has clientId");
return hasValue(clientId, actual.getClientId(), "getClientId()");
}
public And<EppMetricSubject> hasCommandName(String commandName) {
return hasValue(commandName, actual.getCommandName(), "has commandName");
return hasValue(commandName, actual.getCommandName(), "getCommandName()");
}
public And<EppMetricSubject> hasStatus(Code status) {
return hasValue(status, actual.getStatus(), "has status");
return hasValue(status, actual.getStatus(), "getStatus()");
}
public And<EppMetricSubject> hasNoStatus() {
@ -60,7 +60,7 @@ public class EppMetricSubject extends Subject<EppMetricSubject, EppMetric> {
}
public And<EppMetricSubject> hasTld(String tld) {
return hasValue(tld, actual.getTld(), "has tld");
return hasValue(tld, actual.getTld(), "getTld()");
}
public And<EppMetricSubject> hasNoTld() {
@ -70,15 +70,9 @@ public class EppMetricSubject extends Subject<EppMetricSubject, EppMetric> {
return new And<>(this);
}
private <E> And<EppMetricSubject> hasValue(E expected, Optional<E> actual, String verb) {
private <E> And<EppMetricSubject> hasValue(E expected, Optional<E> actual, String name) {
checkArgumentNotNull(expected, "Expected value cannot be null");
if (actual == null) {
failWithActual("expected to be non-null", expected);
} else if (!actual.isPresent()) {
failWithActual("expected to have value", expected);
} else if (!Objects.equals(expected, actual.get())) {
failWithBadResults(verb, expected, verb, actual);
}
check(name).about(optionals()).that(actual).hasValue(expected);
return new And<>(this);
}