Swap 'merged dtype same as NumPy' test of v1 for test of v2. (#1515)

scikit-hep · Jun 23, 2022 · 00d9b7a · 00d9b7a
1 parent 2b6252d
commit 00d9b7a
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 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
@@ -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
@@ -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():