Merge pull request #926 from catenax-ng/fix/#503-Fix-tests-Tavern-Cuc…

…umber-Tests Fix/#503 fix tests tavern cucumber tests
eclipse-tractusx · May 8, 2024 · 2c71d0b · 2c71d0b
2 parents 9b9fc5f + c110d33
commit 2c71d0b
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 137 deletions.
diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1009-expected-relationships.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1009-expected-relationships.json
@@ -1,23 +1,23 @@
 {
-    "relationships": [
-        {
-            "catenaXId": "urn:uuid:8724338c-5c85-4c34-91eb-e2735d58fb0d",
-            "linkedItem": {
-                "quantity": {
-                    "quantityNumber": 20.0,
-                    "measurementUnit": {
-                        "datatypeURI": null,
-                        "lexicalValue": "unit:piece"
-                    }
-                },
-                "lifecycleContext": "asBuilt",
-                "assembledOn": "2022-02-03T14:48:54.709Z",
-                "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:e7777066-e453-4431-beb3-4e99d042f923",
-                "hasAlternatives": false
-            },
-            "aspectType": "SingleLevelUsageAsBuilt",
-            "bpn": "BPNL00000003AVTH"
-        }
-    ]
+  "relationships": [
+    {
+      "catenaXId": "urn:uuid:4509ea7c-c8d2-41a1-83ca-c214ee34af6c",
+      "linkedItem": {
+        "quantity": {
+          "quantityNumber": 20.0,
+          "measurementUnit": {
+            "datatypeURI": null,
+            "lexicalValue": "unit:piece"
+          }
+        },
+        "lifecycleContext": "asBuilt",
+        "assembledOn": "2022-02-03T14:48:54.709Z",
+        "lastModifiedOn": "2022-02-03T14:48:54.709Z",
+        "childCatenaXId": "urn:uuid:10bedf9c-b2e2-4cd8-bb55-290107cceb09",
+        "hasAlternatives": false
+      },
+      "aspectType": "SingleLevelUsageAsBuilt",
+      "bpn": "BPNL00000003AVTH"
+    }
+  ]
 }
diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1647-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1647-expected-submodels.json
@@ -1,108 +1,18 @@
 {
   "submodels": [
     {
-      "identification": "urn:uuid:0f28e9b8-d683-4ac7-ab04-e2da39f6dbf4",
+      "identification": "urn:uuid:6f04b1fb-d363-4cae-a72a-2e9b4f7807fd",
       "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-      "contractAgreementId": "NGFkNjljZjctNzRhYy00MzYzLWJkNGUtZjBjYjc5MTFhNDY2:dXJuOnV1aWQ6MTU5MGU0ZDgtNjRiOS00NDUyLThjZGYtZjgyMjFmNGNlNzEz:ZWQwYjA1Y2EtZTdhMS00OWNjLTgwNzgtYWYxYWU2MWMwYjU4",
+      "contractAgreementId": "73994bcc-6cb6-4140-9cee-54a6b660a8d5",
       "payload": {
         "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
         "subcomponents": [
           {
             "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-            "productType": "pack"
+            "productType": "cell"
           }
         ],
-        "productType": "pack"
-      }
-    },
-    {
-      "identification": "urn:uuid:207317f6-5689-4957-a8b1-be613cf6e811",
-      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
-      "payload": {
-        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-        "subcomponents": [
-          {
-            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-            "productType": "module"
-          }
-        ],
-        "productType": "module"
-      }
-    },
-    {
-      "identification": "urn:uuid:bbbb4f96-4ffc-4228-bb8b-6c584c714c13",
-      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-      "contractAgreementId": "NTA2OTRiZTktNzZmNS00N2Q4LWI3ZTctNDQ2YjYyNzZkZWE2:dXJuOnV1aWQ6MTkzODIwYTktYTU4NC00NzcxLTlhYjctYmM0ZmY4Mjg2Zjlh:N2I3YWEwYTktYzYyNS00ZjdmLWEzMjMtYmYxYTkxNThlMWUw",
-      "payload": {
-        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-        "subcomponents": [
-          {
-            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-            "productType": "module"
-          }
-        ],
-        "productType": "module"
-      }
-    },
-    {
-      "identification": "urn:uuid:6e432adb-10f0-499f-ad08-bbf36c74f9bb",
-      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
-      "payload": {
-        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-        "subcomponents": [
-          {
-            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-            "productType": "module"
-          }
-        ],
-        "productType": "module"
-      }
-    },
-    {
-      "identification": "urn:uuid:3685db54-9d52-4df2-87a2-05c32edbdc49",
-      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
-      "payload": {
-        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-        "subcomponents": [
-          {
-            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-            "productType": "module"
-          }
-        ],
-        "productType": "module"
-      }
-    },
-    {
-      "identification": "urn:uuid:86fee0d5-130c-43cc-b476-4fcce3f9a1c5",
-      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
-      "payload": {
-        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-        "subcomponents": [
-          {
-            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-            "productType": "module"
-          }
-        ],
-        "productType": "module"
-      }
-    },
-    {
-      "identification": "urn:uuid:5156fe68-a54b-45e6-8c82-0c4fd488be8c",
-      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-      "contractAgreementId": "NGFkNjljZjctNzRhYy00MzYzLWJkNGUtZjBjYjc5MTFhNDY2:dXJuOnV1aWQ6MTU5MGU0ZDgtNjRiOS00NDUyLThjZGYtZjgyMjFmNGNlNzEz:ZWQwYjA1Y2EtZTdhMS00OWNjLTgwNzgtYWYxYWU2MWMwYjU4",
-      "payload": {
-        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-        "subcomponents": [
-          {
-            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-            "productType": "module"
-          }
-        ],
-        "productType": "module"
+        "productType": "cell"
       }
     }
   ]

diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1918-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1918-expected-submodels.json
@@ -1,20 +1,75 @@
 {
   "submodels": [
     {
-      "identification": "urn:uuid:91f0050f-7aea-4f84-828e-899b17cc56be",
+      "identification": "urn:uuid:8b7de5ef-8375-4e96-ae6d-b18056904b06",
       "aspectType": "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt",
-      "contractAgreementId": "MmVjYjQ1YzEtN2QxNy00NTMxLWFlMmItNDhiYjQwYzA5MTcw:dXJuOnV1aWQ6MjIwZGI2NmQtM2VmMi00Yzg1LWFiYzgtZDlhNDhkMDZiMDNh:YzQzYzUyY2MtNjA4ZC00M2E0LTliNWYtMjcxZDE0NDMwOTUw",
+      "contractAgreementId": "73994bcc-6cb6-4140-9cee-54a6b660a8d5",
       "payload": {
-        "catenaXId": "urn:uuid:1ad0892a-59c1-4118-8b52-601540973f31",
+        "catenaXId": "urn:uuid:5cfb33e5-0a95-40e9-8cec-392ee6da7cf1",
         "childItems": [
           {
-            "catenaXId": "urn:uuid:c6d2d642-a055-4ddf-87e3-1a3b02c689e3",
+            "catenaXId": "urn:uuid:f1fee963-a7d5-44d1-9f95-f4e1dc54abeb",
             "quantity": {
               "unit": "unit:piece",
               "value": 20
             },
             "hasAlternatives": false,
-            "businessPartner": "BPNL00000000BJTL",
+            "businessPartner": "BPNL00000003AYRE",
+            "createdOn": "2022-02-03T14:48:54.709Z",
+            "lastModifiedOn": "2022-02-03T14:48:54.709Z"
+          },
+          {
+            "catenaXId": "urn:uuid:767d64ef-56b0-4e06-a497-d00c9b02ff32",
+            "quantity": {
+              "unit": "unit:piece",
+              "value": 20
+            },
+            "hasAlternatives": false,
+            "businessPartner": "BPNL00000003AYRE",
+            "createdOn": "2022-02-03T14:48:54.709Z",
+            "lastModifiedOn": "2022-02-03T14:48:54.709Z"
+          },
+          {
+            "catenaXId": "urn:uuid:44b06c32-dcc2-4e35-bc2b-1141aa5fe164",
+            "quantity": {
+              "unit": "unit:piece",
+              "value": 20
+            },
+            "hasAlternatives": false,
+            "businessPartner": "BPNL00000003AYRE",
+            "createdOn": "2022-02-03T14:48:54.709Z",
+            "lastModifiedOn": "2022-02-03T14:48:54.709Z"
+          },
+          {
+            "catenaXId": "urn:uuid:24166ca3-2945-475d-92aa-f532d0080b5c",
+            "quantity": {
+              "unit": "unit:piece",
+              "value": 20
+            },
+            "hasAlternatives": false,
+            "businessPartner": "BPNL00000003AYRE",
+            "createdOn": "2022-02-03T14:48:54.709Z",
+            "lastModifiedOn": "2022-02-03T14:48:54.709Z"
+          },
+          {
+            "catenaXId": "urn:uuid:293f2a17-a911-46b9-b725-abccd57a6be6",
+            "quantity": {
+              "unit": "unit:piece",
+              "value": 20
+            },
+            "hasAlternatives": false,
+            "businessPartner": "BPNL00000003AYRE",
+            "createdOn": "2022-02-03T14:48:54.709Z",
+            "lastModifiedOn": "2022-02-03T14:48:54.709Z"
+          },
+          {
+            "catenaXId": "urn:uuid:fc16c963-a307-46ee-9059-a6fea87425dc",
+            "quantity": {
+              "unit": "unit:piece",
+              "value": 20
+            },
+            "hasAlternatives": false,
+            "businessPartner": "BPNL00000003AYRE",
             "createdOn": "2022-02-03T14:48:54.709Z",
             "lastModifiedOn": "2022-02-03T14:48:54.709Z"
           }

diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-relationships.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-relationships.json
@@ -1,45 +1,45 @@
 {
   "relationships": [
     {
-      "catenaXId": "urn:uuid:015aa300-f0ea-47cd-84d5-969f2cb2cf75",
+      "catenaXId": "urn:uuid:4b4d41c3-7a7c-4544-b718-8167a70f517d",
       "linkedItem": {
         "quantity": {
-          "quantityNumber": 20.0,
+          "quantityNumber": 0.2341,
           "measurementUnit": {
             "datatypeURI": null,
-            "lexicalValue": "unit:piece"
+            "lexicalValue": "unit:kilogram"
           }
         },
         "lifecycleContext": "asBuilt",
         "assembledOn": "2022-02-03T14:48:54.709Z",
         "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-        "childCatenaXId": "urn:uuid:91ec20ec-67ab-4699-9ae9-029ed5e332dc",
+        "childCatenaXId": "urn:uuid:c1b9e521-b7a0-4266-8a57-8f8751222f4c",
         "hasAlternatives": false
       },
       "aspectType": "SingleLevelBomAsBuilt",
-      "bpn": "BPNL00000003B3NX"
+      "bpn": "BPNL00000003AZQP"
     },
     {
-      "catenaXId": "urn:uuid:015aa300-f0ea-47cd-84d5-969f2cb2cf75",
+      "catenaXId": "urn:uuid:4b4d41c3-7a7c-4544-b718-8167a70f517d",
       "linkedItem": {
         "quantity": {
-          "quantityNumber": 0.2341,
+          "quantityNumber": 20.0,
           "measurementUnit": {
             "datatypeURI": null,
-            "lexicalValue": "unit:kilogram"
+            "lexicalValue": "unit:piece"
           }
         },
         "lifecycleContext": "asBuilt",
         "assembledOn": "2022-02-03T14:48:54.709Z",
         "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-        "childCatenaXId": "urn:uuid:94ae80dd-e5e2-45cc-893c-9fa63622e47f",
+        "childCatenaXId": "urn:uuid:5f7d2122-5f8e-439b-a27f-52ae1fb02b13",
         "hasAlternatives": false
       },
       "aspectType": "SingleLevelBomAsBuilt",
-      "bpn": "BPNL00000003AZQP"
+      "bpn": "BPNL00000003B3NX"
     },
     {
-      "catenaXId": "urn:uuid:015aa300-f0ea-47cd-84d5-969f2cb2cf75",
+      "catenaXId": "urn:uuid:4b4d41c3-7a7c-4544-b718-8167a70f517d",
       "linkedItem": {
         "quantity": {
           "quantityNumber": 0.2014,
@@ -51,7 +51,7 @@
         "lifecycleContext": "asBuilt",
         "assembledOn": "2022-02-03T14:48:54.709Z",
         "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-        "childCatenaXId": "urn:uuid:d5fbfc88-d838-4f9b-b9ba-2d5e81beab94",
+        "childCatenaXId": "urn:uuid:18ed69f6-5f4a-44e2-9ff1-9bf881bbf787",
         "hasAlternatives": false
       },
       "aspectType": "SingleLevelBomAsBuilt",

diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-submodels.json
@@ -1,14 +1,14 @@
 {
   "submodels": [
     {
-      "identification": "urn:uuid:46c4b216-bedd-4161-a141-f6c218784ddf",
+      "identification": "urn:uuid:755ff4a4-f04a-4f30-b245-9ab0c7e050d1",
       "aspectType": "urn:samm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
-      "contractAgreementId": "NTA2OTRiZTktNzZmNS00N2Q4LWI3ZTctNDQ2YjYyNzZkZWE2:dXJuOnV1aWQ6MTkzODIwYTktYTU4NC00NzcxLTlhYjctYmM0ZmY4Mjg2Zjlh:N2I3YWEwYTktYzYyNS00ZjdmLWEzMjMtYmYxYTkxNThlMWUw",
+      "contractAgreementId": "1e1c1083-073f-41aa-abbb-50ef26176486",
       "payload": {
         "component": [
           {
             "materialName": "Carbon Steel",
-            "recycledContent": 37,
+            "recycledContent": 40,
             "materialClass": "1.1.2",
             "quantity": {
               "unit": "unit:kilogram",
@@ -19,7 +19,7 @@
           },
           {
             "materialName": "Oil",
-            "recycledContent": 32,
+            "recycledContent": 18,
             "materialClass": "9.2",
             "quantity": {
               "unit": "unit:kilogram",
@@ -30,7 +30,7 @@
           },
           {
             "materialName": "Copper",
-            "recycledContent": 76,
+            "recycledContent": 53,
             "materialClass": "3.1",
             "quantity": {
               "unit": "unit:kilogram",