ueshin commented on a change in pull request #32859: URL: https://github.com/apache/spark/pull/32859#discussion_r653813926
########## File path: python/pyspark/pandas/tests/data_type_ops/test_base.py ########## @@ -0,0 +1,87 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +from pyspark.pandas.typedef.typehints import extension_object_dtypes_available + +if extension_object_dtypes_available: + from pandas import BooleanDtype +from pandas.api.types import CategoricalDtype +from pandas.api.extensions import ExtensionDtype + +from pyspark.pandas.typedef.typehints import ( + extension_object_dtypes_available, +) Review comment: This is imported twice. I think we can put `from pandas import BooleanDtype` in `test_bool_ext_ops`. ########## File path: python/pyspark/pandas/tests/data_type_ops/test_base.py ########## @@ -0,0 +1,87 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +from pyspark.pandas.typedef.typehints import extension_object_dtypes_available + +if extension_object_dtypes_available: + from pandas import BooleanDtype +from pandas.api.types import CategoricalDtype +from pandas.api.extensions import ExtensionDtype + +from pyspark.pandas.typedef.typehints import ( + extension_object_dtypes_available, +) +from pyspark.pandas.data_type_ops.base import DataTypeOps +from pyspark.pandas.data_type_ops.binary_ops import BinaryOps +from pyspark.pandas.data_type_ops.boolean_ops import BooleanOps, BooleanExtensionOps +from pyspark.pandas.data_type_ops.categorical_ops import CategoricalOps +from pyspark.pandas.data_type_ops.complex_ops import ArrayOps, MapOps, StructOps +from pyspark.pandas.data_type_ops.date_ops import DateOps +from pyspark.pandas.data_type_ops.datetime_ops import DatetimeOps +from pyspark.pandas.data_type_ops.null_ops import NullOps +from pyspark.pandas.data_type_ops.num_ops import IntegralOps, FractionalOps +from pyspark.pandas.data_type_ops.string_ops import StringOps +from pyspark.pandas.data_type_ops.udt_ops import UDTOps +from pyspark.pandas.tests.data_type_ops.testing_utils import TestCasesUtils +from pyspark.sql.types import ( + ArrayType, + BinaryType, + BooleanType, + DataType, + DateType, + FractionalType, + IntegralType, + MapType, + NullType, + StringType, + StructType, + TimestampType, + UserDefinedType, +) +from pyspark.testing.pandasutils import PandasOnSparkTestCase + + +class BaseTest(PandasOnSparkTestCase, TestCasesUtils): + def test_data_type_ops(self): + _mock_spark_type = DataType() + _mock_dtype = ExtensionDtype() + _mappings = ( + (CategoricalDtype(), _mock_spark_type, CategoricalOps), + (_mock_dtype, FractionalType(), FractionalOps), + (_mock_dtype, IntegralType(), IntegralOps), + (_mock_dtype, StringType(), StringOps), + (_mock_dtype, BooleanType(), BooleanOps), + (_mock_dtype, TimestampType(), DatetimeOps), + (_mock_dtype, DateType(), DateOps), + (_mock_dtype, BinaryType(), BinaryOps), + (_mock_dtype, ArrayType(StringType()), ArrayOps), + (_mock_dtype, MapType(StringType(), IntegralType()), MapOps), + (_mock_dtype, StructType(), StructOps), + (_mock_dtype, NullType(), NullOps), + (_mock_dtype, UserDefinedType(), UDTOps), + ) + for _dtype, _spark_type, _ops in _mappings: + self.assertIsInstance(DataTypeOps(_dtype, _spark_type), _ops) + + _unknow_spark_type = _mock_spark_type + self.assertRaises(TypeError, DataTypeOps, BooleanType(), _unknow_spark_type) + + def test_bool_ext_ops(self): + if extension_object_dtypes_available: + self.assertIsInstance(DataTypeOps(BooleanDtype(), BooleanType()), BooleanExtensionOps) + else: + self.assertIsInstance(DataTypeOps(ExtensionDtype(), BooleanType()), BooleanOps) Review comment: The test cases in this file is not triggered. Could you add a footer? ########## File path: python/pyspark/pandas/tests/data_type_ops/test_base.py ########## @@ -0,0 +1,87 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +from pyspark.pandas.typedef.typehints import extension_object_dtypes_available + +if extension_object_dtypes_available: + from pandas import BooleanDtype +from pandas.api.types import CategoricalDtype +from pandas.api.extensions import ExtensionDtype + +from pyspark.pandas.typedef.typehints import ( + extension_object_dtypes_available, +) +from pyspark.pandas.data_type_ops.base import DataTypeOps +from pyspark.pandas.data_type_ops.binary_ops import BinaryOps +from pyspark.pandas.data_type_ops.boolean_ops import BooleanOps, BooleanExtensionOps +from pyspark.pandas.data_type_ops.categorical_ops import CategoricalOps +from pyspark.pandas.data_type_ops.complex_ops import ArrayOps, MapOps, StructOps +from pyspark.pandas.data_type_ops.date_ops import DateOps +from pyspark.pandas.data_type_ops.datetime_ops import DatetimeOps +from pyspark.pandas.data_type_ops.null_ops import NullOps +from pyspark.pandas.data_type_ops.num_ops import IntegralOps, FractionalOps +from pyspark.pandas.data_type_ops.string_ops import StringOps +from pyspark.pandas.data_type_ops.udt_ops import UDTOps +from pyspark.pandas.tests.data_type_ops.testing_utils import TestCasesUtils +from pyspark.sql.types import ( + ArrayType, + BinaryType, + BooleanType, + DataType, + DateType, + FractionalType, + IntegralType, + MapType, + NullType, + StringType, + StructType, + TimestampType, + UserDefinedType, +) +from pyspark.testing.pandasutils import PandasOnSparkTestCase + + +class BaseTest(PandasOnSparkTestCase, TestCasesUtils): Review comment: I guess we don't need to extend both `PandasOnSparkTestCase` and `TestCasesUtils` but only `unittest.TestCase` for this test case? ########## File path: python/pyspark/pandas/tests/data_type_ops/test_base.py ########## @@ -0,0 +1,87 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +from pyspark.pandas.typedef.typehints import extension_object_dtypes_available + +if extension_object_dtypes_available: + from pandas import BooleanDtype +from pandas.api.types import CategoricalDtype +from pandas.api.extensions import ExtensionDtype + +from pyspark.pandas.typedef.typehints import ( + extension_object_dtypes_available, +) +from pyspark.pandas.data_type_ops.base import DataTypeOps +from pyspark.pandas.data_type_ops.binary_ops import BinaryOps +from pyspark.pandas.data_type_ops.boolean_ops import BooleanOps, BooleanExtensionOps +from pyspark.pandas.data_type_ops.categorical_ops import CategoricalOps +from pyspark.pandas.data_type_ops.complex_ops import ArrayOps, MapOps, StructOps +from pyspark.pandas.data_type_ops.date_ops import DateOps +from pyspark.pandas.data_type_ops.datetime_ops import DatetimeOps +from pyspark.pandas.data_type_ops.null_ops import NullOps +from pyspark.pandas.data_type_ops.num_ops import IntegralOps, FractionalOps +from pyspark.pandas.data_type_ops.string_ops import StringOps +from pyspark.pandas.data_type_ops.udt_ops import UDTOps +from pyspark.pandas.tests.data_type_ops.testing_utils import TestCasesUtils +from pyspark.sql.types import ( + ArrayType, + BinaryType, + BooleanType, + DataType, + DateType, + FractionalType, + IntegralType, + MapType, + NullType, + StringType, + StructType, + TimestampType, + UserDefinedType, +) +from pyspark.testing.pandasutils import PandasOnSparkTestCase + + +class BaseTest(PandasOnSparkTestCase, TestCasesUtils): + def test_data_type_ops(self): + _mock_spark_type = DataType() + _mock_dtype = ExtensionDtype() + _mappings = ( + (CategoricalDtype(), _mock_spark_type, CategoricalOps), + (_mock_dtype, FractionalType(), FractionalOps), + (_mock_dtype, IntegralType(), IntegralOps), + (_mock_dtype, StringType(), StringOps), + (_mock_dtype, BooleanType(), BooleanOps), + (_mock_dtype, TimestampType(), DatetimeOps), + (_mock_dtype, DateType(), DateOps), + (_mock_dtype, BinaryType(), BinaryOps), + (_mock_dtype, ArrayType(StringType()), ArrayOps), + (_mock_dtype, MapType(StringType(), IntegralType()), MapOps), + (_mock_dtype, StructType(), StructOps), + (_mock_dtype, NullType(), NullOps), + (_mock_dtype, UserDefinedType(), UDTOps), + ) + for _dtype, _spark_type, _ops in _mappings: + self.assertIsInstance(DataTypeOps(_dtype, _spark_type), _ops) + + _unknow_spark_type = _mock_spark_type + self.assertRaises(TypeError, DataTypeOps, BooleanType(), _unknow_spark_type) + + def test_bool_ext_ops(self): + if extension_object_dtypes_available: + self.assertIsInstance(DataTypeOps(BooleanDtype(), BooleanType()), BooleanExtensionOps) + else: + self.assertIsInstance(DataTypeOps(ExtensionDtype(), BooleanType()), BooleanOps) Review comment: The test cases in this file are not triggered. Could you add a footer? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
