Skip to content

Commit 25823a9

Browse files
adamsaghygalovics
authored andcommitted
Fix some tests
1 parent 35cc1fc commit 25823a9

7 files changed

Lines changed: 25 additions & 7 deletions

File tree

fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/InternalClientInformationApiResource.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@
4141
import org.apache.fineract.portfolio.client.domain.Client;
4242
import org.apache.fineract.portfolio.client.domain.ClientRepositoryWrapper;
4343
import org.springframework.beans.factory.InitializingBean;
44+
import org.springframework.context.annotation.Profile;
4445
import org.springframework.stereotype.Component;
4546

46-
//@Profile("test")
47+
@Profile("test")
4748
@Component
4849
@Path("/internal/client")
4950
@RequiredArgsConstructor

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/InternalLoanInformationApiResource.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@
4343
import org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction;
4444
import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRepository;
4545
import org.springframework.beans.factory.InitializingBean;
46+
import org.springframework.context.annotation.Profile;
4647
import org.springframework.stereotype.Component;
4748

48-
//@Profile("test")
49+
@Profile("test")
4950
@Component
5051
@Path("/internal/loan")
5152
@RequiredArgsConstructor

fineract-provider/src/main/resources/db/changelog/tenant-store/parts/0005_jdbc_connection_string.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
2525
<changeSet author="fineract" id="1" context="tenant_store_db">
2626
<update tableName="tenant_server_connections">
27-
<column name="schema_connection_parameters" value="serverTimezone=UTC&amp;useLegacyDatetimeCode=false&amp;sessionVariables=time_zone='+00:00'"/>
27+
<column name="schema_connection_parameters" value="serverTimezone=UTC&amp;useLegacyDatetimeCode=false&amp;sessionVariables=time_zone='-00:00'"/>
2828
</update>
2929
</changeSet>
3030
</databaseChangeLog>

integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientAuditingIntegrationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ public void setup() {
6363
public void checkAuditDates() throws InterruptedException {
6464
final Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec);
6565
String username = Utils.randomNameGenerator("user", 8);
66-
final Integer userId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, 1, staffId, username, "resourceId");
66+
final Integer userId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, 1, staffId, username, "password",
67+
"resourceId");
6768
OffsetDateTime now = OffsetDateTime.now(ZoneId.of("Asia/Kolkata"));
6869
// Testing in minutes precision, but still need to take care around the end of the actual minute
6970
if (now.getSecond() > 56) {

integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAuditingIntegrationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public void setup() {
7575
public void checkAuditDates() throws InterruptedException {
7676
final Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec);
7777
String username = Utils.randomNameGenerator("user", 8);
78-
final Integer userId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, 1, staffId, username, "resourceId");
78+
final Integer userId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, 1, staffId, username, "password",
79+
"resourceId");
7980

8081
LOG.info("-------------------------Creating Client---------------------------");
8182

integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanTransactionAuditingIntegrationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ public void setup() {
7474
public void checkAuditDates() throws InterruptedException {
7575
final Integer staffId = StaffHelper.createStaff(this.requestSpec, this.responseSpec);
7676
String username = Utils.randomNameGenerator("user", 8);
77-
final Integer userId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, 1, staffId, username, "resourceId");
77+
final Integer userId = (Integer) UserHelper.createUser(this.requestSpec, this.responseSpec, 1, staffId, username, "password",
78+
"resourceId");
7879

7980
LOG.info("-------------------------Creating Client---------------------------");
8081

integration-tests/src/test/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ public static Object createUser(final RequestSpecification requestSpec, final Re
4949
attribute);
5050
}
5151

52+
public static Object createUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, int roleId,
53+
int staffId, String username, String password, String attribute) {
54+
return Utils.performServerPost(requestSpec, responseSpec, CREATE_USER_URL,
55+
getTestCreateUserAsJSON(roleId, staffId, username, password), attribute);
56+
}
57+
5258
public static PostUsersResponse createUser(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
5359
PostUsersRequest request) {
5460
String requestBody = GSON.toJson(request);
@@ -86,7 +92,14 @@ public static String getTestCreateUserAsJSON(int roleId, int staffId) {
8692
private static String getTestCreateUserAsJSON(int roleId, int staffId, String username) {
8793
return "{ \"username\": \"" + username + "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"whatever@mifos.org\","
8894
+ " \"officeId\": \"1\", \"staffId\": " + "\"" + staffId + "\",\"roles\": [\"" + roleId
89-
+ "\"], \"sendPasswordToEmail\": false, \"password\": \"password\"," + " \"repeatPassword\": \"password\"}";
95+
+ "\"], \"sendPasswordToEmail\": false}";
96+
}
97+
98+
private static String getTestCreateUserAsJSON(int roleId, int staffId, String username, String password) {
99+
return "{ \"username\": \"" + username + "\", \"firstname\": \"Test\", \"lastname\": \"User\", \"email\": \"whatever@mifos.org\","
100+
+ " \"officeId\": \"1\", \"staffId\": " + "\"" + staffId + "\",\"roles\": [\"" + roleId
101+
+ "\"], \"sendPasswordToEmail\": false, \"password\": \"" + password + "\"," + " \"repeatPassword\": \"" + password
102+
+ "\"}";
90103
}
91104

92105
private static String getTestUpdateUserAsJSON(String username) {

0 commit comments

Comments
 (0)