Projects >> NWDI-Core-Plugin >>92926a7dbc48944bd5f4f1e7b246a61e75c9daaa

Chunk
Conflicting content 
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
<<<<<<< HEAD
import hudson.model.Descriptor.FormException;
=======
import hudson.model.Item;
import hudson.model.ItemGroup;
import hudson.model.TopLevelItem;
import hudson.model.TopLevelItemDescriptor;
import hudson.model.Descriptor.FormException;
import hudson.model.Hudson;
import hudson.model.Job;
import hudson.search.SearchIndex;
import hudson.search.Search;
import hudson.security.ACL;
import hudson.security.Permission;
>>>>>>> a5f88ac75e77b853f941b4b9c3c5976c51944a3b
import hudson.util.FormValidation;
import net.sf.json.JSONObject;
Solution content 
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import hudson.model.Descriptor.FormException;
import hudson.util.FormValidation;
import net.sf.json.JSONObject;
File
NWDIProjectTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    /**
     * form property for password.
     */
<<<<<<< HEAD
    private static final String PASSWORD = "password";
=======
    @Before
    public void setUp() {
        descriptor = new NWDIProject.DescriptorImpl() {
            @Override
            public void load() {
            }
>>>>>>> a5f88ac75e77b853f941b4b9c3c5976c51944a3b

    /**
     * form property for path to NWDI tool library for NetWeaver 7.1+.
Solution content 
    /**
     * form property for password.
     */
    private static final String PASSWORD = "password";

    /**
     * form property for path to NWDI tool library for NetWeaver 7.1+.
File
NWDIProjectTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Method invocation
Method signature
Chunk
Conflicting content 
    /**
     * The descriptor under test.
     */
<<<<<<< HEAD
    private NWDIProject.DescriptorImpl descriptor;

    @Override
    @Before
    public void setUp() throws Exception {
        super.setUp();
        project = hudson.createProject(NWDIProject.class, "nwdi");
        descriptor = project.getDescriptor();
=======
    @After
    public void tearDown() {
        descriptor = null;
>>>>>>> a5f88ac75e77b853f941b4b9c3c5976c51944a3b
    }

    /**
Solution content 
    /**
     * The descriptor under test.
     */
    private NWDIProject.DescriptorImpl descriptor;

    @Override
    @Before
    public void setUp() throws Exception {
        super.setUp();
        project = hudson.createProject(NWDIProject.class, "nwdi");
        descriptor = project.getDescriptor();
    }

    /**
File
NWDIProjectTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Method invocation
Method signature
Chunk
Conflicting content 
     */
    @Test
    public void testDescriptorImplConfigureWithEmptyRequest() throws FormException {
<<<<<<< HEAD
        final JSONObject json = new JSONObject();
        json.accumulate(JDK_HOME_PATHS, "");
        json.accumulate(NWDITOOLLIB, "");
        json.accumulate(NWDITOOLLIB71, "");
        json.accumulate(PASSWORD, "");
        json.accumulate(USER, "");
=======
        // final StaplerRequest request = new FakeStaplerRequest(new String[]
        // {}, new String[] {});
        final JSONObject json = new JSONObject();
        json.accumulate("jdkHomePaths", "");
        json.accumulate("nwdiToolLibFolder", "");
        json.accumulate("nwdiToolLibFolder71", "");
        json.accumulate("password", "");
        json.accumulate("user", "");
>>>>>>> a5f88ac75e77b853f941b4b9c3c5976c51944a3b
        descriptor.configure(null, json);

        assertThat(descriptor.getJdkHomePaths(), equalTo(""));
Solution content 
     */
    @Test
    public void testDescriptorImplConfigureWithEmptyRequest() throws FormException {
        final JSONObject json = new JSONObject();
        json.accumulate(JDK_HOME_PATHS, "");
        json.accumulate(NWDITOOLLIB, "");
        json.accumulate(NWDITOOLLIB71, "");
        json.accumulate(PASSWORD, "");
        json.accumulate(USER, "");
        descriptor.configure(null, json);

        assertThat(descriptor.getJdkHomePaths(), equalTo(""));
File
NWDIProjectTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
    }
        assertThat(descriptor.getJdkHomePaths(), equalTo(""));
        assertThat(descriptor.getNwdiToolLibFolder(), equalTo(""));
<<<<<<< HEAD
=======
        assertThat(descriptor.getNwdiToolLibFolder71(), equalTo(""));
>>>>>>> a5f88ac75e77b853f941b4b9c3c5976c51944a3b
        assertThat(descriptor.getUser(), equalTo(""));
        assertThat(descriptor.getPassword(), equalTo(""));
Solution content 
        assertThat(descriptor.getJdkHomePaths(), equalTo(""));
        assertThat(descriptor.getNwdiToolLibFolder(), equalTo(""));
        assertThat(descriptor.getNwdiToolLibFolder71(), equalTo(""));
        assertThat(descriptor.getUser(), equalTo(""));
        assertThat(descriptor.getPassword(), equalTo(""));
    }
File
NWDIProjectTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        final String password = "secret";

        final JSONObject json = new JSONObject();
<<<<<<< HEAD
        json.accumulate(JDK_HOME_PATHS, jdk16);
        json.accumulate(NWDITOOLLIB, nwdiToolsFolder);
        json.accumulate(NWDITOOLLIB71, nwdiToolsFolder);
        json.accumulate(PASSWORD, password);
        json.accumulate(USER, user);
=======
        json.accumulate("jdkHomePaths", jdk16);
        json.accumulate("nwdiToolLibFolder", nwdiToolsFolder);
        json.accumulate("nwdiToolLibFolder71", nwdiToolsFolder);
        json.accumulate("password", password);
        json.accumulate("user", user);
>>>>>>> a5f88ac75e77b853f941b4b9c3c5976c51944a3b
        descriptor.configure(null, json);

        assertThat(descriptor.getJdkHomePaths(), equalTo(jdk16));
Solution content 
        final String password = "secret";

        final JSONObject json = new JSONObject();
        json.accumulate(JDK_HOME_PATHS, jdk16);
        json.accumulate(NWDITOOLLIB, nwdiToolsFolder);
        json.accumulate(NWDITOOLLIB71, nwdiToolsFolder);
        json.accumulate(PASSWORD, password);
        json.accumulate(USER, user);
        descriptor.configure(null, json);

        assertThat(descriptor.getJdkHomePaths(), equalTo(jdk16));
File
NWDIProjectTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        assertThat(descriptor.getJdkHomePaths(), equalTo(jdk16));
        assertThat(descriptor.getNwdiToolLibFolder(), equalTo(nwdiToolsFolder));
<<<<<<< HEAD
=======
        assertThat(descriptor.getNwdiToolLibFolder71(), equalTo(nwdiToolsFolder));
>>>>>>> a5f88ac75e77b853f941b4b9c3c5976c51944a3b
        assertThat(descriptor.getUser(), equalTo(user));
        assertThat(descriptor.getPassword(), equalTo(password));
    }
Solution content 
        assertThat(descriptor.getJdkHomePaths(), equalTo(jdk16));
        assertThat(descriptor.getNwdiToolLibFolder(), equalTo(nwdiToolsFolder));
        assertThat(descriptor.getNwdiToolLibFolder71(), equalTo(nwdiToolsFolder));
        assertThat(descriptor.getUser(), equalTo(user));
        assertThat(descriptor.getPassword(), equalTo(password));
    }
File
NWDIProjectTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation