Skip to content

Commit

Permalink
[SELC-5653] feat: Cleaning up the test classes onboarding-functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@giampieroferrara
giampieroferrara authored Oct 2, 2024
1 parent 056035a commit e1af3b4
Show file tree
Hide file tree
Showing 11 changed files with 72 additions and 78 deletions.
2 changes: 1 addition & 1 deletion ...src/test/java/it/pagopa/selfcare/onboarding/client/EventhubSasTokenAuthorizationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import static org.mockito.Mockito.when;

@QuarkusTest
public class EventhubSasTokenAuthorizationTest {
class EventhubSasTokenAuthorizationTest {

@Inject
EventhubSasTokenAuthorization eventhubSasTokenAuthorization;
Expand Down
23 changes: 11 additions & 12 deletions ...unctions/src/test/java/it/pagopa/selfcare/onboarding/functions/ExternalFunctionsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,19 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.when;

@QuarkusTest
public class ExternalFunctionsTest {
class ExternalFunctionsTest {
@Inject
ExternalFunctions function;
@InjectMock
CheckOrganizationService checkOrganizationService;

final String ACK_PAYLOAD_OK = "{\"message\":\"message\"}";
final String ACK_PAYLOAD_BLANK = "{\"message\": \"\"}";
static final String ACK_PAYLOAD_OK = "{\"message\":\"message\"}";
static final String ACK_PAYLOAD_BLANK = "{\"message\": \"\"}";

@Test
public void checkOrganizationTest() {
void checkOrganizationTest() {
@SuppressWarnings("unchecked") final HttpRequestMessage<Optional<String>> req = mock(HttpRequestMessage.class);
final Map<String, String> queryParams = new HashMap<>();
queryParams.put("fiscalCode", "someFiscalCode");
Expand All @@ -53,7 +52,7 @@ public void checkOrganizationTest() {
}

@Test
public void checkOrganizationFiscalCodeNullTest() {
void checkOrganizationFiscalCodeNullTest() {
@SuppressWarnings("unchecked") final HttpRequestMessage<Optional<String>> req = mock(HttpRequestMessage.class);
final Map<String, String> queryParams = new HashMap<>();
queryParams.put("vatNumber", "vatNumber");
Expand All @@ -72,7 +71,7 @@ public void checkOrganizationFiscalCodeNullTest() {
}

@Test
public void checkOrganizationVatNumberNullTest() {
void checkOrganizationVatNumberNullTest() {
@SuppressWarnings("unchecked") final HttpRequestMessage<Optional<String>> req = mock(HttpRequestMessage.class);
final Map<String, String> queryParams = new HashMap<>();
queryParams.put("fiscalCode", "fiscalCode");
Expand All @@ -91,7 +90,7 @@ public void checkOrganizationVatNumberNullTest() {
}

@Test
public void checkOrganizationAlreadyRegisteredNullTest() {
void checkOrganizationAlreadyRegisteredNullTest() {
@SuppressWarnings("unchecked") final HttpRequestMessage<Optional<String>> req = mock(HttpRequestMessage.class);
final Map<String, String> queryParams = new HashMap<>();
queryParams.put("fiscalCode", "fiscalCode");
Expand All @@ -109,7 +108,7 @@ public void checkOrganizationAlreadyRegisteredNullTest() {
}

@Test
public void messageAcknowledgmentRequestBodyEmpty() {
void messageAcknowledgmentRequestBodyEmpty() {
final HttpRequestMessage<Optional<String>> req = mock(HttpRequestMessage.class);
final ExecutionContext context = mock(ExecutionContext.class);
doReturn(Logger.getGlobal()).when(context).getLogger();
Expand All @@ -124,7 +123,7 @@ public void messageAcknowledgmentRequestBodyEmpty() {
}

@Test
public void messageAcknowledgmentRequestBodyHasBlankMessageInPayload() {
void messageAcknowledgmentRequestBodyHasBlankMessageInPayload() {
final HttpRequestMessage<Optional<String>> req = mock(HttpRequestMessage.class);
final ExecutionContext context = mock(ExecutionContext.class);
doReturn(Logger.getGlobal()).when(context).getLogger();
Expand All @@ -139,7 +138,7 @@ public void messageAcknowledgmentRequestBodyHasBlankMessageInPayload() {
}

@Test
public void messageAcknowledgmentOkStatusIsAck() {
void messageAcknowledgmentOkStatusIsAck() {
final HttpRequestMessage<Optional<String>> req = mock(HttpRequestMessage.class);
final ExecutionContext context = mock(ExecutionContext.class);
doReturn(Logger.getGlobal()).when(context).getLogger();
Expand All @@ -153,7 +152,7 @@ public void messageAcknowledgmentOkStatusIsAck() {
}

@Test
public void messageAcknowledgmentOkStatusIsNack() {
void messageAcknowledgmentOkStatusIsNack() {
final HttpRequestMessage<Optional<String>> req = mock(HttpRequestMessage.class);
final ExecutionContext context = mock(ExecutionContext.class);
doReturn(Logger.getGlobal()).when(context).getLogger();
Expand Down
4 changes: 2 additions & 2 deletions ...ctions/src/test/java/it/pagopa/selfcare/onboarding/functions/OnboardingFunctionsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* Unit test for Function class.
*/
@QuarkusTest
public class OnboardingFunctionsTest {
class OnboardingFunctionsTest {

@Inject
OnboardingFunctions function;
Expand All @@ -64,7 +64,7 @@ public class OnboardingFunctionsTest {
}

@Test
public void startAndWaitOrchestration_failedOrchestration() throws Exception {
void startAndWaitOrchestration_failedOrchestration() throws Exception {
// Setup
@SuppressWarnings("unchecked")
final HttpRequestMessage<Optional<String>> req = mock(HttpRequestMessage.class);
Expand Down
2 changes: 1 addition & 1 deletion ...functions/src/test/java/it/pagopa/selfcare/onboarding/repository/TokenRepositoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import static org.mockito.Mockito.when;

@QuarkusTest
public class TokenRepositoryTest {
class TokenRepositoryTest {
@InjectMock
TokenRepository tokenRepository;

Expand Down
19 changes: 9 additions & 10 deletions .../test/java/it/pagopa/selfcare/onboarding/service/CheckOrganizationServiceDefaultTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,22 @@ class CheckOrganizationServiceDefaultTest {
@RestClient
ExternalTokenRestClient externalTokenRestClient;

private static final String fiscalCode = "fiscalCode";
private static final String vatNumber = "vatNumber";

private static final String accessToken = "accessToken";
private static final String FISCAL_CODE = "fiscalCode";
private static final String VAT_NUMBER = "vatNumber";
private static final String ACCESS_TOKEN = "accessToken";

@Test
void checkOrganizationSucceedsWhenFDApiInvocationSucceeds() {
when(externalTokenRestClient.getToken(any())).thenReturn(getDummyOauthToken());
when(externalRestClient.checkOrganization(fiscalCode, vatNumber, "Bearer " + accessToken)).thenReturn(getDummyOrganizationLightBeanResponse());
assertTrue(checkOrganizationService.checkOrganization(getMockedContext(), fiscalCode, vatNumber));
when(externalRestClient.checkOrganization(FISCAL_CODE, VAT_NUMBER, "Bearer " + ACCESS_TOKEN)).thenReturn(getDummyOrganizationLightBeanResponse());
assertTrue(checkOrganizationService.checkOrganization(getMockedContext(), FISCAL_CODE, VAT_NUMBER));
}

@Test
void checkOrganizationFailsWhenFDApiInvocationFails() {
when(externalTokenRestClient.getToken(any())).thenReturn(getDummyOauthToken());
when(externalRestClient.checkOrganization(fiscalCode, vatNumber, "Bearer " + accessToken)).thenThrow(new RuntimeException());
assertThrows(RuntimeException.class, () -> checkOrganizationService.checkOrganization(getMockedContext(), fiscalCode, vatNumber));
when(externalRestClient.checkOrganization(FISCAL_CODE, VAT_NUMBER, "Bearer " + ACCESS_TOKEN)).thenThrow(new RuntimeException());
assertThrows(RuntimeException.class, () -> checkOrganizationService.checkOrganization(getMockedContext(), FISCAL_CODE, VAT_NUMBER));
}

@Nested
Expand All @@ -67,7 +66,7 @@ void checkOrganizationWhenByPassCheckOrganizationIsTrue() {
@Test
void testTokenSucceedsWhenFDApiInvocationSucceeds() {
when(externalTokenRestClient.getToken(any())).thenReturn(getDummyOauthToken());
assertEquals(accessToken, checkOrganizationService.testToken(getMockedContext()));
assertEquals(ACCESS_TOKEN, checkOrganizationService.testToken(getMockedContext()));
}

private OrganizationLightBeanResponse getDummyOrganizationLightBeanResponse() {
Expand Down Expand Up @@ -96,7 +95,7 @@ private OrganizationLightBeanResponse getDummyOrganizationLightBeanResponse() {

private OauthToken getDummyOauthToken() {
OauthToken oauthToken = new OauthToken();
oauthToken.setAccessToken(accessToken);
oauthToken.setAccessToken(ACCESS_TOKEN);
oauthToken.setExpiresIn("3600");
return oauthToken;
}
Expand Down
18 changes: 10 additions & 8 deletions ...ons/src/test/java/it/pagopa/selfcare/onboarding/service/CompletionServiceDefaultTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ void createInstitutionAndPersistInstitutionId_shouldThrowExceptionIfMoreInstitut

assertThrows(GenericOnboardingException.class, () -> completionServiceDefault.createInstitutionAndPersistInstitutionId(onboarding));
}

@Test
void createInstitutionAndPersistInstitutionId_foundInstitution() {
Onboarding onboarding = createOnboarding();
Expand Down Expand Up @@ -172,7 +173,7 @@ void createOrRetrieveInstitutionFailure() {
assertThrows(GenericOnboardingException.class, () -> completionServiceDefault.createOrRetrieveInstitution(onboarding));
}

void mockOnboardingUpdateAndExecuteCreateInstitution(Onboarding onboarding){
void mockOnboardingUpdateAndExecuteCreateInstitution(Onboarding onboarding) {
PanacheUpdate panacheUpdateMock = mock(PanacheUpdate.class);
when(panacheUpdateMock.where("_id", onboarding.getId()))
.thenReturn(Long.valueOf(1));
Expand All @@ -186,7 +187,7 @@ void mockOnboardingUpdateAndExecuteCreateInstitution(Onboarding onboarding){
}

@Test
void persistUpadatedAt(){
void persistUpadatedAt() {
Onboarding onboarding = createOnboarding();

PanacheUpdate panacheUpdateMock = mock(PanacheUpdate.class);
Expand Down Expand Up @@ -262,6 +263,7 @@ void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreateAsIvas

mockOnboardingUpdateAndExecuteCreateInstitution(onboarding);
}

@Test
void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreatePgAde() {
Onboarding onboarding = createOnboarding();
Expand All @@ -282,6 +284,7 @@ void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreatePgAde(

mockOnboardingUpdateAndExecuteCreateInstitution(onboarding);
}

@Test
void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreatePaAOO() {
Onboarding onboarding = createOnboarding();
Expand Down Expand Up @@ -396,7 +399,7 @@ void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreate() {
onboarding.setInstitution(institution);

WebApplicationException e = new WebApplicationException(404);
when(institutionRegistryProxyApi.findInstitutionUsingGET(institution.getTaxCode(), null ,null))
when(institutionRegistryProxyApi.findInstitutionUsingGET(institution.getTaxCode(), null, null))
.thenThrow(e);

InstitutionsResponse response = new InstitutionsResponse();
Expand All @@ -416,8 +419,7 @@ void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreate() {
}



void mockOnboardingUpdateWhenPersistOnboarding(Onboarding onboarding){
void mockOnboardingUpdateWhenPersistOnboarding(Onboarding onboarding) {
PanacheUpdate panacheUpdateMock = mock(PanacheUpdate.class);
when(panacheUpdateMock.where("_id", onboarding.getId()))
.thenReturn(Long.valueOf(1));
Expand Down Expand Up @@ -527,7 +529,7 @@ void sendMailRejection() {
void sendCompletedEmailAggregate() {

Onboarding onboarding = createOnboarding();
Aggregator aggregator= new Aggregator();
Aggregator aggregator = new Aggregator();
aggregator.setDescription("description");
onboarding.setAggregator(aggregator);

Expand Down Expand Up @@ -575,7 +577,7 @@ void persistUsersWithException() {
}

@Test
void createDelegation(){
void createDelegation() {
Onboarding onboarding = createOnboarding();
onboarding.getInstitution().setId("institution-id");
onboarding.getInstitution().setDescription("institution-description");
Expand Down Expand Up @@ -605,7 +607,7 @@ void createDelegation(){
}

@Test
void createDelegationWithNullAggregator(){
void createDelegationWithNullAggregator() {
Onboarding onboarding = createOnboarding();
onboarding.getInstitution().setId("institution-id");
onboarding.getInstitution().setDescription("institution-description");
Expand Down
21 changes: 10 additions & 11 deletions ...tions/src/test/java/it/pagopa/selfcare/onboarding/service/ContractServiceDefaultTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ class ContractServiceDefaultTest {
@Inject
PagoPaSignatureConfig pagoPaSignatureConfig;


final static String productNameExample = "product-name";
final static String pdfFormatFilename = "%s_accordo_adesione.pdf";
static final String PRODUCT_NAME_EXAMPLE = "product-name";
static final String PDF_FORMAT_FILENAME = "%s_accordo_adesione.pdf";

@BeforeEach
void setup(){
Expand Down Expand Up @@ -101,7 +100,7 @@ void createContractPDF() {

Mockito.when(azureBlobClient.uploadFile(any(),any(),any())).thenReturn(contractHtml);

File contract = contractService.createContractPDF(contractFilepath, onboarding, manager, List.of(), productNameAccent, pdfFormatFilename);
File contract = contractService.createContractPDF(contractFilepath, onboarding, manager, List.of(), productNameAccent, PDF_FORMAT_FILENAME);

assertNotNull(contract);

Expand All @@ -125,7 +124,7 @@ void createContractPDFSA() {

Mockito.when(azureBlobClient.uploadFile(any(),any(),any())).thenReturn(contractHtml);

assertNotNull(contractService.createContractPDF(contractFilepath, onboarding, manager, List.of(), productNameExample, pdfFormatFilename));
assertNotNull(contractService.createContractPDF(contractFilepath, onboarding, manager, List.of(), PRODUCT_NAME_EXAMPLE, PDF_FORMAT_FILENAME));
}

@Test
Expand All @@ -143,7 +142,7 @@ void createContractPDFForECAndProdPagoPA() {

Mockito.when(azureBlobClient.uploadFile(any(),any(),any())).thenReturn(contractHtml);

assertNotNull(contractService.createContractPDF(contractFilepath, onboarding, manager, List.of(), productNameExample, pdfFormatFilename));
assertNotNull(contractService.createContractPDF(contractFilepath, onboarding, manager, List.of(), PRODUCT_NAME_EXAMPLE, PDF_FORMAT_FILENAME));
}

@Test
Expand All @@ -155,7 +154,7 @@ void createContractPDFAndSigned() {
User userManager = onboarding.getUsers().get(0);
UserResource manager = createDummyUserResource(userManager.getId(), userManager.getUserMailUuid());

PagoPaSignatureConfig pagoPaSignatureConfig = Mockito.spy(this.pagoPaSignatureConfig);
pagoPaSignatureConfig = Mockito.spy(this.pagoPaSignatureConfig);
when(pagoPaSignatureConfig.source()).thenReturn("local");
contractService = new ContractServiceDefault(azureStorageConfig, azureBlobClient, padesSignService, pagoPaSignatureConfig, "logo-path", true);

Expand All @@ -165,7 +164,7 @@ void createContractPDFAndSigned() {

Mockito.when(azureBlobClient.uploadFile(any(),any(),any())).thenReturn(contractHtml);

assertNotNull(contractService.createContractPDF(contractFilepath, onboarding, manager, List.of(), productNameExample, pdfFormatFilename));
assertNotNull(contractService.createContractPDF(contractFilepath, onboarding, manager, List.of(), PRODUCT_NAME_EXAMPLE, PDF_FORMAT_FILENAME));
}


Expand All @@ -183,7 +182,7 @@ void loadContractPDF() {

Mockito.when(azureBlobClient.uploadFile(any(), any(), any())).thenReturn(contractHtml);

assertNotNull(contractService.loadContractPDF(contractFilepath, onboarding.getId(), productNameExample));
assertNotNull(contractService.loadContractPDF(contractFilepath, onboarding.getId(), PRODUCT_NAME_EXAMPLE));
}

@Test
Expand All @@ -196,13 +195,13 @@ void retrieveContractNotSigned() {
File pdf = mock(File.class);
Mockito.when(azureBlobClient.getFileAsPdf(any())).thenReturn(pdf);

contractService.retrieveContractNotSigned(onboardingWorkflow, productNameExample);
contractService.retrieveContractNotSigned(onboardingWorkflow, PRODUCT_NAME_EXAMPLE);

ArgumentCaptor<String> filepathActual = ArgumentCaptor.forClass(String.class);
Mockito.verify(azureBlobClient, times(1))
.getFileAsPdf(filepathActual.capture());
assertTrue(filepathActual.getValue().contains(onboarding.getId()));
assertTrue(filepathActual.getValue().contains(productNameExample));
assertTrue(filepathActual.getValue().contains(PRODUCT_NAME_EXAMPLE));
}


Expand Down
Loading

0 comments on commit e1af3b4

Please sign in to comment.