Improved: Use ‘containsInAnyOrder’ matcher when possible

(OFBIZ-10941) It is more precise to use ‘containsInAnyOrder’ matcher than checking the presence of items and the size of the collections separately. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1857959 13f79535-47bb-0310-9956-ffa450edef68
apache · Apr 22, 2019 · 47ea42c · 47ea42c
1 parent 2b541d7
commit 47ea42c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/...se/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextAdapterTests.java b/...se/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextAdapterTests.java
@@ -18,8 +18,7 @@
  *******************************************************************************/
 package org.apache.ofbiz.base.collections;
 
-import static org.hamcrest.CoreMatchers.hasItems;
-import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
@@ -56,8 +55,7 @@ public void containsValueBasic() {
 
     @Test
     public void valuesBasic() {
-        assertThat(adapter.values(), hasItems(0, 3));
-        assertThat(adapter.values().size(), is(2));
+        assertThat(adapter.values(), containsInAnyOrder(0, 3));
     }
 
     @Test

diff --git a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/FormRendererTest.java b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/FormRendererTest.java
@@ -18,8 +18,7 @@
  *******************************************************************************/
 package org.apache.ofbiz.widget.renderer;
 
-import static org.hamcrest.CoreMatchers.hasItems;
-import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -58,8 +57,7 @@ public void fieldsToRenderBasic() {
         fields.add(a);
         ModelFormField b = ModelFormField.from(new ModelFormFieldBuilder().setName("B"));
         fields.add(b);
-        assertThat(renderer.getUsedFields(context), hasItems(a, b));
-        assertThat(renderer.getUsedFields(context).size(), is(2));
+        assertThat(renderer.getUsedFields(context), containsInAnyOrder(a, b));
     }
 
     @Test
@@ -70,8 +68,7 @@ public void fieldsToRenderDuplicates() {
         fields.add(b);
         ModelFormField a2 = ModelFormField.from(new ModelFormFieldBuilder().setName("A"));
         fields.add(a2);
-        assertThat(renderer.getUsedFields(context), hasItems(a1, a2, b));
-        assertThat(renderer.getUsedFields(context).size(), is(3));
+        assertThat(renderer.getUsedFields(context), containsInAnyOrder(a1, a2, b));
     }
 
     @Test
@@ -82,8 +79,7 @@ public void fieldsToRenderBasicUseWhen() {
         ModelFormField a2 = ModelFormField.from(new ModelFormFieldBuilder().setName("A").setUseWhen("false"));
         fields.add(a2);
         useWhenFields.add(a2.getName());
-        assertThat(renderer.getUsedFields(context), hasItems(a1, a2));
-        assertThat(renderer.getUsedFields(context).size(), is(2));
+        assertThat(renderer.getUsedFields(context), containsInAnyOrder(a1, a2));
     }
 
     @Test
@@ -97,8 +93,7 @@ public void fieldsToRenderDuplicatesUseWhen() {
         ModelFormField a3 = ModelFormField.from(new ModelFormFieldBuilder().setName("A").setUseWhen("true"));
         fields.add(a3);
         useWhenFields.add(a3.getName());
-        assertThat(renderer.getUsedFields(context), hasItems(a1, a2));
-        assertThat(renderer.getUsedFields(context).size(), is(2));
+        assertThat(renderer.getUsedFields(context), containsInAnyOrder(a1, a2));
     }
 
 }