test: update form usage in old tests

we want to move away from legacy-style `RecordArray` forms, so old tests must be changed. There is now a test to ensure that old-style forms are compatible with new-style forms.
scikit-hep · Oct 6, 2022 · 9f09ea7 · 9f09ea7
1 parent c4db00a
commit 9f09ea7
Show file tree

Hide file tree

Showing 4 changed files with 155 additions and 106 deletions.
diff --git a/tests/test_0025-record-array.py b/tests/test_0025-record-array.py
@@ -43,16 +43,17 @@ def test_basic():
     assert json.loads(ak.forms.form.Form.to_json(recordarray.form)) == (
         {
             "class": "RecordArray",
-            "contents": {
-                "one": {
+            "fields": ["one", "two", "2", "wonky"],
+            "contents": [
+                {
                     "class": "NumpyArray",
                     "primitive": "int64",
                     "inner_shape": [],
                     "has_identifier": False,
                     "parameters": {},
                     "form_key": None,
                 },
-                "two": {
+                {
                     "class": "ListOffsetArray",
                     "offsets": "i64",
                     "content": {
@@ -67,23 +68,23 @@ def test_basic():
                     "parameters": {},
                     "form_key": None,
                 },
-                "2": {
+                {
                     "class": "NumpyArray",
                     "primitive": "float64",
                     "inner_shape": [],
                     "has_identifier": False,
                     "parameters": {},
                     "form_key": None,
                 },
-                "wonky": {
+                {
                     "class": "NumpyArray",
                     "primitive": "int64",
                     "inner_shape": [],
                     "has_identifier": False,
                     "parameters": {},
                     "form_key": None,
                 },
-            },
+            ],
             "has_identifier": False,
             "parameters": {},
             "form_key": None,
@@ -135,16 +136,17 @@ def test_basic():
 
     assert json.loads(ak.forms.form.Form.to_json(recordarray.form)) == {
         "class": "RecordArray",
-        "contents": {
-            "one": {
+        "fields": ["one", "two", "2", "wonky"],
+        "contents": [
+            {
                 "class": "NumpyArray",
                 "primitive": "int64",
                 "inner_shape": [],
                 "has_identifier": False,
                 "parameters": {},
                 "form_key": None,
             },
-            "two": {
+            {
                 "class": "ListOffsetArray",
                 "offsets": "i64",
                 "content": {
@@ -159,23 +161,23 @@ def test_basic():
                 "parameters": {},
                 "form_key": None,
             },
-            "2": {
+            {
                 "class": "NumpyArray",
                 "primitive": "float64",
                 "inner_shape": [],
                 "has_identifier": False,
                 "parameters": {},
                 "form_key": None,
             },
-            "wonky": {
+            {
                 "class": "NumpyArray",
                 "primitive": "int64",
                 "inner_shape": [],
                 "has_identifier": False,
                 "parameters": {},
                 "form_key": None,
             },
-        },
+        ],
         "has_identifier": False,
         "parameters": {},
         "form_key": None,

diff --git a/tests/test_0057-introducing-forms.py b/tests/test_0057-introducing-forms.py
@@ -265,34 +265,36 @@ def test_forms():
     assert ak.forms.from_json(form.to_json()) == form
     assert json.loads(form.to_json()) == {
         "class": "RecordArray",
-        "contents": {
-            "one": {
+        "fields": ["one", "two"],
+        "contents": [
+            {
                 "class": "NumpyArray",
                 "inner_shape": [],
                 "primitive": "float64",
                 "has_identifier": False,
                 "parameters": {},
                 "form_key": None,
             },
-            "two": {
+            {
                 "class": "NumpyArray",
                 "inner_shape": [],
                 "primitive": "bool",
                 "has_identifier": False,
                 "parameters": {},
                 "form_key": None,
             },
-        },
+        ],
         "has_identifier": False,
         "parameters": {"hey": ["you"]},
         "form_key": "yowzers",
     }
     assert json.loads(str(form)) == {
         "class": "RecordArray",
-        "contents": {
-            "one": "float64",
-            "two": "bool",
-        },
+        "fields": ["one", "two"],
+        "contents": [
+            "float64",
+            "bool",
+        ],
         "parameters": {"hey": ["you"]},
         "form_key": "yowzers",
     }
@@ -308,6 +310,7 @@ def test_forms():
     assert ak.forms.from_json(form.to_json()) == form
     assert json.loads(form.to_json()) == {
         "class": "RecordArray",
+        "fields": None,
         "contents": [
             {
                 "class": "NumpyArray",
@@ -332,6 +335,7 @@ def test_forms():
     }
     assert json.loads(str(form)) == {
         "class": "RecordArray",
+        "fields": None,
         "contents": ["float64", "bool"],
         "parameters": {"hey": ["you"]},
         "form_key": "yowzers",