Projects >> buddycloud-server-java >>48e4675ee2e4f2e1fe3a2603221fb47f0d124a7e

Chunk
Conflicting content 
    }
    
    @Test
<<<<<<< HEAD
    public void providingBeforeValueInRsmElementInvokesPastItemLookup() throws Exception {
=======
    public void rsmStillAddedWhenThereAreNoResults() throws Exception {
>>>>>>> c6a9a1d0506b1d4bc81503dc312cee6cd1029e53

      Element rsm = request.getChildElement().addElement("set");
      rsm.addNamespace("", RepliesGet.NS_RSM);
Solution content 
    }

    @Test
    public void rsmStillAddedWhenThereAreNoResults() throws Exception {

      Element rsm = request.getChildElement().addElement("set");
      rsm.addNamespace("", RepliesGet.NS_RSM);
File
RepliesGetTest.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
      
      rsm.addNamespace("", RepliesGet.NS_RSM);
      rsm.addElement("max").setText("4");
      rsm.addElement("after").setText("1");
<<<<<<< HEAD
      rsm.addElement("before").setText("2");

      ArrayList expectedResults = new ArrayList();
      expectedResults.add(new NodeItemImpl(TEST_NODE, "1", new Date(), "value1"));
      expectedResults.add(new NodeItemImpl(TEST_NODE, "2", new Date(), "value2"));
      expectedResults.add(new NodeItemImpl(TEST_NODE, "3", new Date(), "value3"));
      expectedResults.add(new NodeItemImpl(TEST_NODE, "4", new Date(), "value4"));

      Mockito.when(channelManager.getNodeItemReplies(Mockito.anyString(), Mockito.anyString(), Mockito.eq("1"), Mockito.eq(false), Mockito.eq(4))).thenReturn(
              new ClosableIteratorImpl(expectedResults.iterator()));
=======

      ArrayList expectedResults = new ArrayList();
      Mockito.when(channelManager.getNodeItemReplies(Mockito.anyString(), Mockito.anyString(), Mockito.eq("1"), Mockito.eq(4))).thenReturn(
              new ClosableIteratorImpl(expectedResults.iterator()));
      Mockito.when(channelManager.getCountNodeItemReplies(Mockito.anyString(), Mockito.anyString())).thenReturn(0);
>>>>>>> c6a9a1d0506b1d4bc81503dc312cee6cd1029e53

      repliesGet.process(element, jid, request, null);
      Packet response = queue.poll();
Solution content 
      rsm.addNamespace("", RepliesGet.NS_RSM);
      rsm.addElement("max").setText("4");
      rsm.addElement("after").setText("1");

      ArrayList expectedResults = new ArrayList();
      Mockito.when(channelManager.getNodeItemReplies(Mockito.anyString(), Mockito.anyString(), Mockito.eq("1"), Mockito.eq(true), Mockito.eq(4))).thenReturn(
              new ClosableIteratorImpl(expectedResults.iterator()));
      
      Mockito.when(channelManager.getCountNodeItemReplies(Mockito.anyString(), Mockito.anyString())).thenReturn(0);

      repliesGet.process(element, jid, request, null);
      Packet response = queue.poll();
File
RepliesGetTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
      Element items = response.getElement().element("pubsub").element("items");

<<<<<<< HEAD
      Assert.assertEquals(4, items.elements("item").size());
=======
      Assert.assertEquals("/user/channeluser@example.com/posts", items.attributeValue("node"));
      Assert.assertEquals(0, items.elements("item").size());

      Element rsmResult = response.getElement().element("pubsub").element("set");
      Assert.assertNull(rsmResult.elementText("first"));
      Assert.assertNull(rsmResult.elementText("last"));
      Assert.assertEquals("0", rsmResult.elementText("count"));
>>>>>>> c6a9a1d0506b1d4bc81503dc312cee6cd1029e53
    }
}
Solution content 
      Element items = response.getElement().element("pubsub").element("items");

      Assert.assertEquals("/user/channeluser@example.com/posts", items.attributeValue("node"));
      Assert.assertEquals(0, items.elements("item").size());

      Element rsmResult = response.getElement().element("pubsub").element("set");
      Assert.assertNull(rsmResult.elementText("first"));
      Assert.assertNull(rsmResult.elementText("last"));
      Assert.assertEquals("0", rsmResult.elementText("count"));
    }

    @Test
    public void providingBeforeValueInRsmElementInvokesPastItemLookup() throws Exception {

      Element rsm = request.getChildElement().addElement("set");
      rsm.addNamespace("", RepliesGet.NS_RSM);
      rsm.addElement("max").setText("4");
      rsm.addElement("after").setText("1");
      rsm.addElement("before").setText("2");

      ArrayList expectedResults = new ArrayList();
      expectedResults.add(new NodeItemImpl(TEST_NODE, "1", new Date(), "value1"));
      expectedResults.add(new NodeItemImpl(TEST_NODE, "2", new Date(), "value2"));
      expectedResults.add(new NodeItemImpl(TEST_NODE, "3", new Date(), "value3"));
      expectedResults.add(new NodeItemImpl(TEST_NODE, "4", new Date(), "value4"));

      Mockito.when(channelManager.getNodeItemReplies(Mockito.anyString(), Mockito.anyString(), Mockito.eq("2"), Mockito.eq(false), Mockito.eq(4))).thenReturn(
              new ClosableIteratorImpl(expectedResults.iterator()));

      repliesGet.process(element, jid, request, null);
      Packet response = queue.poll();

      Element items = response.getElement().element("pubsub").element("items");

      Assert.assertEquals(4, items.elements("item").size());
    }
    
}
File
RepliesGetTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable