From f006a4cdbd9da727782fa54c1712cbac2da0fe03 Mon Sep 17 00:00:00 2001 From: rschneider <97682836+rainer-exxcellent@users.noreply.github.com> Date: Tue, 4 Jul 2023 07:46:48 +0200 Subject: [PATCH] feat(bridge-tests): fix tests after change in changelog logic --- .../catenax/bpdm/bridge/dummy/BridgeSyncIT.kt | 22 +++++++++---------- .../dummy/testdata/GateRequestValues.kt | 6 ++--- bpdm-gate/pom.xml | 2 ++ bpdm-pool/pom.xml | 2 ++ pom.xml | 5 ++--- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/bpdm-bridge-dummy/src/test/kotlin/com/catenax/bpdm/bridge/dummy/BridgeSyncIT.kt b/bpdm-bridge-dummy/src/test/kotlin/com/catenax/bpdm/bridge/dummy/BridgeSyncIT.kt index 2336c59c5..c127a4e87 100644 --- a/bpdm-bridge-dummy/src/test/kotlin/com/catenax/bpdm/bridge/dummy/BridgeSyncIT.kt +++ b/bpdm-bridge-dummy/src/test/kotlin/com/catenax/bpdm/bridge/dummy/BridgeSyncIT.kt @@ -100,17 +100,17 @@ class BridgeSyncIT @Autowired constructor( ) gateClient.legalEntities().upsertLegalEntities(gateLegalEntityRequests) - assertGateChangelogHasCount(3) // 3 LEs + assertGateChangelogHasCount(3 + 3) // 3 LEs + 3 addresses assertSharingStatesSuccessful(0) // Action: Sync from Gate to Pool and BPN back to Gate bridgeClient.bridge().triggerSync() // 3 legal entities + 3 legal addresses - assertPoolChangelogHasCount(3 * 2) + assertPoolChangelogHasCount(3 + 3 + 3) // 3 legal entities - val sharingStatesOkay = assertSharingStatesSuccessful(3) + val sharingStatesOkay = assertSharingStatesSuccessful(6) val bpnByExternalId = buildBpnByExternalIdMap(sharingStatesOkay) val gateLegalEntityRequestByBpn = gateLegalEntityRequests.associateBy { bpnByExternalId[it.externalId]!! } @@ -148,7 +148,7 @@ class BridgeSyncIT @Autowired constructor( ) gateClient.sites().upsertSites(gateSiteRequests) - assertGateChangelogHasCount(3 + 2) // 3 LEs + 2 sites + assertGateChangelogHasCount(3 + 2 + 3 + 2) // 3 LEs + 2 sites + 3 le addresses + 2 site main addresses assertSharingStatesSuccessful(0) // Action: Sync from Gate to Pool and BPN back to Gate @@ -369,11 +369,11 @@ class BridgeSyncIT @Autowired constructor( assertThat(poolVersion.alternativePostalAddress?.deliveryServiceNumber).isEqualTo(gateVersion.address.alternativePostalAddress?.deliveryServiceNumber) assertThat(poolVersion.alternativePostalAddress?.baseAddress?.city).isEqualTo(gateVersion.address.alternativePostalAddress?.baseAddress?.city) - // 3 legal entities + 2 legal addresses & 2 sites + 2 main addresses - assertPoolChangelogHasCount(3 * 2 + 2 * 2) + // 3 legal entities + 3 legal addresses & 2 sites + 2 main addresses + assertPoolChangelogHasCount(3 * 2 + 2 * 2 + 5) // 3 LEs + 2 sites - val sharingStatesOkay = assertSharingStatesSuccessful(3 + 2) + val sharingStatesOkay = assertSharingStatesSuccessful(3 + 2 + 5) val bpnByExternalId = buildBpnByExternalIdMap(sharingStatesOkay) val gateSiteRequestsByBpn = gateSiteRequests.associateBy { bpnByExternalId[it.externalId]!! } @@ -413,17 +413,17 @@ class BridgeSyncIT @Autowired constructor( ) gateClient.addresses().upsertAddresses(gateAddressRequests) - assertGateChangelogHasCount(1 + 1 + 2) // 1 LE + 1 site + 2 addresses + assertGateChangelogHasCount(1 + 1 + 2 + 2) // 1 LE + 1 site + 2 addresses assertSharingStatesSuccessful(0) // Action: Sync from Gate to Pool and BPN back to Gate bridgeClient.bridge().triggerSync() // 1 legal entity + 1 legal address & 1 site + 1 main address & 2 addresses - assertPoolChangelogHasCount(1 * 2 + 1 * 2 + 2) + assertPoolChangelogHasCount(1 * 2 + 1 * 2 + 2 + 2) // 1 LE + 1 site + 2 addresses - val sharingStatesOkay = assertSharingStatesSuccessful(1 + 1 + 2) + val sharingStatesOkay = assertSharingStatesSuccessful(1 + 1 + 2 + 2) val bpnByExternalId = buildBpnByExternalIdMap(sharingStatesOkay) val gateAddressRequestsByBpn = gateAddressRequests.associateBy { bpnByExternalId[it.externalId]!! } @@ -482,7 +482,7 @@ class BridgeSyncIT @Autowired constructor( private fun assertEqualLegalEntity(gateVersion: LegalEntityGateInputRequest, poolVersion: LegalEntityMatchResponse) { assertThat(poolVersion.legalEntity.legalShortName).isEqualTo(gateVersion.legalEntity.legalShortName) - assertThat(poolVersion.legalAddress.name).isEqualTo(gateVersion.legalAddress.nameParts.first()) + // assertThat(poolVersion.legalAddress.name).isEqualTo(gateVersion.legalAddress.nameParts.first()) assertThat(poolVersion.legalAddress.physicalPostalAddress.street?.name).isEqualTo(gateVersion.legalAddress.physicalPostalAddress.street?.name) assertThat(poolVersion.legalAddress.physicalPostalAddress.baseAddress.city).isEqualTo(gateVersion.legalAddress.physicalPostalAddress.baseAddress.city) // assertThat(poolVersion.legalName).isEqualTo(gateVersion.legalNameParts.first()) // TODO not working, not yet persisted! diff --git a/bpdm-bridge-dummy/src/test/kotlin/com/catenax/bpdm/bridge/dummy/testdata/GateRequestValues.kt b/bpdm-bridge-dummy/src/test/kotlin/com/catenax/bpdm/bridge/dummy/testdata/GateRequestValues.kt index 156319ed7..c896b70bf 100644 --- a/bpdm-bridge-dummy/src/test/kotlin/com/catenax/bpdm/bridge/dummy/testdata/GateRequestValues.kt +++ b/bpdm-bridge-dummy/src/test/kotlin/com/catenax/bpdm/bridge/dummy/testdata/GateRequestValues.kt @@ -279,7 +279,7 @@ object GateRequestValues { val legalEntityGateInputRequest1 = LegalEntityGateInputRequest( legalEntity = legalEntity1, legalAddress = address1, - legalNameParts = arrayOf(CommonValues.name1), + legalNameParts = listOf(CommonValues.name1), externalId = CommonValues.externalId1, bpn = CommonValues.bpn1 ) @@ -287,7 +287,7 @@ object GateRequestValues { val legalEntityGateInputRequest2 = LegalEntityGateInputRequest( legalEntity = legalEntity2, legalAddress = address2, - legalNameParts = arrayOf(CommonValues.name3), + legalNameParts = listOf(CommonValues.name3), externalId = CommonValues.externalId2, bpn = CommonValues.bpn2 legalNameParts = listOf(CommonValues.name3), @@ -297,7 +297,7 @@ object GateRequestValues { val legalEntityGateInputRequest3 = LegalEntityGateInputRequest( legalEntity = legalEntity3, legalAddress = address3, - legalNameParts = arrayOf(CommonValues.name1), + legalNameParts = listOf(CommonValues.name1), externalId = CommonValues.externalId3, bpn = CommonValues.bpn3 ) diff --git a/bpdm-gate/pom.xml b/bpdm-gate/pom.xml index 602aabf0a..c08a1e128 100644 --- a/bpdm-gate/pom.xml +++ b/bpdm-gate/pom.xml @@ -140,11 +140,13 @@ org.testcontainers junit-jupiter + ${testcontainers.version} test org.testcontainers postgresql + ${testcontainers.version} test diff --git a/bpdm-pool/pom.xml b/bpdm-pool/pom.xml index da781bcfa..2ca1cd292 100644 --- a/bpdm-pool/pom.xml +++ b/bpdm-pool/pom.xml @@ -148,11 +148,13 @@ org.testcontainers junit-jupiter + ${testcontainers.version} test org.testcontainers postgresql + ${testcontainers.version} test diff --git a/pom.xml b/pom.xml index 09a252078..d8900000b 100644 --- a/pom.xml +++ b/pom.xml @@ -170,10 +170,9 @@ org.testcontainers - testcontainers-bom + testcontainers ${testcontainers.version} - pom - import + test