CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

FINERACT-809 (#719) : Upgrade RestAssured version

Browse Source 
Upgrade RestAssured version

closes https://issues.apache.org/jira/browse/FINERACT-809

Co-authored-by: percyashu <percyayukashu@gmail.com>

Co-authored-by: percyashu <percyayukashu@gmail.com>
This commit is contained in:
Yemdjih Kaze Nasser
2020-04-12 20:36:15 +01:00
committed by GitHub
co-authored by percyashu
parent c9a1b38b0e
commit 26b619eea7
135 changed files with 513 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/build.gradle
+3 -1
View File
@@ -103,10 +103,12 @@ dependencyManagement {
dependency 'org.apache.activemq:activemq-broker:+' dependency 'org.apache.activemq:activemq-broker:+'
dependency 'javax.validation:validation-api:+' dependency 'javax.validation:validation-api:+'
dependency 'org.apache.bval:org.apache.bval.bundle:2.0.2' dependency 'org.apache.bval:org.apache.bval.bundle:2.0.2'
dependencySet(group: 'io.rest-assured', version: '3.3.0'){
entry 'rest-assured'
}
dependency 'junit:junit:+' dependency 'junit:junit:+'
//dependency 'junit:junit-dep:4.11' //dependency 'junit:junit-dep:4.11'
dependency 'org.mockito:mockito-core:+' dependency 'org.mockito:mockito-core:+'
dependency 'com.jayway.restassured:rest-assured:2.3.3'
dependency 'org.slf4j:slf4j-simple:1.7.30' dependency 'org.slf4j:slf4j-simple:1.7.30'
dependency 'com.mockrunner:mockrunner-jms:2.0.1' dependency 'com.mockrunner:mockrunner-jms:2.0.1'
dependency 'com.mockrunner:mockrunner-jdbc:2.0.1' dependency 'com.mockrunner:mockrunner-jdbc:2.0.1'
fineract-provider/dependencies.gradle
+2 -2
View File
@@ -103,11 +103,11 @@ dependencies {
implementation 'org.apache.bval:org.apache.bval.bundle' implementation 'org.apache.bval:org.apache.bval.bundle'
testCompile 'junit:junit', testCompile 'io.rest-assured:rest-assured',
'junit:junit',
//'junit:junit-dep', //'junit:junit-dep',
'org.mockito:mockito-core', 'org.mockito:mockito-core',
'org.slf4j:slf4j-simple', 'org.slf4j:slf4j-simple',
'com.jayway.restassured:rest-assured',
'com.mockrunner:mockrunner-jms', 'com.mockrunner:mockrunner-jms',
'com.google.code.gson:gson', 'com.google.code.gson:gson',
'org.springframework:spring-jms', 'org.springframework:spring-jms',
fineract-provider/dev-dependencies.gradle
+2 -2
View File
@@ -105,11 +105,11 @@ dependencies {
'javax.validation:validation-api', 'javax.validation:validation-api',
) )
testCompile 'junit:junit:4.11', testCompile 'io.rest-assured:rest-assured',
'junit:junit',
//'junit:junit-dep:4.11', //'junit:junit-dep:4.11',
'org.mockito:mockito-core', 'org.mockito:mockito-core',
'org.slf4j:slf4j-simple', 'org.slf4j:slf4j-simple',
'com.jayway.restassured:rest-assured',
'com.mockrunner:mockrunner-jms', 'com.mockrunner:mockrunner-jms',
'com.google.code.gson:gson', 'com.google.code.gson:gson',
'org.springframework:spring-jms', 'org.springframework:spring-jms',
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountNumberPreferencesTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountTransferTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.apache.fineract.integrationtests.common.ClientHelper; import org.apache.fineract.integrationtests.common.ClientHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchApiTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchRequestsIntegrationTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.fineract.batch.domain.BatchRequest; import org.apache.fineract.batch.domain.BatchRequest;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java
+5 -5
View File
@@ -21,11 +21,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ChargesTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
+6 -6
View File
@@ -21,12 +21,12 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.path.json.JsonPath; import io.restassured.path.json.JsonPath;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.DecimalFormat; import java.text.DecimalFormat;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.DecimalFormat; import java.text.DecimalFormat;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.ClientHelper; import org.apache.fineract.integrationtests.common.ClientHelper;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientUndoRejectAndWithdrawalIntegrationTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrenciesTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import org.apache.fineract.integrationtests.common.CurrenciesHelper; import org.apache.fineract.integrationtests.common.CurrenciesHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrencyIntegrationTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper; import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper;
import org.junit.Before; import org.junit.Before;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/DisbursalAndRepaymentScheduleTest.java
+5 -5
View File
@@ -21,11 +21,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ExternalServicesConfigurationTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.ExternalServicesConfigurationHelper; import org.apache.fineract.integrationtests.common.ExternalServicesConfigurationHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FinancialActivityAccountsTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.apache.fineract.accounting.common.AccountingConstants.FINANCIAL_ACTIVITY; import org.apache.fineract.accounting.common.AccountingConstants.FINANCIAL_ACTIVITY;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FixedDepositTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.DecimalFormat; import java.text.DecimalFormat;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map.Entry; import java.util.Map.Entry;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FundsIntegrationTest.java
+5 -5
View File
@@ -23,11 +23,11 @@ import static org.hamcrest.Matchers.hasItem;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GlobalConfigInterestChargedFromDateSameAsDisbursalDateTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.GlobalConfigurationHelper; import org.apache.fineract.integrationtests.common.GlobalConfigurationHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GlobalConfigurationTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.CommonConstants; import org.apache.fineract.integrationtests.common.CommonConstants;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupLoanIntegrationTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupSavingsIntegrationTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupTest.java
+5 -5
View File
@@ -21,11 +21,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.ClientHelper; import org.apache.fineract.integrationtests.common.ClientHelper;
import org.apache.fineract.integrationtests.common.GroupHelper; import org.apache.fineract.integrationtests.common.GroupHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/HookIntegrationTest.java
+7 -7
View File
@@ -20,13 +20,13 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import com.jayway.restassured.RestAssured; import io.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.path.json.JsonPath; import io.restassured.path.json.JsonPath;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.apache.fineract.integrationtests.common.HookHelper; import org.apache.fineract.integrationtests.common.HookHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationApprovalTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationUndoLastTrancheTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursalDateValidationTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.apache.fineract.integrationtests.common.ClientHelper; import org.apache.fineract.integrationtests.common.ClientHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursementDetailsIntegrationTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRepaymentRescheduleAtDisbursementTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRescheduleRequestTest.java
+5 -5
View File
@@ -21,11 +21,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.ClientHelper; import org.apache.fineract.integrationtests.common.ClientHelper;
import org.apache.fineract.integrationtests.common.LoanRescheduleRequestHelper; import org.apache.fineract.integrationtests.common.LoanRescheduleRequestHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java
+5 -5
View File
@@ -22,11 +22,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.ClientHelper; import org.apache.fineract.integrationtests.common.ClientHelper;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithdrawnByApplicantIntegrationTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.ClientHelper; import org.apache.fineract.integrationtests.common.ClientHelper;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.apache.fineract.integrationtests.common.CalendarHelper; import org.apache.fineract.integrationtests.common.CalendarHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/NotificationApiTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.NotificationHelper; import org.apache.fineract.integrationtests.common.NotificationHelper;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/OfficeIntegrationTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import org.apache.fineract.integrationtests.common.OfficeDomain; import org.apache.fineract.integrationtests.common.OfficeDomain;
import org.apache.fineract.integrationtests.common.OfficeHelper; import org.apache.fineract.integrationtests.common.OfficeHelper;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.apache.fineract.integrationtests.common.CommonConstants; import org.apache.fineract.integrationtests.common.CommonConstants;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PaymentTypeIntegrationTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.PaymentTypeDomain; import org.apache.fineract.integrationtests.common.PaymentTypeDomain;
import org.apache.fineract.integrationtests.common.PaymentTypeHelper; import org.apache.fineract.integrationtests.common.PaymentTypeHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RatesTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RecurringDepositTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RolesTest.java
+5 -5
View File
@@ -21,11 +21,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
import org.apache.fineract.integrationtests.common.organisation.StaffHelper; import org.apache.fineract.integrationtests.common.organisation.StaffHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SchedulerJobsTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.SchedulerJobHelper; import org.apache.fineract.integrationtests.common.SchedulerJobHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/StaffImageApiTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import org.apache.fineract.integrationtests.common.ImageHelper; import org.apache.fineract.integrationtests.common.ImageHelper;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
import org.apache.fineract.integrationtests.common.accounting.AccountHelper; import org.apache.fineract.integrationtests.common.accounting.AccountHelper;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/StaffTest.java
+5 -5
View File
@@ -19,11 +19,11 @@
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SurveyIntegrationTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper; import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
import org.junit.Before; import org.junit.Before;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SystemCodeTest.java
+5 -5
View File
@@ -21,11 +21,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/TemplateIntegrationTest.java
+5 -5
View File
@@ -19,11 +19,11 @@
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/UserAdministrationTest.java
+5 -5
View File
@@ -19,11 +19,11 @@
package org.apache.fineract.integrationtests; package org.apache.fineract.integrationtests;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/WorkingDaysTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.apache.fineract.integrationtests.common.CommonConstants; import org.apache.fineract.integrationtests.common.CommonConstants;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/XBRLIntegrationTest.java
+5 -5
View File
@@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests.bulkimport.importhandler.client; package org.apache.fineract.integrationtests.bulkimport.importhandler.client;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests.bulkimport.importhandler.loan; package org.apache.fineract.integrationtests.bulkimport.importhandler.loan;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/office/OfficeImportHandlerTest.java
+4 -4
View File
@@ -18,10 +18,10 @@
*/ */
package org.apache.fineract.integrationtests.bulkimport.importhandler.office; package org.apache.fineract.integrationtests.bulkimport.importhandler.office;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/savings/SavingsImportHandlerTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests.bulkimport.importhandler.savings; package org.apache.fineract.integrationtests.bulkimport.importhandler.savings;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/client/ClientEntityWorkbookPopulatorTest.java
+4 -4
View File
@@ -18,10 +18,10 @@
*/ */
package org.apache.fineract.integrationtests.bulkimport.populator.client; package org.apache.fineract.integrationtests.bulkimport.populator.client;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.io.IOException; import java.io.IOException;
import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/loan/LoanWorkbookPopulatorTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests.bulkimport.populator.loan; package org.apache.fineract.integrationtests.bulkimport.populator.loan;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.io.IOException; import java.io.IOException;
import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/office/OfficeWorkBookPopulatorTest.java
+4 -4
View File
@@ -18,10 +18,10 @@
*/ */
package org.apache.fineract.integrationtests.bulkimport.populator.office; package org.apache.fineract.integrationtests.bulkimport.populator.office;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.io.IOException; import java.io.IOException;
import org.apache.fineract.infrastructure.bulkimport.constants.OfficeConstants; import org.apache.fineract.infrastructure.bulkimport.constants.OfficeConstants;
import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants; import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/savings/SavingsWorkbookPopulateTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests.bulkimport.populator.savings; package org.apache.fineract.integrationtests.bulkimport.populator.savings;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.io.IOException; import java.io.IOException;
import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/BatchHelper.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.fineract.integrationtests.common;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java
+3 -3
View File
@@ -18,12 +18,12 @@
*/ */
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import static com.jayway.restassured.path.json.JsonPath.from; import static io.restassured.path.json.JsonPath.from;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
public class CalendarHelper { public class CalendarHelper {
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
+2 -2
View File
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertEquals;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientChargesTest.java
+5 -5
View File
@@ -18,11 +18,11 @@
*/ */
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientHelper.java
+2 -2
View File
@@ -21,8 +21,8 @@ package org.apache.fineract.integrationtests.common;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.fineract.integrationtests.common;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ExternalServicesConfigurationHelper.java
+2 -2
View File
@@ -19,8 +19,8 @@
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java
+2 -2
View File
@@ -19,8 +19,8 @@
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.junit.Assert; import org.junit.Assert;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GroupHelper.java
+2 -2
View File
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HolidayHelper.java
+2 -2
View File
@@ -19,8 +19,8 @@
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java
+3 -3
View File
@@ -21,9 +21,9 @@ package org.apache.fineract.integrationtests.common;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/ */
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import org.apache.http.HttpHeaders; import org.apache.http.HttpHeaders;
public class ImageHelper { public class ImageHelper {
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/LoanRescheduleRequestHelper.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.fineract.integrationtests.common;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
public class LoanRescheduleRequestHelper { public class LoanRescheduleRequestHelper {
private final RequestSpecification requestSpec; private final RequestSpecification requestSpec;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/NotificationHelper.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/ */
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
public class NotificationHelper { public class NotificationHelper {
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.fineract.integrationtests.common;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java
+2 -2
View File
@@ -19,8 +19,8 @@
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
public class PasswordPreferencesHelper { public class PasswordPreferencesHelper {
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java
+2 -2
View File
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertEquals;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ProvisioningIntegrationTest.java
+5 -5
View File
@@ -19,11 +19,11 @@
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java
+3 -3
View File
@@ -19,9 +19,9 @@
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.builder.ResponseSpecBuilder; import io.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.junit.Assert; import org.junit.Assert;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/StandingInstructionsHelper.java
+2 -2
View File
@@ -19,8 +19,8 @@
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java
+2 -2
View File
@@ -21,8 +21,8 @@ package org.apache.fineract.integrationtests.common;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
public class SurveyHelper { public class SurveyHelper {
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java
+2 -2
View File
@@ -19,8 +19,8 @@
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.accounting.Account; import org.apache.fineract.integrationtests.common.accounting.Account;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java
+2 -2
View File
@@ -19,8 +19,8 @@
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java
+10 -9
View File
@@ -18,18 +18,18 @@
*/ */
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import static com.jayway.restassured.RestAssured.given; import static io.restassured.RestAssured.given;
import static com.jayway.restassured.path.json.JsonPath.from; import static io.restassured.path.json.JsonPath.from;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import com.jayway.restassured.RestAssured; import io.restassured.RestAssured;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import com.jayway.restassured.path.json.JsonPath; import io.restassured.path.json.JsonPath;
import com.jayway.restassured.response.Response; import io.restassured.response.Response;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.io.File; import java.io.File;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
@@ -66,7 +66,8 @@ public class Utils {
public static void initializeRESTAssured() { public static void initializeRESTAssured() {
RestAssured.baseURI = "https://localhost"; RestAssured.baseURI = "https://localhost";
RestAssured.port = 8443; RestAssured.port = 8443;
RestAssured.keystore("src/main/resources/keystore.jks", "openmf"); RestAssured.keyStore("src/main/resources/keystore.jks", "openmf");
RestAssured.useRelaxedHTTPSValidation();
} }
private static void awaitSpringBootActuatorHealthyUp() { private static void awaitSpringBootActuatorHealthyUp() {
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java
+2 -2
View File
@@ -19,8 +19,8 @@
package org.apache.fineract.integrationtests.common; package org.apache.fineract.integrationtests.common;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import java.util.Random; import java.util.Random;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/AccountHelper.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/ */
package org.apache.fineract.integrationtests.common.accounting; package org.apache.fineract.integrationtests.common.accounting;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountHelper.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/ */
package org.apache.fineract.integrationtests.common.accounting; package org.apache.fineract.integrationtests.common.accounting;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.fineract.integrationtests.common.accounting;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/PeriodicAccrualAccountingHelper.java
+2 -2
View File
@@ -19,8 +19,8 @@
package org.apache.fineract.integrationtests.common.accounting; package org.apache.fineract.integrationtests.common.accounting;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java
+2 -2
View File
@@ -19,8 +19,8 @@
package org.apache.fineract.integrationtests.common.charges; package org.apache.fineract.integrationtests.common.charges;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.CommonConstants; import org.apache.fineract.integrationtests.common.CommonConstants;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountHelper.java
+2 -2
View File
@@ -19,8 +19,8 @@
package org.apache.fineract.integrationtests.common.fixeddeposit; package org.apache.fineract.integrationtests.common.fixeddeposit;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.fineract.integrationtests.common.fixeddeposit;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
import org.junit.Assert; import org.junit.Assert;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositProductHelper.java
+2 -2
View File
@@ -19,8 +19,8 @@
package org.apache.fineract.integrationtests.common.fixeddeposit; package org.apache.fineract.integrationtests.common.fixeddeposit;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsResourceHandler.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.fineract.integrationtests.common.funds;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanStatusChecker.java
+2 -2
View File
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import io.restassured.specification.ResponseSpecification;
import java.util.HashMap; import java.util.HashMap;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;

Some files were not shown because too many files have changed in this diff Show More