-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
45: Use latest uk-datamodel with 3.1.8r5 swagger models
Some changes to VRP and Funds Conformation Issue: OpenBankingToolkit/openbanking-toolkit#45
- Loading branch information
Showing
11 changed files
with
221 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
...anking/common/services/openbanking/converter/common/FRAccountIdentifierConverterTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /** | ||
| * Copyright 2019 ForgeRock AS. | ||
| * | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package com.forgerock.openbanking.common.services.openbanking.converter.common; | ||
|
|
||
| import com.forgerock.openbanking.common.model.openbanking.domain.common.FRAccountIdentifier; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.junit.MockitoJUnitRunner; | ||
| import uk.org.openbanking.datamodel.fund.OBFundsConfirmationConsent1DataDebtorAccount; | ||
|
|
||
| import static com.forgerock.openbanking.common.services.openbanking.converter.common.FRAccountIdentifierConverter.toOBFundsConfirmationConsent1DataDebtorAccount; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import static com.forgerock.openbanking.common.services.openbanking.converter.common.FRAccountIdentifierConverter.toFRAccountIdentifier; | ||
|
|
||
|
|
||
| @RunWith(MockitoJUnitRunner.class) | ||
| public class FRAccountIdentifierConverterTest { | ||
|
|
||
|
|
||
| private final String schemeName = "schemeName"; | ||
| private final String identification = "32436tgf"; | ||
| private final String name = "fred titmus"; | ||
| private final String secondaryIdentification = "34326dljf"; | ||
|
|
||
|
|
||
| @Test | ||
| public void OBFundsConfirmationConsent1DataDebtorAccount_toFRAccountIdentifier() { | ||
| // Given | ||
| OBFundsConfirmationConsent1DataDebtorAccount obFundsConfirmationConsent1DataDebtorAccount = | ||
| new OBFundsConfirmationConsent1DataDebtorAccount(); | ||
| obFundsConfirmationConsent1DataDebtorAccount.schemeName(this.schemeName) | ||
| .identification(this.identification) | ||
| .name(this.name) | ||
| .secondaryIdentification(this.secondaryIdentification); | ||
|
|
||
| // When | ||
| FRAccountIdentifier accountIdentifier = toFRAccountIdentifier(obFundsConfirmationConsent1DataDebtorAccount); | ||
|
|
||
| // Then | ||
| assertThat(accountIdentifier.getSchemeName()).isEqualTo(this.schemeName); | ||
| assertThat(accountIdentifier.getIdentification()).isEqualTo(this.identification); | ||
| assertThat(accountIdentifier.getName()).isEqualTo(this.name); | ||
| assertThat(accountIdentifier.getSecondaryIdentification()).isEqualTo(this.secondaryIdentification); | ||
| } | ||
|
|
||
| @Test | ||
| public void FRAccountIdentifier_toOBFundsConfirmationConsent1DataDebtorAccount() { | ||
| // Given | ||
| FRAccountIdentifier accountIdentifier = new FRAccountIdentifier(); | ||
| accountIdentifier.setName(this.name); | ||
| accountIdentifier.setIdentification(this.identification); | ||
| accountIdentifier.setSchemeName(this.schemeName); | ||
| accountIdentifier.setSecondaryIdentification(this.secondaryIdentification); | ||
|
|
||
| // When | ||
| OBFundsConfirmationConsent1DataDebtorAccount account = | ||
| toOBFundsConfirmationConsent1DataDebtorAccount(accountIdentifier); | ||
|
|
||
| // Then | ||
| assertThat(account.getName()).isEqualTo(this.name); | ||
| assertThat(account.getIdentification()).isEqualTo(this.identification); | ||
| assertThat(account.getSchemeName()).isEqualTo(this.schemeName); | ||
| assertThat(account.getSecondaryIdentification()).isEqualTo(this.secondaryIdentification); | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
...erock/openbanking/common/services/openbanking/converter/common/FRAmountConverterTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /** | ||
| * Copyright 2019 ForgeRock AS. | ||
| * | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package com.forgerock.openbanking.common.services.openbanking.converter.common; | ||
|
|
||
| import com.forgerock.openbanking.common.model.openbanking.domain.common.FRAmount; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.junit.MockitoJUnitRunner; | ||
| import uk.org.openbanking.datamodel.fund.OBFundsConfirmation1DataInstructedAmount; | ||
|
|
||
| import static com.forgerock.openbanking.common.services.openbanking.converter.common.FRAmountConverter.toFRAmount; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
|
|
||
| @RunWith(MockitoJUnitRunner.class) | ||
| public class FRAmountConverterTest { | ||
|
|
||
| static final String amount = "32.45"; | ||
| static final String currency = "GBP"; | ||
|
|
||
| @Test | ||
| public void OBFundsConfirmation1DataInstructedAmount_toFRAmount() { | ||
| // Given | ||
| OBFundsConfirmation1DataInstructedAmount obFundsConfirmation1DataInstructedAmount = | ||
| new OBFundsConfirmation1DataInstructedAmount(); | ||
| obFundsConfirmation1DataInstructedAmount.amount(amount) | ||
| .currency(currency); | ||
|
|
||
| // When | ||
| FRAmount frAmount = toFRAmount(obFundsConfirmation1DataInstructedAmount); | ||
|
|
||
| assertThat(frAmount.getAmount()).isEqualTo(amount); | ||
| assertThat(frAmount.getCurrency()).isEqualTo(currency); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void toOBFundsConfirmation1DataInstructedAmount() { | ||
| // Given | ||
| FRAmount frAmount = new FRAmount(); | ||
| frAmount.setAmount(amount); | ||
| frAmount.setCurrency(currency); | ||
|
|
||
| // When | ||
| OBFundsConfirmation1DataInstructedAmount obFundsConfirmation1DataInstructedAmount = | ||
| FRAmountConverter.toOBFundsConfirmation1DataInstructedAmount(frAmount); | ||
|
|
||
| // Then | ||
| assertThat(obFundsConfirmation1DataInstructedAmount.getAmount()).isEqualTo(amount); | ||
| assertThat(obFundsConfirmation1DataInstructedAmount.getCurrency()).isEqualTo(currency); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.