commit d87c40575536302047a51ac87466119efa0a2574
author Edwin Kempin <ekempin@google.com> Mon Apr 12 16:48:48 2021 +0200
committer Edwin Kempin <ekempin@google.com> Mon Apr 12 16:49:40 2021 +0200
tree cdbd2bc54748b1add1055a1ab844d7c635f4de0c
parent 435689affed586bfbc1c00a0b8ffabb61b64318d

CodeOwnersPluginConfigSnapshotTest: Fix flaky tests

The order of elements in sets is not fixed.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Id758c5e4d53698f5ec9929610197ba4bd3704634

javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshotTest.java

diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshotTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshotTest.java
index 5cc4cf2..6f40d91 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshotTest.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigSnapshotTest.java
@@ -20,6 +20,7 @@
 import static com.google.gerrit.plugins.codeowners.testing.RequiredApprovalSubject.assertThat;
 import static com.google.gerrit.testing.GerritJUnit.assertThrows;
 import static com.google.gerrit.truth.OptionalSubject.assertThat;
+import static java.util.Comparator.comparing;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -1279,11 +1280,13 @@
     createOwnersOverrideLabel("Other-Override");
 
     configureOverrideApproval(project, "Other-Override+1");
-    ImmutableSet<RequiredApproval> requiredApprovals = cfgSnapshot().getOverrideApprovals();
+    ImmutableList<RequiredApproval> requiredApprovals =
+        ImmutableList.sortedCopyOf(
+            comparing(RequiredApproval::toString), cfgSnapshot().getOverrideApprovals());
     assertThat(requiredApprovals).hasSize(2);
-    assertThat(requiredApprovals).element(0).hasLabelNameThat().isEqualTo("Owners-Override");
+    assertThat(requiredApprovals).element(0).hasLabelNameThat().isEqualTo("Other-Override");
     assertThat(requiredApprovals).element(0).hasValueThat().isEqualTo(1);
-    assertThat(requiredApprovals).element(1).hasLabelNameThat().isEqualTo("Other-Override");
+    assertThat(requiredApprovals).element(1).hasLabelNameThat().isEqualTo("Owners-Override");
     assertThat(requiredApprovals).element(1).hasValueThat().isEqualTo(1);
   }
 
@@ -1349,11 +1352,13 @@
 
     configureOverrideApproval(allProjects, "Owners-Override+1");
     configureOverrideApproval(project, "Other-Override+1");
-    ImmutableSet<RequiredApproval> requiredApprovals = cfgSnapshot().getOverrideApprovals();
+    ImmutableList<RequiredApproval> requiredApprovals =
+        ImmutableList.sortedCopyOf(
+            comparing(RequiredApproval::toString), cfgSnapshot().getOverrideApprovals());
     assertThat(requiredApprovals).hasSize(2);
-    assertThat(requiredApprovals).element(0).hasLabelNameThat().isEqualTo("Owners-Override");
+    assertThat(requiredApprovals).element(0).hasLabelNameThat().isEqualTo("Other-Override");
     assertThat(requiredApprovals).element(0).hasValueThat().isEqualTo(1);
-    assertThat(requiredApprovals).element(1).hasLabelNameThat().isEqualTo("Other-Override");
+    assertThat(requiredApprovals).element(1).hasLabelNameThat().isEqualTo("Owners-Override");
     assertThat(requiredApprovals).element(1).hasValueThat().isEqualTo(1);
   }