TST : Renamed and changed the location of unittests.

Author: pfrcks

doc/source/whatsnew/v0.18.2.txt

@@ -149,4 +149,4 @@ Bug Fixes
 - Bug in ``NaT`` - ``Period`` raises ``AttributeError`` (:issue:`13071`)
 - Bug in ``Period`` addition raises ``TypeError`` if ``Period`` is on right hand side (:issue:`13069`)
 - Bug in ``pd.set_eng_float_format()`` that would prevent NaN's from formatting (:issue:`11981`)
-- Fixed the bug in ``DataFrame.align()`` which was giving wrong output when supplied with the ``join`` argument. (:issue:`13194`) 
+- Fixed the bug in ``DataFrame.align()`` which was giving wrong output when supplied with the ``join`` argument. Earlier, upon supplying value of join argument as any of the four('outer', 'inner', 'left', 'right' ), align() was giving erraneous output. The problem was identified to be in pandas/core/generic.py and has been subsequently fixed. (:issue:`13194`) 

pandas/tests/frame/test_axis_select_reindex.py

@@ -880,3 +880,53 @@ def test_reindex_multi(self):
         expected = df.reindex([0, 1]).reindex(columns=['a', 'b'])
 
         assert_frame_equal(result, expected)
+
+    def test_align_broadcast_axis(self):
+        # GH 13194
+        # For 'outer' join
+        df = DataFrame(np.array([[1., 2.], [3., 4.]]), columns=list('AB'))
+        ts = Series([5., 6., 7.])
+        result = df.align(ts, join='outer', axis=0, broadcast_axis=1)
+        result1 = DataFrame(result[0])
+        result2 = DataFrame(result[1])
+        expected1 = DataFrame(np.array([[1., 2.], [3., 4.],
+                                        [pd.np.nan, pd.np.nan]]),
+                              columns=list('AB'))
+        expected2 = DataFrame(np.array([[5., 5.], [6., 6.], [7., 7.]]),
+                              columns=list('AB'))
+        assert_frame_equal(result1, expected1)
+        assert_frame_equal(result2, expected2)
+
+        # For 'inner' join
+        result = df.align(ts, join='inner', axis=0, broadcast_axis=1)
+        result1 = DataFrame(result[0])
+        result2 = DataFrame(result[1])
+        expected1 = DataFrame(np.array([[1., 2.], [3., 4.]]),
+                              columns=list('AB'))
+        expected2 = DataFrame(np.array([[5., 5.], [6., 6.]]),
+                              columns=list('AB'))
+        assert_frame_equal(result1, expected1)
+        assert_frame_equal(result2, expected2)
+
+        # For 'left' join
+        result = df.align(ts, join='left', axis=0, broadcast_axis=1)
+        result1 = DataFrame(result[0])
+        result2 = DataFrame(result[1])
+        expected1 = DataFrame(np.array([[1., 2.], [3., 4.]]),
+                              columns=list('AB'))
+        expected2 = DataFrame(np.array([[5., 5.], [6., 6.]]),
+                              columns=list('AB'))
+        assert_frame_equal(result1, expected1)
+        assert_frame_equal(result2, expected2)
+
+        # For 'right' join
+        result = df.align(ts, join='right', axis=0, broadcast_axis=1)
+        result1 = DataFrame(result[0])
+        result2 = DataFrame(result[1])
+        expected1 = DataFrame(np.array([[1., 2.], [3., 4.],
+                                        [pd.np.nan, pd.np.nan]]),
+                              columns=list('AB'))
+        expected2 = DataFrame(np.array([[5., 5.], [6., 6.], [7., 7.]]),
+                              columns=list('AB'))
+        assert_frame_equal(result1, expected1)
+        assert_frame_equal(result2, expected2)

pandas/tests/test_generic.py

@@ -1874,51 +1874,6 @@ def test_pipe_panel(self):
         with tm.assertRaises(ValueError):
             result = wp.pipe((f, 'y'), x=1, y=1)
 
-    def test_align_joins(self):
-        df = DataFrame(np.array([[1., 2.], [3., 4.]]), columns=list('AB'))
-        ts = Series([5., 6., 7.])
-        check = df.align(ts, join='outer', axis=0, broadcast_axis=1)
-        df1 = DataFrame(check[0])
-        df2 = DataFrame(check[1])
-        expected1 = DataFrame(np.array([[1., 2.], [3., 4.],
-                                        [pd.np.nan, pd.np.nan]]),
-                              columns=list('AB'))
-        expected2 = DataFrame(np.array([[5., 5.], [6., 6.], [7., 7.]]),
-                              columns=list('AB'))
-        assert_frame_equal(df1, expected1)
-        assert_frame_equal(df2, expected2)
-
-        check = df.align(ts, join='inner', axis=0, broadcast_axis=1)
-        df1 = DataFrame(check[0])
-        df2 = DataFrame(check[1])
-        expected1 = DataFrame(np.array([[1., 2.], [3., 4.]]),
-                              columns=list('AB'))
-        expected2 = DataFrame(np.array([[5., 5.], [6., 6.]]),
-                              columns=list('AB'))
-        assert_frame_equal(df1, expected1)
-        assert_frame_equal(df2, expected2)
-
-        check = df.align(ts, join='left', axis=0, broadcast_axis=1)
-        df1 = DataFrame(check[0])
-        df2 = DataFrame(check[1])
-        expected1 = DataFrame(np.array([[1., 2.], [3., 4.]]),
-                              columns=list('AB'))
-        expected2 = DataFrame(np.array([[5., 5.], [6., 6.]]),
-                              columns=list('AB'))
-        assert_frame_equal(df1, expected1)
-        assert_frame_equal(df2, expected2)
-
-        check = df.align(ts, join='right', axis=0, broadcast_axis=1)
-        df1 = DataFrame(check[0])
-        df2 = DataFrame(check[1])
-        expected1 = DataFrame(np.array([[1., 2.], [3., 4.],
-                                        [pd.np.nan, pd.np.nan]]),
-                              columns=list('AB'))
-        expected2 = DataFrame(np.array([[5., 5.], [6., 6.], [7., 7.]]),
-                              columns=list('AB'))
-        assert_frame_equal(df1, expected1)
-        assert_frame_equal(df2, expected2)
-
 
 if __name__ == '__main__':
     nose.runmodule(argv=[__file__, '-vvs', '-x', '--pdb', '--pdb-failure'],