series test update and fixes

Author: pandeconscious

pandas/core/frame.py

@@ -11964,8 +11964,8 @@ def corrwith(
             correl = num / dom
 
         elif method in ["kendall", "spearman"] or callable(method):
-            left = left._convert_ordered_cat_to_code()
-            right = right._convert_ordered_cat_to_code()
+            left = left._transform_ord_cat_cols_to_coded_cols()
+            right = right._transform_ord_cat_cols_to_coded_cols()
             def c(x):
                 return nanops.nancorr(x[0], x[1], method=method)
 

pandas/tests/series/methods/test_cov_corr.py

@@ -200,14 +200,37 @@ def test_corr_rank_ordered_categorical(self, method,):
         ser_ord_float = pd.Series([2.0, 3.0, 4.5, 6.5])
 
         corr_calc = ser_ord_cat.corr(ser_ord_int, method=method)
-        corr_expected = method_scipy_func[method](ser_ord_cat_codes, ser_ord_int)[0]
+        corr_expected = method_scipy_func[method](ser_ord_cat_codes, ser_ord_int, nan_policy="omit")[0]
         tm.assert_almost_equal(corr_calc, corr_expected)
 
         corr_calc = ser_ord_cat.corr(ser_ord_float, method=method)
-        corr_expected = method_scipy_func[method](ser_ord_cat_codes, ser_ord_float)[0]
+        corr_expected = method_scipy_func[method](ser_ord_cat_codes, ser_ord_float, nan_policy="omit")[0]
         tm.assert_almost_equal(corr_calc, corr_expected)
 
         corr_calc = ser_ord_cat.corr(ser_ord_cat, method=method)
-        corr_expected = method_scipy_func[method](ser_ord_cat_codes, ser_ord_cat_codes)[0]
+        corr_expected = method_scipy_func[method](ser_ord_cat_codes, ser_ord_cat_codes, nan_policy="omit")[0]
         tm.assert_almost_equal(corr_calc, corr_expected)
+
+        ser_ord_cat_shuff = pd.Series( pd.Categorical(
+             ["h", "low", "vh", "m"], 
+             categories=["low", "m", "h", "vh"], ordered=True
+             ))
+        ser_ord_cat_shuff_codes = ser_ord_cat_shuff.cat.codes.replace(-1, np.nan)
 
+        corr_calc = ser_ord_cat_shuff.corr(ser_ord_cat, method=method)
+        corr_expected = method_scipy_func[method](ser_ord_cat_shuff_codes, ser_ord_cat_codes, nan_policy="omit")[0]
+        tm.assert_almost_equal(corr_calc, corr_expected)
+
+        corr_calc = ser_ord_cat_shuff.corr(ser_ord_cat_shuff, method=method)
+        corr_expected = method_scipy_func[method](ser_ord_cat_shuff_codes, ser_ord_cat_shuff_codes, nan_policy="omit")[0]
+        tm.assert_almost_equal(corr_calc, corr_expected)
+        
+        ser_ord_cat_with_nan = pd.Series( pd.Categorical(
+             ["h", "low", "vh", None, "m"], 
+             categories=["low", "m", "h", "vh"], ordered=True
+             ))
+        ser_ord_cat_shuff_with_nan_codes = ser_ord_cat_with_nan.cat.codes.replace(-1, np.nan)
+        ser_ord_int = pd.Series([2, 0, 1, 3, None])
+        corr_calc = ser_ord_cat_with_nan.corr(ser_ord_int, method=method)
+        corr_expected = method_scipy_func[method](ser_ord_cat_shuff_with_nan_codes, ser_ord_int, nan_policy="omit")[0]
+        tm.assert_almost_equal(corr_calc, corr_expected)