Merge pull request #861 from catenax-ng/chore/fix-cucumber-definitions

chore(cucumber):[#357] ignore contractAgreementId on expected file co…
eclipse-tractusx · Apr 12, 2024 · faa79e5 · faa79e5
2 parents 62b1306 + 00d8094
commit faa79e5
Show file tree

Hide file tree

Showing 10 changed files with 645 additions and 12,156 deletions.
diff --git a/...ucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/E2ETestStepDefinitions.java b/...ucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/E2ETestStepDefinitions.java
@@ -385,7 +385,7 @@ public void iCheckIfAreAsExpected(String valueType, String fileName) throws IOEx
             final List<Submodel> actualSubmodels = completedJob.getSubmodels();
             final List<Submodel> expectedSubmodels = getExpectedSubmodels(fileName);
             assertThat(actualSubmodels).hasSameSizeAs(expectedSubmodels)
-                                       .usingRecursiveFieldByFieldElementComparatorIgnoringFields("identification")
+                                       .usingRecursiveFieldByFieldElementComparatorIgnoringFields("identification", "contractAgreementId")
                                        .containsAll(expectedSubmodels);
         }
     }

diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-821-expected-relationships.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-821-expected-relationships.json
@@ -7,7 +7,7 @@
                     "quantityNumber": 1.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
@@ -26,7 +26,7 @@
                     "quantityNumber": 1.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
@@ -45,7 +45,7 @@
                     "quantityNumber": 1.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
@@ -64,7 +64,7 @@
                     "quantityNumber": 6.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
@@ -83,7 +83,7 @@
                     "quantityNumber": 1.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
@@ -102,7 +102,7 @@
                     "quantityNumber": 1.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
@@ -115,29 +115,29 @@
             "bpn": "BPNL00000003B3NX"
         },
         {
-            "catenaXId": "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97",
+            "catenaXId": "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b",
             "linkedItem": {
                 "quantity": {
-                    "quantityNumber": 10.0,
+                    "quantityNumber": 1.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
                 "assembledOn": "2022-02-03T14:48:54.709Z",
                 "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a9",
+                "childCatenaXId": "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc",
                 "hasAlternatives": false
             },
             "aspectType": "SingleLevelBomAsPlanned",
-            "bpn": "BPNL00000003AYRE"
+            "bpn": "BPNL00000003B3NX"
         },
         {
-            "catenaXId": "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97",
+            "catenaXId": "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b",
             "linkedItem": {
                 "quantity": {
-                    "quantityNumber": 0.11,
+                    "quantityNumber": 0.3301,
                     "measurementUnit": {
                         "datatypeURI": null,
                         "lexicalValue": "unit:kilogram"
@@ -146,87 +146,87 @@
                 "lifecycleContext": "asPlanned",
                 "assembledOn": "2022-02-03T14:48:54.709Z",
                 "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:15d2fcc8-6439-4d1e-904b-e62b4d3bf323",
+                "childCatenaXId": "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301",
                 "hasAlternatives": false
             },
             "aspectType": "SingleLevelBomAsPlanned",
             "bpn": "BPNL00000003AXS3"
         },
         {
-            "catenaXId": "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc",
+            "catenaXId": "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97",
             "linkedItem": {
                 "quantity": {
-                    "quantityNumber": 1.0,
+                    "quantityNumber": 10.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
                 "assembledOn": "2022-02-03T14:48:54.709Z",
                 "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:86f69643-3b90-4e34-90bf-789edcf40e7e",
+                "childCatenaXId": "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a9",
                 "hasAlternatives": false
             },
             "aspectType": "SingleLevelBomAsPlanned",
-            "bpn": "BPNL00000003B0Q0"
+            "bpn": "BPNL00000003AYRE"
         },
         {
-            "catenaXId": "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a9",
+            "catenaXId": "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97",
             "linkedItem": {
                 "quantity": {
-                    "quantityNumber": 1.0,
+                    "quantityNumber": 0.11,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:kilogram"
                     }
                 },
                 "lifecycleContext": "asPlanned",
                 "assembledOn": "2022-02-03T14:48:54.709Z",
                 "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:4f7b1cf2-a598-4027-bc78-63f6d8e55699",
+                "childCatenaXId": "urn:uuid:15d2fcc8-6439-4d1e-904b-e62b4d3bf323",
                 "hasAlternatives": false
             },
             "aspectType": "SingleLevelBomAsPlanned",
-            "bpn": "BPNL00000003B0Q0"
+            "bpn": "BPNL00000003AXS3"
         },
         {
-            "catenaXId": "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b",
+            "catenaXId": "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc",
             "linkedItem": {
                 "quantity": {
-                    "quantityNumber": 0.3301,
+                    "quantityNumber": 1.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:kilogram"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
                 "assembledOn": "2022-02-03T14:48:54.709Z",
                 "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301",
+                "childCatenaXId": "urn:uuid:86f69643-3b90-4e34-90bf-789edcf40e7e",
                 "hasAlternatives": false
             },
             "aspectType": "SingleLevelBomAsPlanned",
-            "bpn": "BPNL00000003AXS3"
+            "bpn": "BPNL00000003B0Q0"
         },
         {
-            "catenaXId": "urn:uuid:07cb071f-8716-45fe-89f1-f2f77a1ce93b",
+            "catenaXId": "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a9",
             "linkedItem": {
                 "quantity": {
                     "quantityNumber": 1.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
                 "assembledOn": "2022-02-03T14:48:54.709Z",
                 "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:bee5614f-9e46-4c98-9209-61a6f2b2a7fc",
+                "childCatenaXId": "urn:uuid:4f7b1cf2-a598-4027-bc78-63f6d8e55699",
                 "hasAlternatives": false
             },
             "aspectType": "SingleLevelBomAsPlanned",
-            "bpn": "BPNL00000003B3NX"
+            "bpn": "BPNL00000003B0Q0"
         }
     ]
 }