From d149d9f450d39c15fc4d85544eec13b7017e6cc9 Mon Sep 17 00:00:00 2001
From: Narendra Pathai <narendra.pathai@gmail.com>
Date: Sun, 2 Nov 2014 16:51:27 +0530
Subject: [PATCH] Resolved Issue #69 by adding null safe check similar to the
 one in issue #25

---
 .../collection/IsIterableContainingInOrder.java     | 13 ++++++++++++-
 .../collection/IsIterableContainingInOrderTest.java |  4 ++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
index a6a84638..164bc914 100644
--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
@@ -4,6 +4,7 @@
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
+import org.hamcrest.core.IsNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -135,7 +136,8 @@ public static <E> Matcher<Iterable<? extends E>> contains(final Matcher<? super
      */
     @Factory
     public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>... itemMatchers) {
-        return contains(asList(itemMatchers));
+    	final List<Matcher<? super E>> nullSafeWithExplicitTypeMatchers = nullSafe(itemMatchers);
+    	return contains(nullSafeWithExplicitTypeMatchers);
     }
 
     /**
@@ -155,4 +157,13 @@ public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>...
     public static <E> Matcher<Iterable<? extends E>> contains(List<Matcher<? super E>> itemMatchers) {
         return new IsIterableContainingInOrder<E>(itemMatchers);
     }
+    
+    @SuppressWarnings("unchecked")
+    private static <E> List<Matcher<? super E>> nullSafe(Matcher<? super E>[] itemMatchers) {
+        final List<Matcher<? super E>> matchers = new ArrayList<Matcher<? super E>>(itemMatchers.length);
+        for (final Matcher<? super E> itemMatcher : itemMatchers) {
+            matchers.add((Matcher<? super E>) (itemMatcher == null ? IsNull.nullValue() : itemMatcher));
+        }
+        return matchers;
+    }
 }
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInOrderTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInOrderTest.java
index 5d03dc43..8cb1bf82 100644
--- a/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInOrderTest.java
+++ b/hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInOrderTest.java
@@ -53,6 +53,10 @@ public void testDoesNotMatchEmptyIterable() throws Exception {
     public void testHasAReadableDescription() {
         assertDescription("iterable containing [<1>, <2>]", contains(1, 2));
     }
+    
+    public void testCanHandleNullMatchers() {
+    	assertMatches(contains(null, null), asList(null, null));
+    }
 
     public static class WithValue {
       private final int value;