This is an automated email from the ASF dual-hosted git repository. arnold pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 25823a9377adc28e930981be3ba8af5fa92251ae Author: Adam Saghy <[email protected]> AuthorDate: Mon Jul 25 08:48:13 2022 +0200 Fix some tests --- .../client/api/InternalClientInformationApiResource.java | 3 ++- .../api/InternalLoanInformationApiResource.java | 3 ++- .../tenant-store/parts/0005_jdbc_connection_string.xml | 2 +- .../integrationtests/ClientAuditingIntegrationTest.java | 3 ++- .../integrationtests/LoanAuditingIntegrationTest.java | 3 ++- .../LoanTransactionAuditingIntegrationTest.java | 3 ++- .../useradministration/users/UserHelper.java | 15 ++++++++++++++- 7 files changed, 25 insertions(+), 7 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/InternalClientInformationApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/InternalClientInformationApiResource.java index f302abefe..8063a0b8c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/InternalClientInformationApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/InternalClientInformationApiResource.java @@ -41,9 +41,10 @@ import org.apache.fineract.infrastructure.core.serialization.ToApiJsonSerializer import org.apache.fineract.portfolio.client.domain.Client; import org.apache.fineract.portfolio.client.domain.ClientRepositoryWrapper; import org.springframework.beans.factory.InitializingBean; +import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -//@Profile("test") +@Profile("test") @Component @Path("/internal/client") @RequiredArgsConstructor diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/InternalLoanInformationApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/InternalLoanInformationApiResource.java index 20cf85559..30c0c472b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/InternalLoanInformationApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/InternalLoanInformationApiResource.java @@ -43,9 +43,10 @@ import org.apache.fineract.portfolio.loanaccount.domain.LoanRepositoryWrapper; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRepository; import org.springframework.beans.factory.InitializingBean; +import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -//@Profile("test") +@Profile("test") @Component @Path("/internal/loan") @RequiredArgsConstructor diff --git a/fineract-provider/src/main/resources/db/changelog/tenant-store/parts/0005_jdbc_connection_string.xml b/fineract-provider/src/main/resources/db/changelog/tenant-store/parts/0005_jdbc_connection_string.xml index dc7145986..78fa641d6 100644 --- a/fineract-provider/src/main/resources/db/changelog/tenant-store/parts/0005_jdbc_connection_string.xml +++ b/fineract-provider/src/main/resources/db/changelog/tenant-store/parts/0005_jdbc_connection_string.xml @@ -24,7 +24,7 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd";> <changeSet author="fineract" id="1" context="tenant_store_db"> <update tableName="tenant_server_connections"> - <column name="schema_connection_parameters" value="serverTimezone=UTC&useLegacyDatetimeCode=false&sessionVariables=time_zone='+00:00'"/> + <column name="schema_connection_parameters" value="serverTimezone=UTC&useLegacyDatetimeCode=false&sessionVariables=time_zone='-00:00'"/> </update> </changeSet> </databaseChangeLog> diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientAuditingIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientAuditingIntegrationTest.java index 145c5b96b..d65803840 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientAuditingIntegrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientAuditingIntegrationTest.java @@ -63,7 +63,8 @@ public class ClientAuditingIntegrationTest { public void checkAuditDates() throws InterruptedException { final Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec); String username = Utils.randomNameGenerator("user", 8); - final Integer userId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, 1, staffId, username, "resourceId"); + final Integer userId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, 1, staffId, username, "password", + "resourceId"); OffsetDateTime now = OffsetDateTime.now(ZoneId.of("Asia/Kolkata")); // Testing in minutes precision, but still need to take care around the end of the actual minute if (now.getSecond() > 56) { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAuditingIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAuditingIntegrationTest.java index 1649d26db..fc2de616f 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAuditingIntegrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAuditingIntegrationTest.java @@ -75,7 +75,8 @@ public class LoanAuditingIntegrationTest { public void checkAuditDates() throws InterruptedException { final Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec); String username = Utils.randomNameGenerator("user", 8); - final Integer userId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, 1, staffId, username, "resourceId"); + final Integer userId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, 1, staffId, username, "password", + "resourceId"); LOG.info("-------------------------Creating Client---------------------------"); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAuditingIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAuditingIntegrationTest.java index 05e6d697a..5028b2f35 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAuditingIntegrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAuditingIntegrationTest.java @@ -74,7 +74,8 @@ public class LoanTransactionAuditingIntegrationTest { public void checkAuditDates() throws InterruptedException { final Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec); String username = Utils.randomNameGenerator("user", 8); - final Integer userId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, 1, staffId, username, "resourceId"); + final Integer userId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, 1, staffId, username, "password", + "resourceId"); LOG.info("-------------------------Creating Client---------------------------"); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java index e00851245..23d7dbe24 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java @@ -49,6 +49,12 @@ public final class UserHelper { attribute); } + public static Object createUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, int roleId, + int staffId, String username, String password, String attribute) { + return Utils.performServerPost(requestSpec, responseSpec, CREATE_USER_URL, + getTestCreateUserAsJSON(roleId, staffId, username, password), attribute); + } + public static PostUsersResponse createUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, PostUsersRequest request) { String requestBody = GSON.toJson(request); @@ -86,7 +92,14 @@ public final class UserHelper { private static String getTestCreateUserAsJSON(int roleId, int staffId, String username) { return "{ \"username\": \"" + username + "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"[email protected]\"," + " \"officeId\": \"1\", \"staffId\": " + "\"" + staffId + "\",\"roles\": [\"" + roleId - + "\"], \"sendPasswordToEmail\": false, \"password\": \"password\"," + " \"repeatPassword\": \"password\"}"; + + "\"], \"sendPasswordToEmail\": false}"; + } + + private static String getTestCreateUserAsJSON(int roleId, int staffId, String username, String password) { + return "{ \"username\": \"" + username + "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"[email protected]\"," + + " \"officeId\": \"1\", \"staffId\": " + "\"" + staffId + "\",\"roles\": [\"" + roleId + + "\"], \"sendPasswordToEmail\": false, \"password\": \"" + password + "\"," + " \"repeatPassword\": \"" + password + + "\"}"; } private static String getTestUpdateUserAsJSON(String username) {
