commit 2f192dc987a1f038c075f75ddd9cc06e829b2627
author Christian Aistleitner <christian@quelltextlich.at> Tue Sep 01 13:21:19 2015 +0200
committer Christian Aistleitner <christian@quelltextlich.at> Tue Sep 01 13:24:22 2015 +0200
tree 339d67fd3d79fbe7f8d0d681d3f78ebfd1caa2be
parent 40748e5bdc08aa5b010a9fb5cf65f0c487eb683a

Test 'contains' method in DynamicSet's containment tests

The variant of containment tests for DynamicSet merged in

  40748e5bdc08aa5b010a9fb5cf65f0c487eb683a

did not actually call DynamicSet's contains method, as a DynamicSet is
not a Collection. By avoiding syntactic sugar provided by the truth
library, we make sure the correct contains method is called.

Change-Id: I9cebcebf3a6a031ac3d420f9561d0fad08f92772

gerrit-extension-api/src/test/java/com/google/gerrit/extensions/registration/DynamicSetTest.java

diff --git a/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/registration/DynamicSetTest.java b/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/registration/DynamicSetTest.java
index b3938aa..dc71b12 100644
--- a/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/registration/DynamicSetTest.java
+++ b/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/registration/DynamicSetTest.java
@@ -23,10 +23,20 @@
 import org.junit.Test;
 
 public class DynamicSetTest {
+  // In tests for {@link DynamicSet#contains(Object)}, be sure to avoid
+  // {@code assertThat(ds).contains(...) @} and
+  // {@code assertThat(ds).DoesNotContains(...) @} as (since
+  // {@link DynamicSet@} is not a {@link Collection@}) those boil down to
+  // iterating over the {@link DynamicSet@} and checking equality instead
+  // of calling {@link DynamicSet#contains(Object)}.
+  // To test for {@link DynamicSet#contains(Object)}, use
+  // {@code assertThat(ds.contains(...)).isTrue() @} and
+  // {@code assertThat(ds.contains(...)).isFalse() @} instead.
+
   @Test
   public void testContainsWithEmpty() throws Exception {
     DynamicSet<Integer> ds = new DynamicSet<>();
-    assertThat(ds).doesNotContain(2);
+    assertThat(ds.contains(2)).isFalse(); //See above comment about ds.contains
   }
 
   @Test
@@ -34,7 +44,7 @@
     DynamicSet<Integer> ds = new DynamicSet<>();
     ds.add(2);
 
-    assertThat(ds).contains(2);
+    assertThat(ds.contains(2)).isTrue(); //See above comment about ds.contains
   }
 
   @Test
@@ -42,7 +52,7 @@
     DynamicSet<Integer> ds = new DynamicSet<>();
     ds.add(2);
 
-    assertThat(ds).doesNotContain(3);
+    assertThat(ds.contains(3)).isFalse(); //See above comment about ds.contains
   }
 
   @Test
@@ -51,7 +61,7 @@
     ds.add(2);
     ds.add(4);
 
-    assertThat(ds).contains(4);
+    assertThat(ds.contains(4)).isTrue(); //See above comment about ds.contains
   }
 
   @Test
@@ -60,7 +70,7 @@
     ds.add(2);
     ds.add(4);
 
-    assertThat(ds).doesNotContain(3);
+    assertThat(ds.contains(3)).isFalse(); //See above comment about ds.contains
   }
 
   @Test
@@ -74,12 +84,12 @@
     ds.add(6);
 
     // At first, 4 is contained.
-    assertThat(ds).contains(4);
+    assertThat(ds.contains(4)).isTrue(); //See above comment about ds.contains
 
     // Then we remove 4.
     handle.remove();
 
     // And now 4 should no longer be contained.
-    assertThat(ds).doesNotContain(4);
+    assertThat(ds.contains(4)).isFalse(); //See above comment about ds.contains
   }
 }