diff --git a/java/google/registry/repositories.bzl b/java/google/registry/repositories.bzl index 3bf1a41de..3186290ee 100644 --- a/java/google/registry/repositories.bzl +++ b/java/google/registry/repositories.bzl @@ -1134,10 +1134,10 @@ def com_google_re2j(): def com_google_truth(): java_import_external( name = "com_google_truth", - jar_sha256 = "772bfaccd05b9203f929536def0b4157094130629bc105d555bef8eacc3c1675", + jar_sha256 = "e087f1a50e40e8aae1f0cdb7f031684a84e7dd7ca224a4b5be53caeacf0f0324", jar_urls = [ - "http://domain-registry-maven.storage.googleapis.com/repo1.maven.org/maven2/com/google/truth/truth/0.34/truth-0.34.jar", - "http://repo1.maven.org/maven2/com/google/truth/truth/0.34/truth-0.34.jar", + "http://domain-registry-maven.storage.googleapis.com/repo1.maven.org/maven2/com/google/truth/truth/0.35/truth-0.35.jar", + "http://repo1.maven.org/maven2/com/google/truth/truth/0.35/truth-0.35.jar", ], licenses = ["notice"], # The Apache Software License, Version 2.0 testonly_ = True, diff --git a/javatests/google/registry/testing/ContactResourceSubject.java b/javatests/google/registry/testing/ContactResourceSubject.java index 3fc7dbf0a..c7371184b 100644 --- a/javatests/google/registry/testing/ContactResourceSubject.java +++ b/javatests/google/registry/testing/ContactResourceSubject.java @@ -17,8 +17,8 @@ package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertAbout; -import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; +import com.google.common.truth.SimpleSubjectBuilder; import google.registry.model.contact.ContactResource; import google.registry.model.contact.PostalInfo; import google.registry.model.eppcommon.AuthInfo; @@ -183,7 +183,8 @@ public final class ContactResourceSubject "has currentSponsorClientId"); } - public static DelegatedVerb assertAboutContacts() { + public static SimpleSubjectBuilder + assertAboutContacts() { return assertAbout(new SubjectFactory()); } } diff --git a/javatests/google/registry/testing/DomainApplicationSubject.java b/javatests/google/registry/testing/DomainApplicationSubject.java index 57fa7dd51..d81321d1d 100644 --- a/javatests/google/registry/testing/DomainApplicationSubject.java +++ b/javatests/google/registry/testing/DomainApplicationSubject.java @@ -19,8 +19,8 @@ import static com.google.common.truth.Truth.assertAbout; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableSet; -import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; +import com.google.common.truth.SimpleSubjectBuilder; import google.registry.model.domain.DomainApplication; import google.registry.model.domain.Period; import google.registry.model.domain.launch.ApplicationStatus; @@ -84,7 +84,7 @@ public final class DomainApplicationSubject super(strategy, checkNotNull(subject)); } - public static DelegatedVerb + public static SimpleSubjectBuilder assertAboutApplications() { return assertAbout(new SubjectFactory()); } diff --git a/javatests/google/registry/testing/DomainResourceSubject.java b/javatests/google/registry/testing/DomainResourceSubject.java index 3757bf759..501f520e5 100644 --- a/javatests/google/registry/testing/DomainResourceSubject.java +++ b/javatests/google/registry/testing/DomainResourceSubject.java @@ -17,8 +17,8 @@ package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertAbout; -import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; +import com.google.common.truth.SimpleSubjectBuilder; import google.registry.model.domain.DomainResource; import google.registry.model.transfer.TransferStatus; import google.registry.testing.TruthChainer.And; @@ -115,7 +115,7 @@ public final class DomainResourceSubject super(strategy, checkNotNull(subject)); } - public static DelegatedVerb assertAboutDomains() { + public static SimpleSubjectBuilder assertAboutDomains() { return assertAbout(new SubjectFactory()); } } diff --git a/javatests/google/registry/testing/EppExceptionSubject.java b/javatests/google/registry/testing/EppExceptionSubject.java index 319836491..905456685 100644 --- a/javatests/google/registry/testing/EppExceptionSubject.java +++ b/javatests/google/registry/testing/EppExceptionSubject.java @@ -18,8 +18,8 @@ import static com.google.common.truth.Truth.assertAbout; import static com.google.common.truth.Truth.assertThat; import static google.registry.flows.EppXmlTransformer.marshal; -import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; +import com.google.common.truth.SimpleSubjectBuilder; import com.google.common.truth.Subject; import com.google.common.truth.SubjectFactory; import google.registry.flows.EppException; @@ -57,7 +57,7 @@ public class EppExceptionSubject extends Subject(this); } - public static DelegatedVerb assertAboutEppExceptions() { + public static SimpleSubjectBuilder assertAboutEppExceptions() { return assertAbout(new SubjectFactory() { @Override public EppExceptionSubject getSubject(FailureStrategy strategy, EppException subject) { diff --git a/javatests/google/registry/testing/GenericEppResourceSubject.java b/javatests/google/registry/testing/GenericEppResourceSubject.java index 800c44280..d8f966b5c 100644 --- a/javatests/google/registry/testing/GenericEppResourceSubject.java +++ b/javatests/google/registry/testing/GenericEppResourceSubject.java @@ -17,8 +17,8 @@ package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertAbout; -import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; +import com.google.common.truth.SimpleSubjectBuilder; import com.google.common.truth.SubjectFactory; import google.registry.model.EppResource; @@ -39,7 +39,8 @@ public final class GenericEppResourceSubject super(strategy, checkNotNull(subject)); } - public static DelegatedVerb assertAboutEppResources() { + public static SimpleSubjectBuilder + assertAboutEppResources() { return assertAbout(new GenericEppResourceSubjectFactory()); } } diff --git a/javatests/google/registry/testing/HistoryEntrySubject.java b/javatests/google/registry/testing/HistoryEntrySubject.java index 86d0c0703..8417cb027 100644 --- a/javatests/google/registry/testing/HistoryEntrySubject.java +++ b/javatests/google/registry/testing/HistoryEntrySubject.java @@ -17,8 +17,8 @@ package google.registry.testing; import static com.google.common.truth.Truth.assertAbout; import com.google.common.base.Optional; -import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; +import com.google.common.truth.SimpleSubjectBuilder; import com.google.common.truth.Subject; import google.registry.model.domain.Period; import google.registry.model.reporting.HistoryEntry; @@ -103,7 +103,8 @@ public class HistoryEntrySubject extends Subject(this); } - public static DelegatedVerb assertAboutHistoryEntries() { + public static SimpleSubjectBuilder + assertAboutHistoryEntries() { return assertAbout(new SubjectFactory()); } } diff --git a/javatests/google/registry/testing/HostResourceSubject.java b/javatests/google/registry/testing/HostResourceSubject.java index 1b414f18e..b2cc1f9e1 100644 --- a/javatests/google/registry/testing/HostResourceSubject.java +++ b/javatests/google/registry/testing/HostResourceSubject.java @@ -17,8 +17,8 @@ package google.registry.testing; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Truth.assertAbout; -import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.FailureStrategy; +import com.google.common.truth.SimpleSubjectBuilder; import com.googlecode.objectify.Key; import google.registry.model.domain.DomainResource; import google.registry.model.host.HostResource; @@ -37,7 +37,7 @@ public final class HostResourceSubject super(strategy, checkNotNull(subject)); } - public static DelegatedVerb assertAboutHosts() { + public static SimpleSubjectBuilder assertAboutHosts() { return assertAbout(new SubjectFactory()); } diff --git a/javatests/google/registry/testing/LogsSubject.java b/javatests/google/registry/testing/LogsSubject.java index 9b43d06be..4c3acddb2 100644 --- a/javatests/google/registry/testing/LogsSubject.java +++ b/javatests/google/registry/testing/LogsSubject.java @@ -19,9 +19,9 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; import com.google.common.testing.TestLogHandler; -import com.google.common.truth.AbstractVerb.DelegatedVerb; import com.google.common.truth.Correspondence; import com.google.common.truth.FailureStrategy; +import com.google.common.truth.SimpleSubjectBuilder; import com.google.common.truth.StringSubject; import com.google.common.truth.Subject; import google.registry.testing.TruthChainer.Which; @@ -87,7 +87,7 @@ public class LogsSubject extends Subject { throw new AssertionError("Message check passed yet matching message not found"); } - public static DelegatedVerb assertAboutLogs() { + public static SimpleSubjectBuilder assertAboutLogs() { return assertAbout(new SubjectFactory()); } }