Projects >> mifosx >>49eb712a5d431b2b8e5e4bbdb5215463f9c34ed8

Chunk
Conflicting content 
import com.jayway.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification;
<<<<<<< HEAD:mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/ClientLoanIntegrationTest.java
import org.mifosplatform.integrationtests.common.LoanApplicationTestBuilder;
import org.mifosplatform.integrationtests.common.LoanProductTestBuilder;
import org.mifosplatform.integrationtests.common.Utils;
=======
import org.mifosplatform.integrationtests.testbuilder.LoanApplicationTestBuilder;
import org.mifosplatform.integrationtests.testbuilder.LoanProductTestBuilder;
import org.mifosplatform.integrationtests.testbuilder.Utils;
>>>>>>> 5d4bbf191e7ec785fa32e6f3444db641a6946bbe:mifosng-provider/src/integrationTest/java/ClientLoanIntegrationTest.java

/**
 * Client Loan Integration Test for checking Loan Application Repayment Schedule.
Solution content 
import com.jayway.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification;
import com.jayway.restassured.specification.ResponseSpecification;
import org.mifosplatform.integrationtests.common.LoanApplicationTestBuilder;
import org.mifosplatform.integrationtests.common.LoanProductTestBuilder;
import org.mifosplatform.integrationtests.common.Utils;

/**
 * Client Loan Integration Test for checking Loan Application Repayment Schedule.
File
ClientLoanIntegrationTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    @Test
    public void checkClientLoanCreateAndDisburseFlow(){

<<<<<<< HEAD:mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/ClientLoanIntegrationTest.java
        Integer clientID = Utils.createClient(requestSpec, responseSpec);
=======
        Integer clientID = createClient();
>>>>>>> 5d4bbf191e7ec785fa32e6f3444db641a6946bbe:mifosng-provider/src/integrationTest/java/ClientLoanIntegrationTest.java
        checkClientCreatedOnServer(clientID);

        Integer loanProductID = createLoanProduct();
Solution content 
    @Test
    public void checkClientLoanCreateAndDisburseFlow(){
        Integer clientID = Utils.createClient(requestSpec, responseSpec);
        checkClientCreatedOnServer(clientID);

        Integer loanProductID = createLoanProduct();
File
ClientLoanIntegrationTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    }

<<<<<<< HEAD:mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/ClientLoanIntegrationTest.java
=======
    private String loginIntoServerAndGetBase64EncodedAuthenticationKey() {
        System.out.println("-----------------------------------LOGIN-----------------------------------------");
        String json = post("/mifosng-provider/api/v1/authentication?username=mifos&password=password&tenantIdentifier=default").asString();
        return JsonPath.with(json).get("base64EncodedAuthenticationKey");
    }

    private Integer createClient() {
        System.out.println("---------------------------------CREATING A CLIENT---------------------------------------------");
        String json = given().spec(requestSpec).body(Utils.getTestClientAsJSON("4 March 2009"))
                     .expect().spec(responseSpec)
                     .when().post("/mifosng-provider/api/v1/clients?tenantIdentifier=default")
                     .andReturn().asString();
        
        return  from(json).get("clientId");
    }

>>>>>>> 5d4bbf191e7ec785fa32e6f3444db641a6946bbe:mifosng-provider/src/integrationTest/java/ClientLoanIntegrationTest.java
    private void checkClientCreatedOnServer(final Integer generatedClientID) {
        System.out.println("------------------------------CHECK CLIENT DETAILS------------------------------------\n");
        given().spec(requestSpec)
Solution content 
    }



    private void checkClientCreatedOnServer(final Integer generatedClientID) {
        System.out.println("------------------------------CHECK CLIENT DETAILS------------------------------------\n");
        given().spec(requestSpec)
File
ClientLoanIntegrationTest.java
Developer's decision
Version 1
Kind of conflict
Method declaration