Merge pull request #376 from metafacture/127-adjustIntegrationTests

metafacture · Oct 16, 2024 · 9b4a6c1 · 9b4a6c1
2 parents d0fc1c6 + 33b1b4a
commit 9b4a6c1
Show file tree

Hide file tree

Showing 27 changed files with 39 additions and 26 deletions.
diff --git a/.../resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listAsSimple/test.fix b/.../resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listAsSimple/test.fix
@@ -1,4 +1,3 @@
-set_array("sourceOrganization[]")
 do list_as(orgId: "ccm:university[]", orgName: "ccm:university_DISPLAYNAME[]")
   copy_field(orgId, "sourceOrganization[].$append.id")
   copy_field(orgName, "sourceOrganization[].$last.name")

diff --git a/...ration/conditional/fromJson/toJson/unlessExists_createArrayOfStringsAndCopyField/test.fix b/...ration/conditional/fromJson/toJson/unlessExists_createArrayOfStringsAndCopyField/test.fix
@@ -1,4 +1,3 @@
 unless exists("animals[]")
-  set_array("animals[]")
   copy_field("animals","animals[].$append")
 end
diff --git a/...ation/lookup/fromJson/toJson/lookupInArrayOfStringsWithNotMatchingValues_complex/test.fix b/...ation/lookup/fromJson/toJson/lookupInArrayOfStringsWithNotMatchingValues_complex/test.fix
@@ -1,5 +1,4 @@
 unless exists("animals[]")
-  set_array("animals[]")
   copy_field("animals","animals[].$append")
 end
 

diff --git a/...tion/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjectsWithListBind_complex/test.fix b/...tion/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjectsWithListBind_complex/test.fix
@@ -1,4 +1,3 @@
-set_array("animals[]")
 do list(path: "test[]", "var": "$f")
   copy_field("$f", "animals[].$append.animal")
   copy_field("$f", "animals[].$last.classification.type")

diff --git a/...toJson/lookupInSubfieldInArrayOfObjectsWithListBind_complex_withNotMatchingValue/test.fix b/...toJson/lookupInSubfieldInArrayOfObjectsWithListBind_complex_withNotMatchingValue/test.fix
@@ -1,4 +1,3 @@
-set_array("animals[]")
 do list(path: "test[]", "var": "$f")
   copy_field("$f", "animals[].$append.animal")
   copy_field("$f", "animals[].$last.classification.type")

diff --git a/...afix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex/test.fix b/...afix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex/test.fix
@@ -1,4 +1,3 @@
-set_array("animals[]")
 do list(path: "test[]", "var": "$f")
   copy_field("$f", "animals[].$append.animal")
   copy_field("$f", "animals[].$last.classification.type")

diff --git a/...ix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2/test.fix b/...ix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2/test.fix
@@ -1,4 +1,3 @@
-set_array("animals[]")
 do list(path: "metadata.real.test[]", "var": "$f")
   lookup("$f.animal", "./mapfile_2.tsv", "sep_char":"\t")
   copy_field("$f.animal", "animals[].$append.animal")

diff --git a/.../fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2_withNotMatchingValue/test.fix b/.../fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2_withNotMatchingValue/test.fix
@@ -1,4 +1,3 @@
-set_array("animals[]")
 do list(path: "metadata.real.test[]", "var": "$f")
   lookup("$f.animal", "./mapfile_2.tsv", "sep_char":"\t")
   copy_field("$f.animal", "animals[].$append.animal")

diff --git a/...up/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_withNotMatchingValue/test.fix b/...up/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_withNotMatchingValue/test.fix
@@ -1,4 +1,3 @@
-set_array("animals[]")
 do list(path: "test[]", "var": "$f")
   copy_field("$f", "animals[].$append.animal")
   copy_field("$f", "animals[].$last.classification.type")

diff --git a/...ure/metafix/integration/lookup/fromXml/toJson/lookupInDeeplyNestedArrayOfObjects/test.fix b/...ure/metafix/integration/lookup/fromXml/toJson/lookupInDeeplyNestedArrayOfObjects/test.fix
@@ -1,7 +1,5 @@
 put_map("rswk-indicator", s: "SubjectHeading")
 
-set_array("subject[]")
-
 if exists("6890?")
   set_array("subject[].$append.type[]", "ComplexSubject")
   set_array("subject[].$last.label")

diff --git a/...tegration/method/fromJson/toJson/replace_allInArrayOfStringsWithAsterisk_complex/test.fix b/...tegration/method/fromJson/toJson/replace_allInArrayOfStringsWithAsterisk_complex/test.fix
@@ -1,3 +1,2 @@
-set_array("inLanguage[]")
 copy_field("nested.object.inLanguage", "inLanguage[].$append")
 replace_all("inLanguage[].*", '-.*', '')
diff --git a/...mJson/toJson/replace_allInPastedSubfieldOfArrayOfObjectsWithAsteriskWithGrouping/test.fix b/...mJson/toJson/replace_allInPastedSubfieldOfArrayOfObjectsWithAsteriskWithGrouping/test.fix
@@ -1,6 +1,4 @@
-set_array("subject[]")
 add_field("subject[].$append.name","Test")
-set_array("subject[].$last.altLabel[]")
 
 do list(path:"GST[]", "var": "$i")  # Other altLabels have a "," character between $a and $b.
   paste("subject[].$last.altLabel[].$append", "$i.a", "~(", "$i.b", "$i.c", "~)")

diff --git a/...son/toJson/replace_allInPastedSubfieldOfArrayOfObjectsWithAsteriskWithGrouping_2/test.fix b/...son/toJson/replace_allInPastedSubfieldOfArrayOfObjectsWithAsteriskWithGrouping_2/test.fix
@@ -1,6 +1,4 @@
-set_array("subject[]")
 add_field("subject[].$append.name","Test")
-set_array("subject[].$last.agent.altLabel[]")
 
 do list(path:"GST[]", "var": "$i")  # Other altLabels have a "," character between $a and $b.
   paste("subject[].$last.agent.altLabel[].$append", "$i.a", "~(", "$i.b", "$i.c", "~)")

diff --git a/...thod/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_2/test.fix b/...thod/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_2/test.fix
@@ -1,4 +1,3 @@
-set_array("test[]")
 copy_field("id", "test[].$append.id")
 
 copy_field("dateModified", "test[].$last.dateModified")

diff --git a/...thod/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_3/test.fix b/...thod/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_3/test.fix
@@ -1,7 +1,6 @@
 copy_field("datePublished", "dateCreated")
 replace_all("dateCreated", 'T.*', '')
 
-set_array("test[]")
 copy_field("id", "test[].$append.id")
 
 copy_field("dateModified", "test[].$last.dateModified")

diff --git a/...thod/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_4/test.fix b/...thod/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_4/test.fix
@@ -1,4 +1,3 @@
-set_array("test[]")
 copy_field("id", "test[].$append.id")
 
 copy_field("node.dateModified", "test[].$last.dateModified")

diff --git a/...method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/test.fix b/...method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/test.fix
@@ -4,4 +4,5 @@ do list(path: "650??", "var": "$i")
   copy_field("$i.v", "RSWK[].$last.subjectGenre")
 end
 replace_all("RSWK[].*.subjectGenre", "[.]$", "")
+
 retain("RSWK[]")
diff --git a/...son/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/expected.json b/...son/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/expected.json
@@ -0,0 +1,8 @@
+{
+  "rswk" : [ {
+    "subjectTopicName" : "Nonprofit organizations"
+  }, {
+    "subjectTopicName" : "Nonprofit organizations",
+    "subjectGenre" : "Case studies"
+  } ]
+}
diff --git a/.../toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/input.xml b/.../toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/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/...l/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/test.fix b/...l/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/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/.../toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/test.flux b/.../toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/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/...l/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/todo.txt b/...l/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/todo.txt
@@ -0,0 +1 @@
+See issue #377
diff --git a/...ources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_toUpper/test.fix b/...ources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_toUpper/test.fix
@@ -1,5 +1,3 @@
-set_array("contribution[]")
-
 do list(path: "700[01] ", "var": "$i")
   set_hash("contribution[].$append.agent")
   copy_field("$i.a", "contribution[].$last.agent.label")

diff --git a/...egration/method/fromXml/toJson/replace_toUpperStrictnessHandlesProcessExceptions/test.fix b/...egration/method/fromXml/toJson/replace_toUpperStrictnessHandlesProcessExceptions/test.fix
@@ -1,5 +1,3 @@
-set_array("contribution[]")
-
 do list(path: "700[01] ", "var": "$i")
   set_hash("contribution[].$append.agent")
   copy_field("$i.a", "contribution[].$last.agent.label")

diff --git a/...fromJson/toJson/copy_fieldToSubfieldOfArrayOfObjectsWithIndexGeneratingNewObject/test.fix b/...fromJson/toJson/copy_fieldToSubfieldOfArrayOfObjectsWithIndexGeneratingNewObject/test.fix
@@ -1,4 +1,3 @@
-set_array("test[]")
 copy_field("key", "test[].1.field")
 copy_field("key_2", "test[].2.field")
 copy_field("key_3", "test[].3.field")
diff --git a/...on/toJson/set_arrayWithoutValuesAndMove_fieldNewArrayOfStringsIntoArrayOfObjects/test.fix b/...on/toJson/set_arrayWithoutValuesAndMove_fieldNewArrayOfStringsIntoArrayOfObjects/test.fix
@@ -1,2 +1 @@
-set_array("test[]")
 move_field("test[]", "animals[].1.test[]")
diff --git a/.../org/metafacture/metafix/integration/script/fromJson/toJson/put_varsUsedInOption/test.fix b/.../org/metafacture/metafix/integration/script/fromJson/toJson/put_varsUsedInOption/test.fix
@@ -2,7 +2,6 @@ put_vars(
   "test": "arrayOfStrings[]",
   "test_2": "arrayOfObjects[]"
 )
-set_array("test[]")
 do list (path: "$[test]", "var": "$i")
   copy_field("$i", "test[].$append")
 end