Split integration test into two #127 and #377

metafacture · Oct 15, 2024 · 0309e67 · 0309e67
1 parent 06b39e0
commit 0309e67
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 13 deletions.
diff --git a/...ptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/expected.json b/...ptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/expected.json
@@ -0,0 +1,8 @@
+{
+  "rswk" : [ {
+    "subjectTopicName" : "Nonprofit organizations"
+  }, {
+    "subjectTopicName" : "Nonprofit organizations",
+    "subjectGenre" : "Case studies"
+  } ]
+}
diff --git a/...lInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/input.xml b/...lInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/input.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<collection xmlns="http://www.loc.gov/MARC21/slim">
+    <record>
+        <datafield tag="650" ind1=" " ind2=" ">
+            <subfield code="a">Nonprofit organizations</subfield>
+            <subfield code="x">Management.</subfield>
+        </datafield>
+        <datafield tag="650" ind1=" " ind2=" ">
+            <subfield code="a">Nonprofit organizations</subfield>
+            <subfield code="x">Management</subfield>
+            <subfield code="v">Case studies.</subfield>
+        </datafield>
+    </record>
+</collection>
diff --git a/...llInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.fix b/...llInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.fix
@@ -0,0 +1,7 @@
+do list(path: "650??", "var": "$i")
+  copy_field("$i.a", "rswk[].$append.subjectTopicName")
+  copy_field("$i.v", "rswk[].$last.subjectGenre")
+end
+replace_all("rswk[].*.subjectGenre", "[.]$", "")
+
+retain("rswk[]")
diff --git a/...lInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.flux b/...lInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.flux
@@ -0,0 +1,8 @@
+FLUX_DIR + "input.xml"
+|open-file
+|decode-xml
+|handle-marcxml
+|fix(FLUX_DIR + "test.fix")
+|encode-json(prettyPrinting="true")
+|write(FLUX_DIR + "output-metafix.json")
+;
diff --git a/...llInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/todo.txt b/...llInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/todo.txt
@@ -0,0 +1 @@
+See #377 . This behaviour seems to be undetected or new after #369
diff --git a/...d/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/expected.json b/...d/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/expected.json
@@ -4,11 +4,5 @@
   }, {
     "subjectTopicName" : "Nonprofit organizations",
     "subjectGenre" : "Case studies"
-  } ],
-  "rswk" : [ {
-    "subjectTopicName" : "Nonprofit organizations"
-  }, {
-    "subjectTopicName" : "Nonprofit organizations",
-    "subjectGenre" : "Case studies"
   } ]
 }
diff --git a/...method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/test.fix b/...method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/test.fix
@@ -5,10 +5,4 @@ do list(path: "650??", "var": "$i")
 end
 replace_all("RSWK[].*.subjectGenre", "[.]$", "")
 
-do list(path: "650??", "var": "$i")
-  copy_field("$i.a", "rswk[].$append.subjectTopicName")
-  copy_field("$i.v", "rswk[].$last.subjectGenre")
-end
-replace_all("rswk[].*.subjectGenre", "[.]$", "")
-
-retain("RSWK[]","rswk[]")
+retain("RSWK[]")