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

Fineract-614:

Browse Source 
Updating Global Configurations
Fixing some rebase conflicts
Change to imports on IntegrationTest for CheckStyle
This commit is contained in:
Angel Cajas
2020-03-13 17:15:25 +01:00
committed by Michael Vorburger ⛑️
parent 15a4a7695a
commit 8df44af628
2 changed files with 88 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RatesTest.java
+8 -6
View File
@@ -23,15 +23,14 @@ import com.jayway.restassured.builder.ResponseSpecBuilder;
import com.jayway.restassured.http.ContentType; import com.jayway.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import com.jayway.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import com.jayway.restassured.specification.ResponseSpecification;
import java.util.ArrayList;
import java.util.HashMap;
import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.Utils;
import org.apache.fineract.integrationtests.common.rates.RatesHelper; import org.apache.fineract.integrationtests.common.rates.RatesHelper;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import java.util.ArrayList;
import java.util.HashMap;
@SuppressWarnings({"rawtypes"}) @SuppressWarnings({"rawtypes"})
public class RatesTest { public class RatesTest {
@@ -42,7 +41,8 @@ public class RatesTest {
public void setup() { public void setup() {
Utils.initializeRESTAssured(); Utils.initializeRESTAssured();
this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build(); this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey()); this.requestSpec.header("Authorization",
"Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build(); this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
} }
@@ -62,8 +62,10 @@ public class RatesTest {
HashMap changes = RatesHelper.updateRates(this.requestSpec, this.responseSpec, loanRateId, HashMap changes = RatesHelper.updateRates(this.requestSpec, this.responseSpec, loanRateId,
RatesHelper.getModifyRateJSON()); RatesHelper.getModifyRateJSON());
HashMap rateDataAfterChanges = RatesHelper.getRateById(this.requestSpec, this.responseSpec, loanRateId); HashMap rateDataAfterChanges = RatesHelper
Assert.assertEquals("Verifying Rate after modification", rateDataAfterChanges.get("percentage"), changes.get("percentage")); .getRateById(this.requestSpec, this.responseSpec, loanRateId);
Assert.assertEquals("Verifying Rate after modification", rateDataAfterChanges.get("percentage"),
changes.get("percentage"));
} }
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/rates/RatesHelper.java
+18 -11
View File
@@ -21,11 +21,10 @@ package org.apache.fineract.integrationtests.common.rates;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jayway.restassured.specification.RequestSpecification; import com.jayway.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification; import com.jayway.restassured.specification.ResponseSpecification;
import org.apache.fineract.integrationtests.common.CommonConstants;
import org.apache.fineract.integrationtests.common.Utils;
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.Utils;
@SuppressWarnings({"rawtypes", "unchecked"}) @SuppressWarnings({"rawtypes", "unchecked"})
public class RatesHelper { public class RatesHelper {
@@ -36,24 +35,32 @@ public class RatesHelper {
private final static Integer PRODUCT_APPLY_LOAN = 1; private final static Integer PRODUCT_APPLY_LOAN = 1;
private final static Boolean ACTIVE = true; private final static Boolean ACTIVE = true;
public static ArrayList<HashMap> getRates(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) { public static ArrayList<HashMap> getRates(final RequestSpecification requestSpec,
return (ArrayList) Utils.performServerGet(requestSpec, responseSpec, RATES_URL + "?" + Utils.TENANT_IDENTIFIER, ""); final ResponseSpecification responseSpec) {
return (ArrayList) Utils
.performServerGet(requestSpec, responseSpec, RATES_URL + "?" + Utils.TENANT_IDENTIFIER, "");
} }
public static Integer createRates(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static Integer createRates(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec,
final String request) { final String request) {
return Utils.performServerPost(requestSpec, responseSpec, CREATE_RATES_URL, request, "resourceId"); return Utils
.performServerPost(requestSpec, responseSpec, CREATE_RATES_URL, request, "resourceId");
} }
public static HashMap getRateById(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap getRateById(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec,
final Integer rateId) { final Integer rateId) {
return Utils.performServerGet(requestSpec, responseSpec, RATES_URL + "/" + rateId + "?" + Utils.TENANT_IDENTIFIER, ""); return Utils.performServerGet(requestSpec, responseSpec,
RATES_URL + "/" + rateId + "?" + Utils.TENANT_IDENTIFIER, "");
} }
public static HashMap updateRates(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, public static HashMap updateRates(final RequestSpecification requestSpec,
final ResponseSpecification responseSpec,
final Integer rateId, final String request) { final Integer rateId, final String request) {
return Utils.performServerPut(requestSpec, responseSpec, RATES_URL + "/" + rateId + "?" + Utils.TENANT_IDENTIFIER, request, return Utils.performServerPut(requestSpec, responseSpec,
RATES_URL + "/" + rateId + "?" + Utils.TENANT_IDENTIFIER, request,
CommonConstants.RESPONSE_CHANGES); CommonConstants.RESPONSE_CHANGES);
} }