fix dropna=false tests

Author: OXPHOS

pandas/tools/tests/test_pivot.py

@@ -1072,17 +1072,17 @@ def test_margin_dropna(self):
         df = pd.DataFrame({'a': [1, 2, 2, 2, 2, np.nan],
                            'b': [3, 3, 4, 4, 4, 4]})
         actual = pd.crosstab(df.a, df.b, margins=True, dropna=False)
-        expected = pd.DataFrame([[1, 0, 1], [1, 3, 4], [2, 4, 6]])
-        expected.index = Index([1.0, 2.0, 'All'], name='a')
-        expected.columns = Index([3, 4, 'All'], name='b')
+        expected = pd.DataFrame([[1, 0, 1], [1, 3, 4], [0, 1, 1], [2, 4, 6]])
+        expected.index = Index([1.0, 2.0, np.nan, 'All'], name='a')
+        expected.columns = Index([3.0, 4.0, 'All'], name='b')
         tm.assert_frame_equal(actual, expected)
 
         df = DataFrame({'a': [1, np.nan, np.nan, np.nan, 2, np.nan],
                         'b': [3, np.nan, 4, 4, 4, 4]})
         actual = pd.crosstab(df.a, df.b, margins=True, dropna=False)
-        expected = pd.DataFrame([[1, 0, 1], [0, 1, 1], [1, 4, 6]])
-        expected.index = Index([1.0, 2.0, 'All'], name='a')
-        expected.columns = Index([3.0, 4.0, 'All'], name='b')
+        expected = pd.DataFrame([[1, 0, 0, 1], [0, 1, 0, 1], [0, 3, 1, 4], [1, 4, 1, 6]])
+        expected.index = Index([1.0, 2.0, np.nan, 'All'], name='a')
+        expected.columns = Index([3.0, 4.0, np.nan, 'All'], name='b')
         tm.assert_frame_equal(actual, expected)
 
         a = np.array(['foo', 'foo', 'foo', 'bar',
@@ -1094,20 +1094,20 @@ def test_margin_dropna(self):
 
         actual = pd.crosstab(a, [b, c], rownames=['a'],
                              colnames=['b', 'c'], margins=True, dropna=False)
-        m = MultiIndex.from_arrays([['one', 'one', 'two', 'two', 'All'],
-                                    ['dull', 'shiny', 'dull', 'shiny', '']],
+        m = MultiIndex.from_arrays([[np.nan, np.nan, 'one', 'one', 'two', 'two', 'All'],
+                                    ['dull', 'shiny', 'dull', 'shiny', 'dull', 'shiny', '']],
                                    names=['b', 'c'])
-        expected = DataFrame([[1, 0, 1, 0, 2], [2, 0, 1, 1, 5],
-                              [3, 0, 2, 1, 7]], columns=m)
+        expected = DataFrame([[0, 0, 1, 0, 1, 0, 2], [0, 1, 2, 0, 1, 1, 5],
+                              [0, 1, 3, 0, 2, 1, 7]], columns=m)
         expected.index = Index(['bar', 'foo', 'All'], name='a')
         tm.assert_frame_equal(actual, expected)
 
         actual = pd.crosstab([a, b], c, rownames=['a', 'b'],
                              colnames=['c'], margins=True, dropna=False)
-        m = MultiIndex.from_arrays([['bar', 'bar', 'foo', 'foo', 'All'],
-                                    ['one', 'two', 'one', 'two', '']],
+        m = MultiIndex.from_arrays([['bar', 'bar', 'bar', 'foo', 'foo', 'foo', 'All'],
+                                    [np.nan, 'one', 'two', np.nan, 'one', 'two', '']],
                                    names=['a', 'b'])
-        expected = DataFrame([[1, 0, 1], [1, 0, 1], [2, 0, 2], [1, 1, 2],
+        expected = DataFrame([[0, 0, 0], [1, 0, 1], [1, 0, 1], [0, 1, 1], [2, 0, 2], [1, 1, 2],
                               [5, 2, 7]], index=m)
         expected.columns = Index(['dull', 'shiny', 'All'], name='c')
         tm.assert_frame_equal(actual, expected)