Projects >> RapidFTR-Android >>c2e021d67b556e78b5ba4892265e513305aed04d

Chunk
Conflicting content 
import com.jayway.android.robotium.solo.Solo;
import com.rapidftr.activity.pages.ChildPage;
import com.rapidftr.activity.pages.LoginPage;
<<<<<<< HEAD
import com.rapidftr.activity.pages.RegisterChildPage;
import com.rapidftr.activity.pages.ViewAllChildrenPage;
=======
>>>>>>> 73f6e8c1e30e052110ce1c9cdd8a6ce302a5e8a0

public abstract class BaseActivityIntegrationTest extends ActivityInstrumentationTestCase2 {
Solution content 
import com.jayway.android.robotium.solo.Solo;
import com.rapidftr.activity.pages.ChildPage;
import com.rapidftr.activity.pages.LoginPage;
import com.rapidftr.activity.pages.ViewAllChildrenPage;

public abstract class BaseActivityIntegrationTest extends ActivityInstrumentationTestCase2 {
File
BaseActivityIntegrationTest.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    public Solo solo;
    public LoginPage loginPage;
<<<<<<< HEAD
    public RegisterChildPage registerChildPage;
    public ViewAllChildrenPage viewAllChildrenPage;
=======
    public ChildPage childPage;
>>>>>>> 73f6e8c1e30e052110ce1c9cdd8a6ce302a5e8a0

    public BaseActivityIntegrationTest() {
        super(LoginActivity.class);
Solution content 
    public Solo solo;
    public LoginPage loginPage;
    public ViewAllChildrenPage viewAllChildrenPage;
    public ChildPage childPage;

    public BaseActivityIntegrationTest() {
        super(LoginActivity.class);
File
BaseActivityIntegrationTest.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
    public void setUp() throws Exception {
        solo = new Solo(getInstrumentation(), getActivity());
        loginPage = new LoginPage(solo);
<<<<<<< HEAD
        registerChildPage = new RegisterChildPage(solo);
        viewAllChildrenPage = new ViewAllChildrenPage(solo);
=======
        childPage = new ChildPage(solo);
>>>>>>> 73f6e8c1e30e052110ce1c9cdd8a6ce302a5e8a0
    }

    @Override
Solution content 
    public void setUp() throws Exception {
        solo = new Solo(getInstrumentation(), getActivity());
        loginPage = new LoginPage(solo);
        viewAllChildrenPage = new ViewAllChildrenPage(solo);
        childPage = new ChildPage(solo);
    }

    @Override
File
BaseActivityIntegrationTest.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
    public void setUp() throws Exception {
        super.setUp();
        loginPage.login();
<<<<<<< HEAD
        registerChildPage.navigateToRegisterPage();
    }

=======
        childPage.navigateToRegisterPage();
}
>>>>>>> 73f6e8c1e30e052110ce1c9cdd8a6ce302a5e8a0
    @Override
    public void tearDown() throws  Exception{
        solo.goBackToActivity("MainActivity");
Solution content 
    public void setUp() throws Exception {
        super.setUp();
        loginPage.login();
        childPage.navigateToRegisterPage();
    }

    @Override
    public void tearDown() throws  Exception{
        solo.goBackToActivity("MainActivity");
File
RegisterChildActivityTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation