From 88d5ea9fc64db17230ab651ba8886ae8a7e98261 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Tue, 9 Apr 2024 16:13:51 +0200 Subject: [PATCH] feat(cucumber):[#357] Adjust to latest testdata version --- .../TRI-1913-expected-submodels.json | 70 ++++++++-------- .../TRI-1914-expected-submodels.json | 17 +--- .../TRI-1915-expected-submodels.json | 84 ++++++++++++------- .../TRI-1918-expected-submodels.json | 25 ++++++ 4 files changed, 118 insertions(+), 78 deletions(-) create mode 100644 irs-cucumber-tests/src/test/resources/expected-files/TRI-1918-expected-submodels.json diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1913-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1913-expected-submodels.json index a7d3ad1029..b5a3f3a313 100644 --- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1913-expected-submodels.json +++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1913-expected-submodels.json @@ -1,38 +1,30 @@ { "submodels": [ { - "identification": "urn:uuid:59e2d8a9-ea19-4c74-841c-3ac97819e01b", - "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", - "contractAgreementId": "ZTQzZmFlNTktNWQxOS00OGFhLTlhMTMtYzY0NDRiZjA0Njk3:dXJuOnV1aWQ6MmU3NjgyNGItMDRiYi00NDdhLTgxMDItNzczN2Y0ZGFmM2Uz:NDZiMzU2OWItOGE2Yy00MTJkLWI3MTMtNThlMGFmNzY5N2Q2", + "identification": "urn:uuid:39eb0751-bc99-48ee-8fd8-dbf233badb5f", + "aspectType": "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", + "contractAgreementId": "MmVjYjQ1YzEtN2QxNy00NTMxLWFlMmItNDhiYjQwYzA5MTcw:dXJuOnV1aWQ6MjIwZGI2NmQtM2VmMi00Yzg1LWFiYzgtZDlhNDhkMDZiMDNh:YzQzYzUyY2MtNjA4ZC00M2E0LTliNWYtMjcxZDE0NDMwOTUw", "payload": { "localIdentifiers": [ { - "value": "BPNL00000000BJTL", - "key": "manufacturerId" - }, - { - "value": "95657762-59", - "key": "manufacturerPartId" - }, - { - "value": "NO-747120479071756798529531", - "key": "partInstanceId" + "value": "82227044FBE", + "key": "jisNumber" } ], "manufacturingInformation": { "date": "2022-02-04T14:48:54", - "country": "DEU", + "country": "HUR", "sites": [ { - "catenaXsiteId": "BPNS00000003CSGV", + "catenaXsiteId": "BPNS00000000BJTL", "function": "production" } ] }, - "catenaXId": "urn:uuid:b03e4631-d40c-489d-bfeb-54b0a0b89c4c", + "catenaXId": "urn:uuid:c6d2d642-a055-4ddf-87e3-1a3b02c689e3", "partTypeInformation": { - "manufacturerPartId": "95657762-59", - "customerPartId": "95657762-59", + "manufacturerPartId": "123-0.740-3434-A", + "customerPartId": "PRT-12345", "partClassification": [ { "classificationDescription": "Standard data element types with associated classification scheme for electric components.", @@ -40,37 +32,44 @@ "classificationID": "61360- 2:2012 " } ], - "nameAtManufacturer": "Door Key", - "nameAtCustomer": "Door Key" - }, - "itemVersion": "05" + "nameAtManufacturer": "Mirror left", + "nameAtCustomer": "side element A" + } } }, { - "identification": "urn:uuid:614b0ff2-14dc-4dd4-9db8-301e41b8ea9d", - "aspectType": "urn:samm:io.catenax.just_in_sequence_part:3.0.0#JustInSequencePart", - "contractAgreementId": "MjBkZjVmMWYtOTMwYi00NzM4LWJlNDUtZjMwMjczODY1NDEy:dXJuOnV1aWQ6NjUwZWQ4ZTMtOGViMi00NWM3LWE5MzMtZDI4M2YxNDY4ZDk5:YjgyOTJmODUtYWNlYy00ZTBiLThiYzgtMmI3NzRiYmQzNjNh", + "identification": "urn:uuid:ec9ba5fc-339e-4142-89be-872650c6ab2f", + "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart", + "contractAgreementId": "MDBmZDcyMDktYTE2MS00OWM5LWFiMzAtMmUwMDllNWE3MDAw:dXJuOnV1aWQ6Njc1NWMyZTAtNzc5Ni00NTYzLWE1NjktYTk3NmZjZTNiYjQ3:MjhhN2VlY2EtMDQwNi00ZjQ4LWI2NDktMjhiYzU0NzcyNTcx", "payload": { "localIdentifiers": [ { - "value": "86681316RUO", - "key": "jisNumber" + "value": "BPNL00000000BJTL", + "key": "manufacturerId" + }, + { + "value": "95657762-59", + "key": "manufacturerPartId" + }, + { + "value": "NO-073366714159387479576634", + "key": "partInstanceId" } ], "manufacturingInformation": { "date": "2022-02-04T14:48:54", - "country": "HUR", + "country": "DEU", "sites": [ { - "catenaXsiteId": "BPNS00000000BJTL", + "catenaXsiteId": "BPNS00000003CSGV", "function": "production" } ] }, - "catenaXId": "urn:uuid:b03e4631-d40c-489d-bfeb-54b0a0b89c4c", + "catenaXId": "urn:uuid:c6d2d642-a055-4ddf-87e3-1a3b02c689e3", "partTypeInformation": { - "manufacturerPartId": "123-0.740-3434-A", - "customerPartId": "PRT-12345", + "manufacturerPartId": "95657762-59", + "customerPartId": "95657762-59", "partClassification": [ { "classificationDescription": "Standard data element types with associated classification scheme for electric components.", @@ -78,9 +77,10 @@ "classificationID": "61360- 2:2012 " } ], - "nameAtManufacturer": "Mirror left", - "nameAtCustomer": "side element A" - } + "nameAtManufacturer": "Door Key", + "nameAtCustomer": "Door Key" + }, + "itemVersion": "05" } } ] diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1914-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1914-expected-submodels.json index 97737b4ca0..862e847d27 100644 --- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1914-expected-submodels.json +++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1914-expected-submodels.json @@ -1,18 +1,9 @@ { "submodels": [ { - "identification": "urn:uuid:8c315c6e-4a41-4a44-a566-9c8cb8d909d7", - "aspectType": "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", - "contractAgreementId": "MjBkZjVmMWYtOTMwYi00NzM4LWJlNDUtZjMwMjczODY1NDEy:dXJuOnV1aWQ6NjUwZWQ4ZTMtOGViMi00NWM3LWE5MzMtZDI4M2YxNDY4ZDk5:YjgyOTJmODUtYWNlYy00ZTBiLThiYzgtMmI3NzRiYmQzNjNh", - "payload": { - "catenaXId": "urn:uuid:c6651227-bad6-4b39-b3b0-9fef41230c3a", - "childItems": [] - } - }, - { - "identification": "urn:uuid:9a1c9894-e639-438d-8414-2ac25e5c5f12", + "identification": "urn:uuid:17354138-5bf3-45ba-899a-d5245d4d9c83", "aspectType": "urn:samm:io.catenax.batch:3.0.0#Batch", - "contractAgreementId": "MmM1ZWM3NDAtN2ZhMy00NDE0LTkxY2ItZTk2MzA0Nzc0YzMx:dXJuOnV1aWQ6OWExOWU3ZmUtM2U5Ni00ZTJkLWI0ZDktYmQ1NGVmMjYwZDhk:ZTFjNWQxZmEtM2FmNi00ZDk3LWEyMDYtM2JiYzY4MjUzZGUw", + "contractAgreementId": "MDBmZDcyMDktYTE2MS00OWM5LWFiMzAtMmUwMDllNWE3MDAw:dXJuOnV1aWQ6Njc1NWMyZTAtNzc5Ni00NTYzLWE1NjktYTk3NmZjZTNiYjQ3:MjhhN2VlY2EtMDQwNi00ZjQ4LWI2NDktMjhiYzU0NzcyNTcx", "payload": { "localIdentifiers": [ { @@ -30,9 +21,9 @@ } ] }, - "catenaXId": "urn:uuid:c6651227-bad6-4b39-b3b0-9fef41230c3a", + "catenaXId": "urn:uuid:ee9b9c9e-1416-45a3-b683-d98d5d88e548", "partTypeInformation": { - "manufacturerPartId": "LV-64", + "manufacturerPartId": "SC-00", "partClassification": [ { "classificationDescription": "Standard data element types with associated classification scheme for electric components.", diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1915-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1915-expected-submodels.json index b1e508c317..838a0841b8 100644 --- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1915-expected-submodels.json +++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1915-expected-submodels.json @@ -1,39 +1,63 @@ { "submodels": [ { - "catenaXId": "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", - "childItems": [ - { - "validityPeriod": { - "validFrom": "2023-03-21T08:17:29.187+01:00", - "validTo": "2024-07-01T16:10:00.000+01:00" + "identification": "urn:uuid:716429d0-3108-46fd-869f-b6c86d32cc08", + "aspectType": "urn:samm:io.catenax.single_level_bom_as_planned:3.0.0#SingleLevelBomAsPlanned", + "contractAgreementId": "NGYzNjdkMGMtZmMyOC00Y2U5LWJkYTQtYjAwZGFjMGFkYWZh:dXJuOnV1aWQ6Njc0NzU2NjItNjFmMy00NTY4LWJlMGItYWVlNDJjNGFlZjM5:MjdmMWI0YWQtZDhjNS00NzQxLWFkOWUtYjA1OTViYjQwYzcw", + "payload": { + "catenaXId": "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97", + "childItems": [ + { + "validityPeriod": { + "validFrom": "2023-03-21T08:17:29.187+01:00", + "validTo": "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId": "urn:uuid:c7a2b803-f8fe-4b79-b6fc-967ce847c9a9", + "quantity": { + "unit": "unit:piece", + "value": 10 + }, + "businessPartner": "BPNL00000003AYRE", + "createdOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z" }, - "catenaXId": "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97", - "quantity": { - "unit": "unit:piece", - "value": 6 - }, - "businessPartner": "BPNL00000003AYRE", - "createdOn": "2022-02-03T14:48:54.709Z", - "lastModifiedOn": "2022-02-03T14:48:54.709Z" - } - ] + { + "validityPeriod": { + "validFrom": "2023-03-21T08:17:29.187+01:00", + "validTo": "2024-07-01T16:10:00.000+01:00" + }, + "catenaXId": "urn:uuid:15d2fcc8-6439-4d1e-904b-e62b4d3bf323", + "quantity": { + "unit": "unit:kilogram", + "value": 0.11 + }, + "businessPartner": "BPNL00000003AXS3", + "createdOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z" + } + ] + } }, { - "catenaXId": "urn:uuid:aad27ddb-43aa-4e42-98c2-01e529ef127c", - "partTypeInformation": { - "manufacturerPartId": "38049661-08", - "classification": "product", - "nameAtManufacturer": "OEM A High Voltage Battery" - }, - "partSitesInformationAsPlanned": [ - { - "functionValidUntil": "2023-12-11T06:14:55.183Z", - "catenaXsiteId": "BPNS1234567890ZZ", - "function": "production", - "functionValidFrom": "2023-12-11T06:14:55.181Z" - } - ] + "identification": "urn:uuid:2e8ea560-693d-4755-83b6-03e111975f71", + "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned", + "contractAgreementId": "ZmM1MmY1ODItOTQyYy00NzQwLTljOWUtNjZlM2Q0ZTc5Y2Qx:dXJuOnV1aWQ6Nzg0ZWZkMDYtZWY1Zi00ZDUyLWJmZTgtODVkNDQ4OWRlNzBm:MzVmNWEwYWItOGVlNy00MzlhLWIxM2UtMjQyYWI2NzUzMmU1", + "payload": { + "catenaXId": "urn:uuid:e5c96ab5-896a-482c-8761-efd74777ca97", + "partTypeInformation": { + "manufacturerPartId": "8840838-04", + "classification": "product", + "nameAtManufacturer": "HV Modul" + }, + "partSitesInformationAsPlanned": [ + { + "functionValidUntil": "2023-12-11T06:14:55.183Z", + "catenaXsiteId": "BPNS1234567890ZZ", + "function": "production", + "functionValidFrom": "2023-12-11T06:14:55.181Z" + } + ] + } } ] } \ No newline at end of file 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 new file mode 100644 index 0000000000..7f9406eed3 --- /dev/null +++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1918-expected-submodels.json @@ -0,0 +1,25 @@ +{ + "submodels": [ + { + "identification": "urn:uuid:91f0050f-7aea-4f84-828e-899b17cc56be", + "aspectType": "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt", + "contractAgreementId": "MmVjYjQ1YzEtN2QxNy00NTMxLWFlMmItNDhiYjQwYzA5MTcw:dXJuOnV1aWQ6MjIwZGI2NmQtM2VmMi00Yzg1LWFiYzgtZDlhNDhkMDZiMDNh:YzQzYzUyY2MtNjA4ZC00M2E0LTliNWYtMjcxZDE0NDMwOTUw", + "payload": { + "catenaXId": "urn:uuid:1ad0892a-59c1-4118-8b52-601540973f31", + "childItems": [ + { + "catenaXId": "urn:uuid:c6d2d642-a055-4ddf-87e3-1a3b02c689e3", + "quantity": { + "unit": "unit:piece", + "value": 20 + }, + "hasAlternatives": false, + "businessPartner": "BPNL00000000BJTL", + "createdOn": "2022-02-03T14:48:54.709Z", + "lastModifiedOn": "2022-02-03T14:48:54.709Z" + } + ] + } + } + ] +} \ No newline at end of file