Fix order of expected output fields, keep original transformation. (#241)

Author: blackwinter

metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromXml/toJson/lookupInDeeplyNestedArrayOfObjects/expected.json

@@ -1,51 +1,51 @@
 {
   "subject" : [ {
+    "type" : [ "ComplexSubject" ],
     "componentList" : [ {
-      "gndIdentifier" : "(DE-588)4131620-4",
-      "id" : "(DE-588)4131620-4",
+      "type" : [ "SubjectHeading" ],
       "label" : "Schulhof",
       "source" : {
-        "id" : "https://d-nb.info/gnd/7749153-1",
-        "label" : "Gemeinsame Normdatei (GND)"
+        "label" : "Gemeinsame Normdatei (GND)",
+        "id" : "https://d-nb.info/gnd/7749153-1"
       },
-      "type" : [ "SubjectHeading" ]
+      "id" : "(DE-588)4131620-4",
+      "gndIdentifier" : "(DE-588)4131620-4"
     }, {
-      "gndIdentifier" : "(DE-588)4116546-9",
-      "id" : "(DE-588)4116546-9",
+      "type" : [ "SubjectHeading" ],
       "label" : "Sozialraum",
       "source" : {
-        "id" : "https://d-nb.info/gnd/7749153-1",
-        "label" : "Gemeinsame Normdatei (GND)"
+        "label" : "Gemeinsame Normdatei (GND)",
+        "id" : "https://d-nb.info/gnd/7749153-1"
       },
-      "type" : [ "SubjectHeading" ]
+      "id" : "(DE-588)4116546-9",
+      "gndIdentifier" : "(DE-588)4116546-9"
     }, {
-      "gndIdentifier" : "(DE-588)4680202-2",
-      "id" : "(DE-588)4680202-2",
+      "type" : [ "SubjectHeading" ],
       "label" : "Informelles Lernen",
       "source" : {
-        "id" : "https://d-nb.info/gnd/7749153-1",
-        "label" : "Gemeinsame Normdatei (GND)"
+        "label" : "Gemeinsame Normdatei (GND)",
+        "id" : "https://d-nb.info/gnd/7749153-1"
       },
-      "type" : [ "SubjectHeading" ]
+      "id" : "(DE-588)4680202-2",
+      "gndIdentifier" : "(DE-588)4680202-2"
     }, {
-      "gndIdentifier" : "(DE-588)4155947-2",
-      "id" : "(DE-588)4155947-2",
+      "type" : [ "SubjectHeading" ],
       "label" : "Ganztagsschule",
       "source" : {
-        "id" : "https://d-nb.info/gnd/7749153-1",
-        "label" : "Gemeinsame Normdatei (GND)"
+        "label" : "Gemeinsame Normdatei (GND)",
+        "id" : "https://d-nb.info/gnd/7749153-1"
       },
-      "type" : [ "SubjectHeading" ]
+      "id" : "(DE-588)4155947-2",
+      "gndIdentifier" : "(DE-588)4155947-2"
     }, {
-      "gndIdentifier" : "(DE-588)4130615-6",
-      "id" : "(DE-588)4130615-6",
+      "type" : [ "SubjectHeading" ],
       "label" : "Sportpädagogik",
       "source" : {
-        "id" : "https://d-nb.info/gnd/7749153-1",
-        "label" : "Gemeinsame Normdatei (GND)"
+        "label" : "Gemeinsame Normdatei (GND)",
+        "id" : "https://d-nb.info/gnd/7749153-1"
       },
-      "type" : [ "SubjectHeading" ]
-    } ],
-    "type" : [ "ComplexSubject" ]
+      "id" : "(DE-588)4130615-6",
+      "gndIdentifier" : "(DE-588)4130615-6"
+    } ]
   } ]
 }

metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromXml/toJson/lookupInDeeplyNestedArrayOfObjects/test.fix

@@ -3,24 +3,25 @@ put_map("rswk-indicator", s: "SubjectHeading")
 set_array("subject[]")
 
 if exists("6890?")
-  set_array("subject[].$append.componentList[]")
+  set_array("subject[].$append.type[]", "ComplexSubject")
+  set_array("subject[].$last.label")
+  set_array("subject[].$last.componentList[]")
   do list(path: "6890?", "var": "$i")
+    set_array("subject[].$last.componentList[].$append.type[]")
+    do list(path: "$i.D", "var": "$k")
+      copy_field("$k", "subject[].$last.componentList[].$last.type[].$append")
+    end
+    copy_field("$i.a", "subject[].$last.componentList[].$last.label")
     do list(path: "$i.0", "var": "$j")
       if any_match("$j", "^\\(DE-588\\)(.*)$")
-        copy_field("$j", "subject[].$last.componentList[].$append.gndIdentifier")
-        copy_field("$j", "subject[].$last.componentList[].$last.id")
-        copy_field("$i.a", "subject[].$last.componentList[].$last.label")
-        add_field("subject[].$last.componentList[].$last.source.id", "https://d-nb.info/gnd/7749153-1")
         add_field("subject[].$last.componentList[].$last.source.label", "Gemeinsame Normdatei (GND)")
+        add_field("subject[].$last.componentList[].$last.source.id", "https://d-nb.info/gnd/7749153-1")
+        copy_field("$j", "subject[].$last.componentList[].$last.id")
         replace_all("subject[].$last.componentList[].$last..id", "^\\(DE-588\\)(.*)$", "http://d-nb.info/gnd/$1")
+        copy_field("$j", "subject[].$last.componentList[].$last.gndIdentifier")
         replace_all("subject[].$last.componentList[].$last..gndIdentifier", "^\\(DE-588\\)(.*)$", "$1")
       end
     end
-    set_array("subject[].$last.componentList[].$last.type[]")
-    do list(path: "$i.D", "var": "$k")
-      copy_field("$k", "subject[].$last.componentList[].$last.type[].$append")
-    end
-    set_array("subject[].$last.type[]", "ComplexSubject")
   end
 end