From 1102d5b58af185db393482e3f4b74f3bb0470f39 Mon Sep 17 00:00:00 2001 From: percyashu Date: Thu, 2 Jul 2020 01:32:59 +0100 Subject: [PATCH] FINERACT-822 Enable StaticAssignmentInConstructor check --- .../java/org/apache/fineract/common/RestAssuredFixture.java | 6 ++++-- .../src/test/java/org/apache/fineract/common/Utils.java | 4 ++++ .../core/boot/tests/SpringBootServerLoginTest.java | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java b/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java index 3dd522910..e10b3febb 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java +++ b/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java @@ -32,14 +32,16 @@ import io.restassured.specification.ResponseSpecification; */ public class RestAssuredFixture { - private final int httpPort = 8443; + private final int httpPort; private ResponseSpecification responseSpec; private RequestSpecification requestSpec; - public RestAssuredFixture() { + public RestAssuredFixture(int http) { super(); + this.httpPort = http; Utils.initializeRESTAssured(); + Utils.initializeRESTAssuredPort(http); this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build(); this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey()); this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build(); diff --git a/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java b/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java index f1cf5c260..22c2d4157 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java +++ b/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java @@ -53,6 +53,10 @@ public class Utils { RestAssured.useRelaxedHTTPSValidation(); } + public static void initializeRESTAssuredPort(int http) { + RestAssured.port = http; + } + public static String loginIntoServerAndGetBase64EncodedAuthenticationKey() { try { LOG.info("-----------------------------------LOGIN-----------------------------------------"); diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/boot/tests/SpringBootServerLoginTest.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/boot/tests/SpringBootServerLoginTest.java index f17ab7c4f..922bc5f54 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/boot/tests/SpringBootServerLoginTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/boot/tests/SpringBootServerLoginTest.java @@ -41,7 +41,7 @@ public class SpringBootServerLoginTest extends AbstractSpringBootWithMariaDB4jIn @Test @Disabled("Failing on Cloubees") public void hasPlatformStarted() { - util = new RestAssuredFixture(); + util = new RestAssuredFixture(8443); List> response = util.httpGet("/users"); assertThat(response.get(0).get("username"), is("mifos")); }