This is an automated email from the ASF dual-hosted git repository.
aleks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new db53a42 Remove un-used code & testImplementation dependencies from
provider (FINERACT-1209)
db53a42 is described below
commit db53a422b2d1e2a60f9447834f34ea623dd4e2a8
Author: Michael Vorburger <[email protected]>
AuthorDate: Mon Nov 2 10:55:15 2020 +0100
Remove un-used code & testImplementation dependencies from provider
(FINERACT-1209)
---
fineract-provider/dependencies.gradle | 13 +---
.../apache/fineract/common/RestAssuredFixture.java | 67 -----------------
.../java/org/apache/fineract/common/Utils.java | 86 ----------------------
3 files changed, 1 insertion(+), 165 deletions(-)
diff --git a/fineract-provider/dependencies.gradle
b/fineract-provider/dependencies.gradle
index 393f921..a50d0ef 100644
--- a/fineract-provider/dependencies.gradle
+++ b/fineract-provider/dependencies.gradle
@@ -121,19 +121,8 @@ dependencies {
testImplementation( 'org.mockito:mockito-core',
'org.mockito:mockito-junit-jupiter',
'org.junit.platform:junit-platform-runner', // required to be able
to run tests directly under Eclipse, see FINERACT-943 & FINERACT-1021
- 'io.github.classgraph:classgraph',
- 'org.awaitility:awaitility'
+ 'io.github.classgraph:classgraph'
)
- testImplementation('org.mock-server:mockserver-junit-jupiter') {
- exclude group: 'com.sun.mail', module: 'mailapi'
- exclude group: 'javax.servlet', module: 'javax.servlet-api'
- exclude group: 'javax.validation'
- }
- testImplementation ('io.rest-assured:rest-assured') {
- exclude group: 'commons-logging'
- exclude group: 'org.apache.sling'
- exclude group: 'com.sun.xml.bind'
- }
testImplementation ('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'com.jayway.jsonpath', module: 'json-path'
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
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
deleted file mode 100644
index a501fc9..0000000
---
a/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.fineract.common;
-
-import com.google.common.base.Preconditions;
-import io.restassured.builder.RequestSpecBuilder;
-import io.restassured.builder.ResponseSpecBuilder;
-import io.restassured.http.ContentType;
-import io.restassured.specification.RequestSpecification;
-import io.restassured.specification.ResponseSpecification;
-
-/**
- * REST integration tests helper. Intended to encapsulate the current
RestAssured-based implementation as private. May
- * be REST integration tests should instead be written using e.g. Spring's
TestRestTemplate or Square's Retrofit
- * (already used in the Mifos X Android client).
- */
-public class RestAssuredFixture {
-
- private final int httpPort;
-
- private ResponseSpecification responseSpec;
- private RequestSpecification requestSpec;
-
- public RestAssuredFixture(int http) {
-
- 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();
- }
-
- public <T> T httpGet(String apiPath, String jsonAttributeToGetBack) {
- return Utils.performServerGet(this.requestSpec, this.responseSpec,
getApiPath(apiPath), jsonAttributeToGetBack);
- }
-
- public <T> T httpGet(String apiPath) {
- return httpGet(apiPath, "");
- }
-
- private String getApiPath(String apiPath) {
- Preconditions.checkArgument(apiPath.startsWith("/"), "trailingApiUrl
must start with slash: " + apiPath);
- return "/fineract-provider/api/v1" + apiPath +
"?tenantIdentifier=default";
- }
-
- protected String getApiUrl(String apiPath) {
- return "http://localhost:"; + httpPort + getApiPath(apiPath);
- }
-
-}
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
deleted file mode 100644
index 73556a5..0000000
--- a/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.fineract.common;
-
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import io.restassured.RestAssured;
-import io.restassured.path.json.JsonPath;
-import io.restassured.specification.RequestSpecification;
-import io.restassured.specification.ResponseSpecification;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.conn.HttpHostConnectException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Util for RestAssured tests. This class here in src/test is copy/pasted :(
from and identical to the one in
- * src/integrationTest; please keep it in sync. The cunning plan is that, now
that we have Spring Boot + MariaDB4j,
- * eventually do completely away with src/integrationTest and have only
src/test.. can you help? ;)
- */
-@SuppressWarnings("unchecked")
-public final class Utils {
-
- private Utils() {
-
- }
-
- private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
- public static final String TENANT_IDENTIFIER = "tenantIdentifier=default";
-
- private static final String LOGIN_URL =
"/fineract-provider/api/v1/authentication?username=mifos&password=password&"
- + TENANT_IDENTIFIER;
-
- public static void initializeRESTAssured() {
- RestAssured.baseURI = "https://localhost";;
- RestAssured.port = 8443;
- RestAssured.keyStore("src/main/resources/keystore.jks", "openmf");
- RestAssured.useRelaxedHTTPSValidation();
- }
-
- public static void initializeRESTAssuredPort(int http) {
- RestAssured.port = http;
- }
-
- public static String loginIntoServerAndGetBase64EncodedAuthenticationKey()
{
- try {
-
LOG.info("-----------------------------------LOGIN-----------------------------------------");
- final String json = RestAssured.post(LOGIN_URL).asString();
- assertThat("Failed to login into fineract platform",
StringUtils.isBlank(json), is(false));
- return JsonPath.with(json).get("base64EncodedAuthenticationKey");
- } catch (final Exception e) {
- if (e instanceof HttpHostConnectException) {
- final HttpHostConnectException hh = (HttpHostConnectException)
e;
- fail("Failed to connect to fineract platform:" +
hh.getMessage());
- }
-
- throw new RuntimeException(e);
- }
- }
-
- public static <T> T performServerGet(final RequestSpecification
requestSpec, final ResponseSpecification responseSpec,
- final String getURL, final String jsonAttributeToGetBack) {
- final String json =
given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getURL).andReturn().asString();
- return (T) JsonPath.from(json).get(jsonAttributeToGetBack);
- }
-
-}
