From 00d9b7aa945b50664a5e55be5521c91469f4e8c5 Mon Sep 17 00:00:00 2001 From: Jim Pivarski Date: Thu, 23 Jun 2022 14:48:35 -0500 Subject: [PATCH] Swap 'merged dtype same as NumPy' test of v1 for test of v2. (#1515) --- ...test_0449-merge-many-arrays-in-one-pass.py | 10 +-- ...test_0449-merge-many-arrays-in-one-pass.py | 66 +++++++++++-------- 2 files changed, 45 insertions(+), 31 deletions(-) diff --git a/tests/test_0449-merge-many-arrays-in-one-pass.py b/tests/test_0449-merge-many-arrays-in-one-pass.py index 16b9d1d37c..37f97293cd 100644 --- a/tests/test_0449-merge-many-arrays-in-one-pass.py +++ b/tests/test_0449-merge-many-arrays-in-one-pass.py @@ -49,7 +49,7 @@ def test_numpyarray(): ) assert ak.to_list(ak_combined) == combined.tolist() - assert ak.to_numpy(ak_combined).dtype == combined.dtype + # assert ak.to_numpy(ak_combined).dtype == combined.dtype ak_combined = ak.layout.NumpyArray(one).mergemany( [ @@ -60,10 +60,10 @@ def test_numpyarray(): ) assert ak.to_list(ak_combined) == combined.tolist() - assert ( - ak.to_numpy(ak_combined).dtype - == np.concatenate([one, two, four]).dtype - ) + # assert ( + # ak.to_numpy(ak_combined).dtype + # == np.concatenate([one, two, four]).dtype + # ) def test_lists(): diff --git a/tests/v2/test_0449-merge-many-arrays-in-one-pass.py b/tests/v2/test_0449-merge-many-arrays-in-one-pass.py index 8e1a8f0258..8f0d1bcc60 100644 --- a/tests/v2/test_0449-merge-many-arrays-in-one-pass.py +++ b/tests/v2/test_0449-merge-many-arrays-in-one-pass.py @@ -53,19 +53,26 @@ def test_numpyarray(): assert to_list(ak_combined) == combined.tolist() assert ak_combined.dtype == combined.dtype - # assert ak._v2.contents.NumpyArray(one).typetracer.mergemany( - # [ - # ak._v2.contents.NumpyArray(two), - # ak._v2.contents.NumpyArray(three), - # ak._v2.contents.NumpyArray(four), - # ] - # ).form == ak._v2.contents.NumpyArray(one).mergemany( - # [ - # ak._v2.contents.NumpyArray(two), - # ak._v2.contents.NumpyArray(three), - # ak._v2.contents.NumpyArray(four), - # ] - # ).form + assert ( + ak._v2.contents.NumpyArray(one) + .typetracer.mergemany( + [ + ak._v2.contents.NumpyArray(two), + ak._v2.contents.NumpyArray(three), + ak._v2.contents.NumpyArray(four), + ] + ) + .form + == ak._v2.contents.NumpyArray(one) + .mergemany( + [ + ak._v2.contents.NumpyArray(two), + ak._v2.contents.NumpyArray(three), + ak._v2.contents.NumpyArray(four), + ] + ) + .form + ) ak_combined = ak._v2.contents.NumpyArray(one).mergemany( [ @@ -78,19 +85,26 @@ def test_numpyarray(): assert to_list(ak_combined) == combined.tolist() assert ak_combined.dtype == np.concatenate([one, two, four]).dtype - # assert ak._v2.contents.NumpyArray(one).typetracer.mergemany( - # [ - # ak._v2.contents.NumpyArray(two), - # ak._v2.contents.EmptyArray(), - # ak._v2.contents.NumpyArray(four), - # ] - # ).form == ak._v2.contents.NumpyArray(one).mergemany( - # [ - # ak._v2.contents.NumpyArray(two), - # ak._v2.contents.EmptyArray(), - # ak._v2.contents.NumpyArray(four), - # ] - # ).form + assert ( + ak._v2.contents.NumpyArray(one) + .typetracer.mergemany( + [ + ak._v2.contents.NumpyArray(two), + ak._v2.contents.EmptyArray(), + ak._v2.contents.NumpyArray(four), + ] + ) + .form + == ak._v2.contents.NumpyArray(one) + .mergemany( + [ + ak._v2.contents.NumpyArray(two), + ak._v2.contents.EmptyArray(), + ak._v2.contents.NumpyArray(four), + ] + ) + .form + ) def test_lists():