Projects >> hudson >>b17077b0985dae288de02bc3292f203a7d3fac80

Chunk
Conflicting content
        webClient3.login("james");
                assertEquals(((DomElement)element).getElementsByTagName("url").size(),1);
            }
        }
<<<<<<< HEAD
        webClient = r.createWebClient();
        webClient.login("alice");
        XmlPage p2 = webClient.goToXml("/queue/api/xml");
        //alice does not have permission on the project and will not see it in the queue.
        assertEquals("", p2.getContent());

        webClient = r.createWebClient();
        webClient.login("james");
        XmlPage p3 = webClient.goToXml("/queue/api/xml");
=======
        WebClient webClient2 = new WebClient();
        webClient2.login("alice");
        XmlPage p2 = webClient2.goToXml("queue/api/xml");
        //alice does not have permission on the project and will not see it in the queue.
        assertEquals("", p2.getContent());

        WebClient webClient3 = new WebClient();
        XmlPage p3 = webClient3.goToXml("queue/api/xml");
>>>>>>> 574a0e7a0687d73261601f7e7fb43c4d844ecfef
        //james has DISCOVER permission on the project and will only be able to see the task name.
        assertEquals("project",
                p3.getContent());
Solution content
                assertEquals(((DomElement)element).getElementsByTagName("url").size(),1);
            }
        }
        webClient = r.createWebClient();
        webClient.login("alice");
        XmlPage p2 = webClient.goToXml("queue/api/xml");
        //alice does not have permission on the project and will not see it in the queue.
        assertEquals("", p2.getContent());

        webClient = r.createWebClient();
        webClient.login("james");
        XmlPage p3 = webClient.goToXml("queue/api/xml");
        //james has DISCOVER permission on the project and will only be able to see the task name.
        assertEquals("project",
                p3.getContent());
File
QueueTest.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Variable