Automatic code cleanup.
PiperOrigin-RevId: 251684426
diff --git a/src/test/java/com/google/devtools/build/android/ClassPathsSubject.java b/src/test/java/com/google/devtools/build/android/ClassPathsSubject.java
index b3ab5c8..fb624a7 100644
--- a/src/test/java/com/google/devtools/build/android/ClassPathsSubject.java
+++ b/src/test/java/com/google/devtools/build/android/ClassPathsSubject.java
@@ -36,10 +36,8 @@
import java.util.List;
import javax.annotation.Nullable;
-/**
- * A testing utility that allows .java/.class related assertions against Paths.
- */
-public class ClassPathsSubject extends Subject<ClassPathsSubject, Path> {
+/** A testing utility that allows .java/.class related assertions against Paths. */
+public class ClassPathsSubject extends Subject {
private final Path actual;
@@ -124,7 +122,7 @@
return check("class(%s)", className).about(ClassNameSubject.classNames(actual)).that(className);
}
- static final class ClassNameSubject extends Subject<ClassNameSubject, String> {
+ static final class ClassNameSubject extends Subject {
private final String actual;
private final Path basePath;
diff --git a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataSubject.java b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataSubject.java
index 10c3138..ac9d175 100644
--- a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataSubject.java
+++ b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataSubject.java
@@ -25,7 +25,7 @@
import java.util.Map;
/** Testing Subject for comparing ParsedAndroidData instances. */
-class ParsedAndroidDataSubject extends Subject<ParsedAndroidDataSubject, ParsedAndroidData> {
+class ParsedAndroidDataSubject extends Subject {
private final ParsedAndroidData actual;
diff --git a/src/test/java/com/google/devtools/build/android/PathsSubject.java b/src/test/java/com/google/devtools/build/android/PathsSubject.java
index 6a19063..26eb517 100644
--- a/src/test/java/com/google/devtools/build/android/PathsSubject.java
+++ b/src/test/java/com/google/devtools/build/android/PathsSubject.java
@@ -48,7 +48,7 @@
import org.xml.sax.SAXException;
/** A testing utility that allows assertions against Paths. */
-public class PathsSubject extends Subject<PathsSubject, Path> {
+public class PathsSubject extends Subject {
private static final String PATH_NORMALIZER =
String.format(
diff --git a/src/test/java/com/google/devtools/build/android/SplitConfigurationFilterTest.java b/src/test/java/com/google/devtools/build/android/SplitConfigurationFilterTest.java
index db55ac1..9e58672 100644
--- a/src/test/java/com/google/devtools/build/android/SplitConfigurationFilterTest.java
+++ b/src/test/java/com/google/devtools/build/android/SplitConfigurationFilterTest.java
@@ -159,7 +159,7 @@
SplitConfigurationFilter.fromFilenameSuffix("d-v7_b-v2_c"),
// Number of configs is the main criterion, so more sets of configs means later sort
SplitConfigurationFilter.fromFilenameSuffix("a_b_c_d_e_f_g_h_i_j_k_l_m")))
- .isStrictlyOrdered();
+ .isInStrictOrder();
// if they are actually equal, they will compare equal
assertThat(SplitConfigurationFilter.fromFilenameSuffix("c-v13"))
@@ -264,7 +264,7 @@
ResourceConfiguration.fromString("b-v13"),
// wildcards ("any") are ignored when considering specifier order
ResourceConfiguration.fromString("any-c-v13")))
- .isStrictlyOrdered();
+ .isInStrictOrder();
// if they are actually equal, they will compare equal
assertThat(ResourceConfiguration.fromString("c-v13"))
diff --git a/src/test/java/com/google/devtools/build/android/UnwrittenMergedAndroidDataSubject.java b/src/test/java/com/google/devtools/build/android/UnwrittenMergedAndroidDataSubject.java
index cae5579..41dd691 100644
--- a/src/test/java/com/google/devtools/build/android/UnwrittenMergedAndroidDataSubject.java
+++ b/src/test/java/com/google/devtools/build/android/UnwrittenMergedAndroidDataSubject.java
@@ -21,8 +21,7 @@
import com.google.common.truth.Subject;
import javax.annotation.Nullable;
-class UnwrittenMergedAndroidDataSubject
- extends Subject<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData> {
+class UnwrittenMergedAndroidDataSubject extends Subject {
static final Subject.Factory<UnwrittenMergedAndroidDataSubject, UnwrittenMergedAndroidData>
FACTORY = UnwrittenMergedAndroidDataSubject::new;
diff --git a/src/test/java/com/google/devtools/build/lib/query2/engine/PostAnalysisQueryTest.java b/src/test/java/com/google/devtools/build/lib/query2/engine/PostAnalysisQueryTest.java
index 2da96f6..02bf02c 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/engine/PostAnalysisQueryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/query2/engine/PostAnalysisQueryTest.java
@@ -201,7 +201,7 @@
helper.setQuerySettings(Setting.NO_IMPLICIT_DEPS);
assertThat(evalToListOfStrings("deps(//test:my_rule)"))
- .containsAllIn(evalToListOfStrings(explicits));
+ .containsAtLeastElementsIn(evalToListOfStrings(explicits));
assertThat(evalToListOfStrings("deps(//test:my_rule)"))
.doesNotContain(evalToListOfStrings(implicits));
}
@@ -245,11 +245,12 @@
// Check for implicit toolchain dependencies
assertThat(evalToListOfStrings("deps(//test:my_rule)"))
- .containsAllIn(evalToListOfStrings(explicits + " + " + implicits + " + " + PLATFORM_LABEL));
+ .containsAtLeastElementsIn(
+ evalToListOfStrings(explicits + " + " + implicits + " + " + PLATFORM_LABEL));
helper.setQuerySettings(Setting.NO_IMPLICIT_DEPS);
assertThat(evalToListOfStrings("deps(//test:my_rule)"))
- .containsAllIn(evalToListOfStrings(explicits));
+ .containsAtLeastElementsIn(evalToListOfStrings(explicits));
assertThat(evalToListOfStrings("deps(//test:my_rule)"))
.doesNotContain(evalToListOfStrings(implicits));
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
index fc185c2..b3ad255 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
@@ -5277,7 +5277,7 @@
assertThat(target).isNotNull();
Artifact executable = (Artifact) getMyInfoFromTarget(target).getValue("executable");
assertThat(artifactsToStrings(getGeneratingAction(executable).getInputs()))
- .containsAllOf("bin foo/libdep1.a", "bin foo/libdep2.a");
+ .containsAtLeast("bin foo/libdep1.a", "bin foo/libdep2.a");
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
index a08c30e..1e1d151 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
@@ -144,7 +144,7 @@
Artifact treeArtifact = createTreeArtifact("out");
TreeArtifactValue value = evaluateTreeArtifact(treeArtifact, children);
assertThat(value.getChildPaths()).containsExactlyElementsIn(children);
- assertThat(value.getChildPaths()).isOrdered(Comparator.naturalOrder());
+ assertThat(value.getChildPaths()).isInOrder(Comparator.naturalOrder());
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/EventIterableSubject.java b/src/test/java/com/google/devtools/build/lib/testutil/EventIterableSubject.java
index bdc288a..df3874d 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/EventIterableSubject.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/EventIterableSubject.java
@@ -26,7 +26,7 @@
* {@link Subject} for {@code Iterable<Event>} that provides an {@link IterableSubject} of {@link
* String} objects as opposed to the harder-to-assert-on {@link Event} objects.
*/
-class EventIterableSubject extends Subject<EventIterableSubject, Iterable<Event>> {
+class EventIterableSubject extends Subject {
private final Iterable<Event> actual;
EventIterableSubject(FailureMetadata failureMetadata, @Nullable Iterable<Event> actual) {
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 5ae30c7..dafaaf3 100644
--- a/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubject.java
+++ b/src/test/java/com/google/devtools/build/skyframe/CycleInfoSubject.java
@@ -21,7 +21,7 @@
/**
* {@link Subject} for {@link CycleInfo}. Please add to this class if you need more functionality!
*/
-public class CycleInfoSubject extends Subject<CycleInfoSubject, CycleInfo> {
+public class CycleInfoSubject extends Subject {
private final CycleInfo actual;
CycleInfoSubject(FailureMetadata failureMetadata, @Nullable CycleInfo cycleInfo) {
@@ -30,12 +30,10 @@
}
public IterableSubject hasPathToCycleThat() {
- return check("getPathToCycle()")
- .withMessage("Path to cycle in " + actualAsString())
- .that(actual.getPathToCycle());
+ return check("getPathToCycle()").that(actual.getPathToCycle());
}
public IterableSubject hasCycleThat() {
- return check("getCycle()").withMessage("Cycle in " + actualAsString()).that(actual.getCycle());
+ return check("getCycle()").that(actual.getCycle());
}
}
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 9b0d9ad..b9b1482 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubject.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoSubject.java
@@ -21,10 +21,9 @@
import com.google.common.truth.ThrowableSubject;
/**
- * {@link Subject} for {@link ErrorInfo}. Please add to this class if you need more
- * functionality!
+ * {@link Subject} for {@link ErrorInfo}. Please add to this class if you need more functionality!
*/
-public class ErrorInfoSubject extends Subject<ErrorInfoSubject, ErrorInfo> {
+public class ErrorInfoSubject extends Subject {
private final ErrorInfo actual;
public ErrorInfoSubject(FailureMetadata failureMetadata, ErrorInfo errorInfo) {
@@ -33,16 +32,12 @@
}
public ThrowableSubject hasExceptionThat() {
- return check("getException()")
- .withMessage("Exception in " + actualAsString())
- .that(actual.getException());
+ return check("getException()").that(actual.getException());
}
public IterableSubject hasCycleInfoThat() {
isNotNull();
- return check("getCycleInfo()")
- .withMessage("CycleInfo in " + actualAsString())
- .that(actual.getCycleInfo());
+ return check("getCycleInfo()").that(actual.getCycleInfo());
}
public void rootCauseOfExceptionIs(SkyKey key) {
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 1c8254a..21e3d90 100644
--- a/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubject.java
+++ b/src/test/java/com/google/devtools/build/skyframe/EvaluationResultSubject.java
@@ -24,7 +24,7 @@
* {@link Subject} for {@link EvaluationResult}. Please add to this class if you need more
* functionality!
*/
-public class EvaluationResultSubject extends Subject<EvaluationResultSubject, EvaluationResult<?>> {
+public class EvaluationResultSubject extends Subject {
private final EvaluationResult<?> actual;
public EvaluationResultSubject(
@@ -45,7 +45,7 @@
}
}
- public Subject<?, ?> hasEntryThat(SkyKey key) {
+ public Subject hasEntryThat(SkyKey key) {
return check("get(%s)", key).that(actual.get(key));
}
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 ab50cb5..eaa19a9 100644
--- a/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java
+++ b/src/test/java/com/google/devtools/build/skyframe/NodeEntrySubject.java
@@ -13,8 +13,6 @@
// limitations under the License.
package com.google.devtools.build.skyframe;
-import static com.google.common.truth.Truth.assertWithMessage;
-
import com.google.common.collect.Iterables;
import com.google.common.truth.ComparableSubject;
import com.google.common.truth.FailureMetadata;
@@ -25,7 +23,7 @@
/**
* {@link Subject} for {@link NodeEntry}. Please add to this class if you need more functionality!
*/
-public class NodeEntrySubject extends Subject<NodeEntrySubject, NodeEntry> {
+public class NodeEntrySubject extends Subject {
private final NodeEntry actual;
NodeEntrySubject(FailureMetadata failureMetadata, NodeEntry nodeEntry) {
@@ -33,22 +31,18 @@
this.actual = nodeEntry;
}
- public Subject<?, ?> hasVersionThat() {
- return check("getVersion()").withMessage(detail("Version")).that(actual.getVersion());
+ public Subject hasVersionThat() {
+ return check("getVersion()").that(actual.getVersion());
}
public IterableSubject hasTemporaryDirectDepsThat() {
- return assertWithMessage(detail("TemporaryDirectDeps"))
+ return check("getTemporaryDirectDeps()")
.that(Iterables.concat(actual.getTemporaryDirectDeps()));
}
public ComparableSubject<?, NodeEntry.DependencyState> addReverseDepAndCheckIfDone(
@Nullable SkyKey reverseDep) throws InterruptedException {
- return assertWithMessage(detail("AddReverseDepAndCheckIfDone"))
+ return check("addReverseDepAndCheckIfDone()")
.that(actual.addReverseDepAndCheckIfDone(reverseDep));
}
-
- private String detail(String descriptor) {
- return descriptor + " for" + actualAsString();
- }
}
diff --git a/src/test/java/com/google/devtools/common/options/OptionsDataTest.java b/src/test/java/com/google/devtools/common/options/OptionsDataTest.java
index d223f20..9ab340e 100644
--- a/src/test/java/com/google/devtools/common/options/OptionsDataTest.java
+++ b/src/test/java/com/google/devtools/common/options/OptionsDataTest.java
@@ -514,7 +514,7 @@
Correspondence.from((obj1, obj2) -> obj1 == obj2, "is the same object as");
assertThat(optionDefinitionsFromData)
.comparingElementsUsing(referenceEquality)
- .containsAllIn(optionDefinitions);
+ .containsAtLeastElementsIn(optionDefinitions);
// Construct options data for each class separately, and check again.
IsolatedOptionsData data1 = construct(class1);
@@ -534,7 +534,7 @@
assertThat(optionDefinitionsFromGroupedData)
.comparingElementsUsing(referenceEquality)
- .containsAllIn(optionDefinitions);
+ .containsAtLeastElementsIn(optionDefinitions);
}
/** Dummy options class. */
