From 4f4fb982e5f0fe02e4d3ae8dcd34023e00cc5d9b Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Wed, 3 Apr 2013 01:53:56 +0100 Subject: [PATCH] update junit and hamcrest dependencies, use non-dreprecated junit Assert class, add better error failure messages when tests cannot connect to server or https as not being disabled. --- mifosng-provider/build.gradle | 5 ++-- .../ClientLoanIntegrationTest.java | 2 +- ...iveInterestAndWriteOffIntegrationTest.java | 2 +- .../integrationtests/common/ClientHelper.java | 2 +- .../common/LoanStatusChecker.java | 4 +-- .../integrationtests/common/Utils.java | 25 ++++++++++++++++--- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/mifosng-provider/build.gradle b/mifosng-provider/build.gradle index d3242e88d..4a5fcdce4 100644 --- a/mifosng-provider/build.gradle +++ b/mifosng-provider/build.gradle @@ -159,9 +159,8 @@ dependencies { [group: 'com.googlecode.flyway', name: 'flyway-maven-plugin', version: '2.1.1'] ) - testCompile 'junit:junit:4.10', - 'org.mockito:mockito-all:1.9.0', - 'org.hamcrest:hamcrest-all:1.1', + testCompile 'junit:junit:4.11', + 'org.mockito:mockito-all:1.9.5', 'com.jayway.restassured:rest-assured:1.7.2' } diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/ClientLoanIntegrationTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/ClientLoanIntegrationTest.java index 26d4139d5..1dcd1d44c 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/ClientLoanIntegrationTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/ClientLoanIntegrationTest.java @@ -1,6 +1,6 @@ package org.mifosplatform.integrationtests; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.Arrays; diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java index 7a3001663..50cbb8eb5 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java @@ -1,6 +1,6 @@ package org.mifosplatform.integrationtests; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.HashMap; diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/ClientHelper.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/ClientHelper.java index 52717ff72..291ee1b6e 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/ClientHelper.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/ClientHelper.java @@ -3,7 +3,7 @@ package org.mifosplatform.integrationtests.common; import java.util.HashMap; import java.util.Random; -import junit.framework.Assert; +import org.junit.Assert; import com.google.gson.Gson; import com.jayway.restassured.specification.RequestSpecification; diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/LoanStatusChecker.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/LoanStatusChecker.java index 16db8c482..bec429224 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/LoanStatusChecker.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/LoanStatusChecker.java @@ -5,8 +5,6 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; -import junit.framework.Assert; - import com.jayway.restassured.specification.RequestSpecification; import com.jayway.restassured.specification.ResponseSpecification; @@ -34,7 +32,7 @@ public class LoanStatusChecker { } public static void verifyLoanAccountIsClosed(final HashMap loanStatusHashMap) { - Assert.assertTrue(getStatus(loanStatusHashMap, "closed")); + assertTrue(getStatus(loanStatusHashMap, "closed")); } public static HashMap getStatusOfLoan(final RequestSpecification requestSpec, final ResponseSpecification responseSpec, diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/Utils.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/Utils.java index a78a0b336..700dbcedf 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/Utils.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/Utils.java @@ -2,6 +2,10 @@ package org.mifosplatform.integrationtests.common; import static com.jayway.restassured.RestAssured.given; import static com.jayway.restassured.path.json.JsonPath.from; +import static org.hamcrest.MatcherAssert.assertThat; + +import org.apache.commons.lang.StringUtils; +import org.apache.http.conn.HttpHostConnectException; import com.jayway.restassured.RestAssured; import com.jayway.restassured.path.json.JsonPath; @@ -14,9 +18,24 @@ public class Utils { private static final String LOGIN_URL = "/mifosng-provider/api/v1/authentication?username=mifos&password=password&tenantIdentifier=default"; public static String loginIntoServerAndGetBase64EncodedAuthenticationKey() { - System.out.println("-----------------------------------LOGIN-----------------------------------------"); - String json = RestAssured.post(LOGIN_URL).asString(); - return JsonPath.with(json).get("base64EncodedAuthenticationKey"); + try { + System.out.println("-----------------------------------LOGIN-----------------------------------------"); + String json = RestAssured.post(LOGIN_URL).asString(); + if (StringUtils.isBlank(json)) { + assertThat( + "Failed to login into mifosx platform: Please check it is running and you have changed its securityContext.xml from requires-channel=\"https\" to requires-channel=\"http\"", + false); + } + return JsonPath.with(json).get("base64EncodedAuthenticationKey"); + } catch (Exception e) { + + if (e instanceof HttpHostConnectException) { + HttpHostConnectException hh = (HttpHostConnectException) e; + assertThat("Failed to connect to mifosx platform: " + hh.getMessage(), false); + } + + throw new RuntimeException(e); + } } public static T performServerGet(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,