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 1/6] 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 From ea405280f8d3f16cc21d19dfda2b34fed0288c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20B=C3=BClte?= Date: Mon, 14 Oct 2024 18:39:22 +0200 Subject: [PATCH 2/6] Add new todo.txt and adjust test for #377 --- .../expected.json | 6 ++++++ .../test.fix | 10 +++++++++- .../todo.txt | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/expected.json b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/expected.json index 3b010d5f..8b522f31 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/expected.json +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/expected.json @@ -4,5 +4,11 @@ }, { "subjectTopicName" : "Nonprofit organizations", "subjectGenre" : "Case studies" + } ], + "rswk" : [ { + "subjectTopicName" : "Nonprofit organizations" + }, { + "subjectTopicName" : "Nonprofit organizations", + "subjectGenre" : "Case studies" } ] } 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 5e5194b8..0a6304f0 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,6 +1,14 @@ +set_array("RSWK[]") 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[]") + +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[]") diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/todo.txt new file mode 100644 index 00000000..ff73dafa --- /dev/null +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/todo.txt @@ -0,0 +1 @@ +See #377 . This behaviour seems to be undetected or new after #369 From 06b39e006c39dd4305b8e764b9acced0aa3193d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20B=C3=BClte?= Date: Mon, 14 Oct 2024 19:01:09 +0200 Subject: [PATCH 3/6] Undo change for array test with index number #127 If we want to support the behaviour for creating an array with index number we should revisit this test and change it. --- .../fromJson/toJson/copy_fieldToArrayOfStringsWithIndex/test.fix | 1 + 1 file changed, 1 insertion(+) 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 3f235ad6..42ce081d 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,3 +1,4 @@ +set_array("test[]") copy_field("key", "test[].1") copy_field("key_2", "test[].2") copy_field("key_3", "test[].3") From af806f7fbca2897214da34d31d9d39ec358670fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20B=C3=BClte?= Date: Tue, 15 Oct 2024 18:00:50 +0200 Subject: [PATCH 4/6] Split integration test into two #127 and #377 --- .../expected.json | 8 ++++++++ .../input.xml | 14 ++++++++++++++ .../test.fix | 7 +++++++ .../test.flux | 8 ++++++++ .../todo.txt | 0 .../expected.json | 6 ------ .../test.fix | 8 +------- 7 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/expected.json create mode 100644 metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/input.xml create mode 100644 metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.fix create mode 100644 metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.flux rename metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/{replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk => replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray}/todo.txt (100%) diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/expected.json b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/expected.json new file mode 100644 index 00000000..4faa8410 --- /dev/null +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/expected.json @@ -0,0 +1,8 @@ +{ + "rswk" : [ { + "subjectTopicName" : "Nonprofit organizations" + }, { + "subjectTopicName" : "Nonprofit organizations", + "subjectGenre" : "Case studies" + } ] +} diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/input.xml b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/input.xml new file mode 100644 index 00000000..78fd0b83 --- /dev/null +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/input.xml @@ -0,0 +1,14 @@ + + + + + Nonprofit organizations + Management. + + + Nonprofit organizations + Management + Case studies. + + + diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.fix new file mode 100644 index 00000000..4a1d1425 --- /dev/null +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/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/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.flux b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.flux new file mode 100644 index 00000000..1d8c3df8 --- /dev/null +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/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/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/todo.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/expected.json b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/expected.json index 8b522f31..3b010d5f 100644 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/expected.json +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/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/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 0a6304f0..9c1c1c44 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 @@ -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[]") From 1bb5b937d87f108105dc967a8ca5ec5cb37c6630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20B=C3=BClte?= Date: Wed, 16 Oct 2024 10:47:08 +0200 Subject: [PATCH 5/6] Fix typo in folder name #127 and #377 --- .../expected.json | 0 .../input.xml | 0 .../test.fix | 0 .../test.flux | 0 .../todo.txt | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/{replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray => replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray}/expected.json (100%) rename metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/{replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray => replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray}/input.xml (100%) rename metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/{replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray => replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray}/test.fix (100%) rename metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/{replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray => replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray}/test.flux (100%) rename metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/{replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray => replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray}/todo.txt (100%) diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/expected.json b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/expected.json similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/expected.json rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/expected.json diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/input.xml b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/input.xml similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/input.xml rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/input.xml diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/test.fix similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.fix rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/test.fix diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.flux b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/test.flux similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/test.flux rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/test.flux diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/todo.txt similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisWithoutCreatingArrayWithSetArray/todo.txt rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/todo.txt From 33b1b4a3bc18f69b9a483c989996820c1136954f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20B=C3=BClte?= Date: Wed, 16 Oct 2024 11:36:39 +0200 Subject: [PATCH 6/6] Adjust as suggested by reviewer Review by @blackwinter --- .../expected.json | 0 .../input.xml | 0 .../test.fix | 0 .../test.flux | 0 .../todo.txt | 1 + .../todo.txt | 1 - 6 files changed, 1 insertion(+), 1 deletion(-) rename metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/{replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray => replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray}/expected.json (100%) rename metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/{replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray => replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray}/input.xml (100%) rename metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/{replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray => replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray}/test.fix (100%) rename metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/{replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray => replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray}/test.flux (100%) create mode 100644 metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/todo.txt delete mode 100644 metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/todo.txt diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/expected.json b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/expected.json similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/expected.json rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/expected.json diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/input.xml b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/input.xml similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/input.xml rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/input.xml diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/test.fix b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/test.fix similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/test.fix rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/test.fix diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/test.flux b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/test.flux similarity index 100% rename from metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/test.flux rename to metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/test.flux diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/todo.txt new file mode 100644 index 00000000..bb2574a2 --- /dev/null +++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/todo.txt @@ -0,0 +1 @@ +See issue #377 diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/todo.txt deleted file mode 100644 index ff73dafa..00000000 --- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskWithoutCreatingArrayWithSetArray/todo.txt +++ /dev/null @@ -1 +0,0 @@ -See #377 . This behaviour seems to be undetected or new after #369