add column multi index test for series.dot(df), refactoring

Author: shobsi

tests/system/small/test_multiindex.py

@@ -1045,3 +1045,21 @@ def test_column_multi_index_dot_not_supported():
         NotImplementedError, match="Multi-level column input is not supported"
     ):
         bf1 @ bf2
+
+
+def test_series_dot_df_column_multi_index():
+    left = [10, 11, 12, 13]  # series data
+    right = [[0, 1, 2], [-2, 3, -4], [4, -5, 6], [6, 7, -8]]  # dataframe data
+
+    multi_level_columns = pandas.MultiIndex.from_arrays(
+        [["col0", "col0", "col1"], ["col00", "col01", "col11"]]
+    )
+
+    bf_result = bpd.Series(left) @ bpd.DataFrame(right, columns=multi_level_columns)
+    pd_result = pandas.Series(left) @ pandas.DataFrame(
+        right, columns=multi_level_columns
+    )
+
+    pandas.testing.assert_series_equal(
+        bf_result.to_pandas(), pd_result, check_index_type=False, check_dtype=False
+    )

tests/system/small/test_series.py

@@ -22,7 +22,6 @@
 import pyarrow as pa  # type: ignore
 import pytest
 
-import bigframes.dataframe as dataframe
 import bigframes.pandas
 import bigframes.series as series
 from tests.system.utils import assert_pandas_df_equal, assert_series_equal
@@ -2267,24 +2266,21 @@ def test_dot(scalars_dfs):
     assert bf_result == pd_result
 
 
-def test_dot_df(scalars_dfs):
-    scalars_df, scalars_pandas_df = scalars_dfs
-    bf_result = scalars_df["int64_too"] @ scalars_df[["int64_col", "int64_too"]]
-    pd_result = (
-        scalars_pandas_df["int64_too"] @ scalars_pandas_df[["int64_col", "int64_too"]]
-    )
+def test_dot_df(matrix_3by4_df, matrix_3by4_pandas_df):
+    bf_result = matrix_3by4_df["w"] @ matrix_3by4_df
+    pd_result = matrix_3by4_pandas_df["w"] @ matrix_3by4_pandas_df
 
     pd.testing.assert_series_equal(
         bf_result.to_pandas(), pd_result, check_index_type=False, check_dtype=False
     )
 
 
-def test_dot_df_inline(scalars_dfs):
-    left = [10, 11, 12, 13]  # series data
-    right = [[0, 1], [-2, 3], [4, -5], [6, 7]]  # dataframe data
-
-    bf_result = series.Series(left) @ dataframe.DataFrame(right)
-    pd_result = pd.Series(left) @ pd.DataFrame(right)
+def test_dot_df_with_na(scalars_dfs):
+    scalars_df, scalars_pandas_df = scalars_dfs
+    bf_result = scalars_df["int64_too"] @ scalars_df[["int64_col", "int64_too"]]
+    pd_result = (
+        scalars_pandas_df["int64_too"] @ scalars_pandas_df[["int64_col", "int64_too"]]
+    )
 
     pd.testing.assert_series_equal(
         bf_result.to_pandas(), pd_result, check_index_type=False, check_dtype=False