From d18a5035d2b74508d685ec863c91e4382aff2c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20B=C3=BClte?= Date: Mon, 14 Oct 2024 17:42:08 +0200 Subject: [PATCH] Adjust integrationtests after #127 --- .../integration/bind/fromJson/toJson/listAsSimple/test.fix | 1 - .../unlessExists_createArrayOfStringsAndCopyField/test.fix | 1 - .../test.fix | 1 - .../test.fix | 1 - .../test.fix | 1 - .../toJson/lookupInSubfieldInArrayOfObjects_complex/test.fix | 1 - .../toJson/lookupInSubfieldInArrayOfObjects_complex_2/test.fix | 1 - .../test.fix | 1 - .../test.fix | 1 - .../fromXml/toJson/lookupInDeeplyNestedArrayOfObjects/test.fix | 2 -- .../replace_allInArrayOfStringsWithAsterisk_complex/test.fix | 1 - .../test.fix | 2 -- .../test.fix | 2 -- .../test.fix | 1 - .../test.fix | 1 - .../test.fix | 1 - .../test.fix | 1 - .../integration/method/fromXml/toJson/replace_toUpper/test.fix | 2 -- .../replace_toUpperStrictnessHandlesProcessExceptions/test.fix | 2 -- .../toJson/copy_fieldToArrayOfStringsWithIndex/test.fix | 1 - .../test.fix | 1 - .../test.fix | 1 - .../script/fromJson/toJson/put_varsUsedInOption/test.fix | 1 - 23 files changed, 28 deletions(-) diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listAsSimple/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listAsSimple/test.fix index 52624554..ce9bf245 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listAsSimple/test.fix +++ b/metafix/src/test/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/metafix/src/test/resources/org/metafacture/metafix/integration/conditional/fromJson/toJson/unlessExists_createArrayOfStringsAndCopyField/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/conditional/fromJson/toJson/unlessExists_createArrayOfStringsAndCopyField/test.fix index 19a8df85..1543d2d9 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/conditional/fromJson/toJson/unlessExists_createArrayOfStringsAndCopyField/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/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/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInArrayOfStringsWithNotMatchingValues_complex/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInArrayOfStringsWithNotMatchingValues_complex/test.fix index 5563a480..5d5828af 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInArrayOfStringsWithNotMatchingValues_complex/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/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/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjectsWithListBind_complex/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjectsWithListBind_complex/test.fix index 78e2854c..cb5c1e6d 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjectsWithListBind_complex/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/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/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjectsWithListBind_complex_withNotMatchingValue/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjectsWithListBind_complex_withNotMatchingValue/test.fix index 78e2854c..cb5c1e6d 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjectsWithListBind_complex_withNotMatchingValue/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/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/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex/test.fix index 2e2ccfab..153503b1 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/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/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2/test.fix index 7949cb28..f1742a01 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/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/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2_withNotMatchingValue/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2_withNotMatchingValue/test.fix index 7949cb28..f1742a01 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2_withNotMatchingValue/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/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/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_withNotMatchingValue/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_withNotMatchingValue/test.fix index 2e2ccfab..153503b1 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_withNotMatchingValue/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/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/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromXml/toJson/lookupInDeeplyNestedArrayOfObjects/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromXml/toJson/lookupInDeeplyNestedArrayOfObjects/test.fix index 6b13b1a2..6a9c42c5 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromXml/toJson/lookupInDeeplyNestedArrayOfObjects/test.fix +++ b/metafix/src/test/resources/org/metafacture/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/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInArrayOfStringsWithAsterisk_complex/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInArrayOfStringsWithAsterisk_complex/test.fix index 99f9bc93..56302563 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInArrayOfStringsWithAsterisk_complex/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/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/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInPastedSubfieldOfArrayOfObjectsWithAsteriskWithGrouping/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInPastedSubfieldOfArrayOfObjectsWithAsteriskWithGrouping/test.fix index c1f992c9..f2acb0d1 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInPastedSubfieldOfArrayOfObjectsWithAsteriskWithGrouping/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/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/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInPastedSubfieldOfArrayOfObjectsWithAsteriskWithGrouping_2/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInPastedSubfieldOfArrayOfObjectsWithAsteriskWithGrouping_2/test.fix index 776cc865..7df34216 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInPastedSubfieldOfArrayOfObjectsWithAsteriskWithGrouping_2/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/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/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_2/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_2/test.fix index d239ed59..de729ffc 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_2/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/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/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_3/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_3/test.fix index f62e6d45..447807d2 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_3/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/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/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_4/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_4/test.fix index 0738522f..f5341a85 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInSubfieldOfArrayOfObjectsWithAsterisk_complex_4/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/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/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/test.fix index 51782a33..5e5194b8 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/test.fix @@ -1,4 +1,3 @@ -set_array("RSWK[]") do list(path: "650??", "var": "$i") copy_field("$i.a", "RSWK[].$append.subjectTopicName") copy_field("$i.v", "RSWK[].$last.subjectGenre") diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_toUpper/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_toUpper/test.fix index 20bcea86..6bc9cbcd 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_toUpper/test.fix +++ b/metafix/src/test/resources/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/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_toUpperStrictnessHandlesProcessExceptions/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_toUpperStrictnessHandlesProcessExceptions/test.fix index 20bcea86..6bc9cbcd 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_toUpperStrictnessHandlesProcessExceptions/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/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/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/test.fix index 42ce081d..3f235ad6 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/test.fix @@ -1,4 +1,3 @@ -set_array("test[]") copy_field("key", "test[].1") copy_field("key_2", "test[].2") copy_field("key_3", "test[].3") diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToSubfieldOfArrayOfObjectsWithIndexGeneratingNewObject/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToSubfieldOfArrayOfObjectsWithIndexGeneratingNewObject/test.fix index bfb4c066..a514f14d 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldToSubfieldOfArrayOfObjectsWithIndexGeneratingNewObject/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/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/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/set_arrayWithoutValuesAndMove_fieldNewArrayOfStringsIntoArrayOfObjects/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/set_arrayWithoutValuesAndMove_fieldNewArrayOfStringsIntoArrayOfObjects/test.fix index 1b67b8e9..f7a582c3 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/set_arrayWithoutValuesAndMove_fieldNewArrayOfStringsIntoArrayOfObjects/test.fix +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/set_arrayWithoutValuesAndMove_fieldNewArrayOfStringsIntoArrayOfObjects/test.fix @@ -1,2 +1 @@ -set_array("test[]") move_field("test[]", "animals[].1.test[]") diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/script/fromJson/toJson/put_varsUsedInOption/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/script/fromJson/toJson/put_varsUsedInOption/test.fix index e389d3df..82fbdf82 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/script/fromJson/toJson/put_varsUsedInOption/test.fix +++ b/metafix/src/test/resources/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