Migrate off AtomicLongMapSubject, which is being removed.
Change-Id: I7a561b6751b90dbdf5117895dcbf9850f40c30ab
diff --git a/java/com/google/gerrit/acceptance/ChangeIndexedCounter.java b/java/com/google/gerrit/acceptance/ChangeIndexedCounter.java
index 286b045..e04a643 100644
--- a/java/com/google/gerrit/acceptance/ChangeIndexedCounter.java
+++ b/java/com/google/gerrit/acceptance/ChangeIndexedCounter.java
@@ -37,17 +37,12 @@
countsByChange.clear();
}
- long getCount(ChangeInfo info) {
- return countsByChange.get(info._number);
- }
-
public void assertReindexOf(ChangeInfo info) {
assertReindexOf(info, 1);
}
- public void assertReindexOf(ChangeInfo info, int expectedCount) {
- assertThat(getCount(info)).isEqualTo(expectedCount);
- assertThat(countsByChange).hasSize(1);
+ public void assertReindexOf(ChangeInfo info, long expectedCount) {
+ assertThat(countsByChange.asMap()).containsExactly(info._number, expectedCount);
clear();
}
}
diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
index f5954d9..228f233 100644
--- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
@@ -3291,10 +3291,6 @@
countsByAccount.clear();
}
- long getCount(Account.Id accountId) {
- return countsByAccount.get(accountId.get());
- }
-
void assertReindexOf(TestAccount testAccount) {
assertReindexOf(testAccount, 1);
}
@@ -3303,19 +3299,18 @@
assertReindexOf(Account.id(accountInfo._accountId), 1);
}
- void assertReindexOf(TestAccount testAccount, int expectedCount) {
- assertThat(getCount(testAccount.id())).isEqualTo(expectedCount);
- assertThat(countsByAccount).hasSize(1);
+ void assertReindexOf(TestAccount testAccount, long expectedCount) {
+ assertThat(countsByAccount.asMap()).containsExactly(testAccount.id().get(), expectedCount);
clear();
}
- void assertReindexOf(Account.Id accountId, int expectedCount) {
- assertThat(getCount(accountId)).isEqualTo(expectedCount);
+ void assertReindexOf(Account.Id accountId, long expectedCount) {
+ assertThat(countsByAccount.asMap()).containsEntry(accountId.get(), expectedCount);
countsByAccount.remove(accountId.get());
}
void assertNoReindex() {
- assertThat(countsByAccount).isEmpty();
+ assertThat(countsByAccount.asMap()).isEmpty();
}
}
@@ -3339,23 +3334,17 @@
countsByProjectRefs.clear();
}
- long getCount(String projectRef) {
- return countsByProjectRefs.get(projectRef);
- }
-
void assertRefUpdateFor(String... projectRefs) {
- Map<String, Integer> expectedRefUpdateCounts = new HashMap<>();
+ Map<String, Long> expectedRefUpdateCounts = new HashMap<>();
for (String projectRef : projectRefs) {
- expectedRefUpdateCounts.put(projectRef, 1);
+ expectedRefUpdateCounts.put(projectRef, 1L);
}
assertRefUpdateFor(expectedRefUpdateCounts);
}
- void assertRefUpdateFor(Map<String, Integer> expectedProjectRefUpdateCounts) {
- for (Map.Entry<String, Integer> e : expectedProjectRefUpdateCounts.entrySet()) {
- assertThat(getCount(e.getKey())).isEqualTo(e.getValue());
- }
- assertThat(countsByProjectRefs).hasSize(expectedProjectRefUpdateCounts.size());
+ void assertRefUpdateFor(Map<String, Long> expectedProjectRefUpdateCounts) {
+ assertThat(countsByProjectRefs.asMap())
+ .containsExactlyEntriesIn(expectedProjectRefUpdateCounts);
clear();
}
}
diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java
index 9eb1270..d908ee5f 100644
--- a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java
@@ -16,7 +16,6 @@
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
import static com.google.common.truth.Truth8.assertThat;
import static com.google.gerrit.acceptance.GitUtil.deleteRef;
import static com.google.gerrit.acceptance.GitUtil.fetch;
@@ -31,6 +30,7 @@
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -1564,24 +1564,18 @@
countsByGroup.clear();
}
- long getCount(AccountGroup.UUID groupUuid) {
- return countsByGroup.get(groupUuid.get());
- }
-
void assertReindexOf(AccountGroup.UUID groupUuid) {
assertReindexOf(ImmutableList.of(groupUuid));
}
void assertReindexOf(List<AccountGroup.UUID> groupUuids) {
- for (AccountGroup.UUID groupUuid : groupUuids) {
- assertWithMessage(groupUuid.get()).that(getCount(groupUuid)).isEqualTo(1);
- }
- assertThat(countsByGroup).hasSize(groupUuids.size());
+ Map<String, Long> expected = groupUuids.stream().collect(toMap(u -> u.get(), u -> 1L));
+ assertThat(countsByGroup.asMap()).containsExactlyEntriesIn(expected);
clear();
}
void assertNoReindex() {
- assertThat(countsByGroup).isEmpty();
+ assertThat(countsByGroup.asMap()).isEmpty();
}
}
}
diff --git a/javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java b/javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java
index dce0ab2..91c8d22 100644
--- a/javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java
@@ -723,14 +723,13 @@
assertReindexOf(projectName, 1);
}
- void assertReindexOf(String projectName, int expectedCount) {
- assertThat(getCount(projectName)).isEqualTo(expectedCount);
- assertThat(countsByProject).hasSize(1);
+ void assertReindexOf(String projectName, long expectedCount) {
+ assertThat(countsByProject.asMap()).containsExactly(projectName, expectedCount);
clear();
}
void assertNoReindex() {
- assertThat(countsByProject).isEmpty();
+ assertThat(countsByProject.asMap()).isEmpty();
}
void assertReindexExactly(ImmutableMap<String, Long> expected) {
