Projects >> hudson >>161b0ac69cbdf94269e36f1b61b3106e4815a152

Chunk
Conflicting content 
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import com.gargoylesoftware.htmlunit.WebAssert;
<<<<<<< HEAD
import com.gargoylesoftware.htmlunit.html.HtmlForm;
=======
>>>>>>> b66128c31744bb5386e2554174c57e71834c0b7d
import com.gargoylesoftware.htmlunit.html.HtmlFormUtil;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.TextPage;
Solution content 
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import com.gargoylesoftware.htmlunit.WebAssert;
import com.gargoylesoftware.htmlunit.html.HtmlForm;
import com.gargoylesoftware.htmlunit.html.HtmlFormUtil;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.TextPage;
File
JobTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        }

        @TestExtension("shouldBeAbleToBlockFlyWeightTaskOnLastMinute")
<<<<<<< HEAD
        public static class DescriptorImpl extends NodePropertyDescriptor {}
=======
        public static class DescriptorImpl extends NodePropertyDescriptor {
            @Override
            public String getDisplayName() {
                return "Some Property";
            }
        }
>>>>>>> b66128c31744bb5386e2554174c57e71834c0b7d
    }
}
Solution content 
        }

        @TestExtension("shouldBeAbleToBlockFlyWeightTaskOnLastMinute")
        public static class DescriptorImpl extends NodePropertyDescriptor {}
    }
}
File
QueueTest.java
Developer's decision
Version 1
Kind of conflict
Class declaration
Chunk
Conflicting content 
        // make sure it renders as optionalBlock
        HtmlForm f = createWebClient().getPage(foo, "configure").getFormByName("viewConfig");
<<<<<<< HEAD
        ((HtmlLabel) DomNodeUtil.selectSingleNode(f, ".//LABEL[text()='ViewPropertyImpl']")).click();
=======
        ((HtmlLabel) DomNodeUtil.selectSingleNode(f, ".//LABEL[text()='Debug Property']")).click();
>>>>>>> b66128c31744bb5386e2554174c57e71834c0b7d
        submit(f);
        ViewPropertyImpl vp = foo.getProperties().get(ViewPropertyImpl.class);
        assertEquals("Duke",vp.name);
Solution content 
        // make sure it renders as optionalBlock
        HtmlForm f = createWebClient().getPage(foo, "configure").getFormByName("viewConfig");
        ((HtmlLabel) DomNodeUtil.selectSingleNode(f, ".//LABEL[text()='ViewPropertyImpl']")).click();
        submit(f);
        ViewPropertyImpl vp = foo.getProperties().get(ViewPropertyImpl.class);
        assertEquals("Duke",vp.name);
File
ViewPropertyTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
    public void basicConfigRoundtrip() throws Exception {
        DumbSlave s = j.createSlave();
        HtmlForm f = j.createWebClient().goTo("computer/" + s.getNodeName() + "/configure").getFormByName("config");
<<<<<<< HEAD
        ((HtmlLabel)DomNodeUtil.selectSingleNode(f, ".//LABEL[text()='PropertyImpl']")).click();
=======
        ((HtmlLabel)DomNodeUtil.selectSingleNode(f, ".//LABEL[text()='Some Property']")).click();
>>>>>>> b66128c31744bb5386e2554174c57e71834c0b7d
        j.submit(f);
        PropertyImpl p = j.jenkins.getNode(s.getNodeName()).getNodeProperties().get(PropertyImpl.class);
        assertEquals("Duke",p.name);
Solution content 
    public void basicConfigRoundtrip() throws Exception {
        DumbSlave s = j.createSlave();
        HtmlForm f = j.createWebClient().goTo("computer/" + s.getNodeName() + "/configure").getFormByName("config");
        ((HtmlLabel)DomNodeUtil.selectSingleNode(f, ".//LABEL[text()='PropertyImpl']")).click();
        j.submit(f);
        PropertyImpl p = j.jenkins.getNode(s.getNodeName()).getNodeProperties().get(PropertyImpl.class);
        assertEquals("Duke",p.name);
File
NodePropertyTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation