From f8aa7c2ef4dd9a1992d36ebd7dac25238cebcbbb Mon Sep 17 00:00:00 2001
From: Maya Tydykov <mtydykov@quantopian.com>
Date: Tue, 19 Apr 2016 16:54:11 -0400
Subject: [PATCH] TST: add test for case when null in expected column

---
 tests/pipeline/test_events.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/pipeline/test_events.py b/tests/pipeline/test_events.py
index 1bf7e46e..107f40aa 100644
--- a/tests/pipeline/test_events.py
+++ b/tests/pipeline/test_events.py
@@ -7,7 +7,7 @@ from unittest import TestCase
 import blaze as bz
 from nose_parameterized import parameterized
 import pandas as pd
-from pandas.util.testing import assert_series_equal
+from pandas.util.testing import assert_series_equal, assert_frame_equal
 
 from zipline.pipeline.common import (
     ANNOUNCEMENT_FIELD_NAME,
@@ -119,6 +119,24 @@ class EventLoaderTestCase(TestCase):
             EventDataSetLoader
         )
 
+    def test_null_in_expected_cols(self):
+        dates_with_null = pd.Series(dtx)
+        dates_with_null[2] = pd.NaT
+        events_by_sid = {0: pd.DataFrame({ANNOUNCEMENT_FIELD_NAME:
+                                          dates_with_null,
+                                          TS_FIELD_NAME: dtx})}
+        loader = EventDataSetLoader(
+            dtx,
+            events_by_sid,
+        )
+
+        expected = events_by_sid[0].drop(2, axis=0).set_index(TS_FIELD_NAME)
+        # Check that index by first given date has been added
+        assert_frame_equal(
+            loader.events_by_sid[0],
+            expected,
+        )
+
     @parameterized.expand([
         # DataFrame without timestamp column and infer_timestamps = True
         [pd.DataFrame({ANNOUNCEMENT_FIELD_NAME: dtx}), True],