Merge "Enable error level for the TruthAssertExpected bug pattern in ErrorProne"
diff --git a/javatests/com/google/gerrit/acceptance/api/project/AccessIT.java b/javatests/com/google/gerrit/acceptance/api/project/AccessIT.java
index 32e8232..bf428f9 100644
--- a/javatests/com/google/gerrit/acceptance/api/project/AccessIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/project/AccessIT.java
@@ -180,7 +180,7 @@
projectCache.evict(newProjectName);
ProjectAccessInfo actual = pApi().access();
// Permissions don't change
- assertThat(expected.local).isEqualTo(actual.local);
+ assertThat(actual.local).isEqualTo(expected.local);
}
@Test
diff --git a/javatests/com/google/gerrit/server/notedb/CommitRewriterTest.java b/javatests/com/google/gerrit/server/notedb/CommitRewriterTest.java
index 7f16cc4..056c7dc 100644
--- a/javatests/com/google/gerrit/server/notedb/CommitRewriterTest.java
+++ b/javatests/com/google/gerrit/server/notedb/CommitRewriterTest.java
@@ -2226,11 +2226,11 @@
private void assertFixedCommits(
ImmutableList<ObjectId> expectedFixedCommits, BackfillResult result, Change.Id changeId) {
- assertThat(expectedFixedCommits)
- .containsExactlyElementsIn(
+ assertThat(
result.fixedRefDiff.get(RefNames.changeMetaRef(changeId)).stream()
.map(CommitDiff::oldSha1)
- .collect(toImmutableList()));
+ .collect(toImmutableList()))
+ .containsExactlyElementsIn(expectedFixedCommits);
}
private String getAccountIdentToFix(Account account) {
diff --git a/tools/BUILD b/tools/BUILD
index 64b0665..9f12373 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -418,7 +418,7 @@
"-Xep:TimeUnitConversionChecker:ERROR",
"-Xep:ToStringReturnsNull:ERROR",
"-Xep:TreeToString:ERROR",
- # "-Xep:TruthAssertExpected:WARN",
+ "-Xep:TruthAssertExpected:ERROR",
"-Xep:TruthConstantAsserts:ERROR",
"-Xep:TruthGetOrDefault:ERROR",
"-Xep:TruthIncompatibleType:ERROR",