Projects >> sitemesh2 >>606b972b21d70c9314143ea51602411836ba2010

Chunk
Conflicting content
    public void testWriter() throws Exception {
        assertEquals("4", getContent(buffer, 3, 1));
    }

<<<<<<< HEAD
    private String getContent(SitemeshBuffer buffer) throws Exception
    {
=======
    public void testFragment() throws Exception {
        SitemeshBuffer buffer = newSitemeshBuffer("1234", newBufferFragment("abcd", 1, 2, 2));
        assertEquals("12bc34", getContent(buffer));
    }

    public void testDeepFragments() throws Exception {
        SitemeshBuffer buffer = newSitemeshBuffer("123456789",
                newBufferFragment("abcdefg", 3,
                        newBufferFragment("hijklm", 1, 1, 4),
                        newBufferFragment("nopqr", 1, 4, 5)),
                newBufferFragment("tuzwx", 0, 2, 8));
        assertEquals("123abcdieopqrfg45678tu9", getContent(buffer));
    }
        SitemeshBuffer buffer = newSitemeshBuffer("123456");
        SitemeshBufferWriter writer = new SitemeshBufferWriter();
        writer.write("abc");
        writer.writeSitemeshBuffer(buffer, 1, 4);
        writer.write("def");
        assertEquals("abcdef", writer.toString());
        assertEquals("abc2345def", getContent(writer.getSitemeshBuffer()));
    }

    private String getContent(SitemeshBuffer buffer) throws Exception {
>>>>>>> 10c0fb0c1339a03edff6cbbf3392c6e1cab67176
        CharArrayWriter writer = new CharArrayWriter();
        buffer.writeTo(writer, 0, buffer.getBufferLength());
        return writer.toString();
Solution content
        assertEquals("4", getContent(buffer, 3, 1));
    }

    public void testFragment() throws Exception {
        SitemeshBuffer buffer = newSitemeshBuffer("1234", newBufferFragment("abcd", 1, 2, 2));
        assertEquals("12bc34", getContent(buffer));
    }

    public void testDeepFragments() throws Exception {
        SitemeshBuffer buffer = newSitemeshBuffer("123456789",
                newBufferFragment("abcdefg", 3,
                        newBufferFragment("hijklm", 1, 1, 4),
                        newBufferFragment("nopqr", 1, 4, 5)),
                newBufferFragment("tuzwx", 0, 2, 8));
        assertEquals("123abcdieopqrfg45678tu9", getContent(buffer));
    }

    public void testWriter() throws Exception {
        SitemeshBuffer buffer = newSitemeshBuffer("123456");
        SitemeshBufferWriter writer = new SitemeshBufferWriter();
        writer.write("abc");
        writer.writeSitemeshBuffer(buffer, 1, 4);
        writer.write("def");
        assertEquals("abcdef", writer.toString());
        assertEquals("abc2345def", getContent(writer.getSitemeshBuffer()));
    }

    private String getContent(SitemeshBuffer buffer) throws Exception {
        CharArrayWriter writer = new CharArrayWriter();
        buffer.writeTo(writer, 0, buffer.getBufferLength());
        return writer.toString();
File
ChainingBufferTest.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Method signature