Projects >> jbehave-core >>3d22f279110d81003b70bacbdb9e0b1d30bd4de3

Chunk
Conflicting content
    @Test
    public void shouldHandleWrongNumberOfColumns() {
<<<<<<< HEAD
        // When
        String tableTooFewColumns = "|a|b|\n|a|\n";
        ExamplesTable shortTable = new ExamplesTable(tableTooFewColumns);
        // Then
        assertThat(shortTable.asString(), equalTo("|a|b|\n|a||\n"));

        // When
        String tableTooManyColumns = "|a|b|\n|a|b|c|\n";
        ExamplesTable longTable = new ExamplesTable(tableTooManyColumns);
        // Then
        assertThat(longTable.asString(), equalTo("|a|b|\n|a|b|\n"));
=======
        assertTableAsString("|a|b|\n|a|\n", "|a|b|\n|a||\n");
        assertTableAsString("|a|b|\n|a|b|c|\n", "|a|b|\n|a|b|\n");
    }

    private void assertTableAsString(String tableAsString, String expectedTableAsString) {
        assertThat(new ExamplesTable(tableAsString).asString(), equalTo(expectedTableAsString));
>>>>>>> 69055f281be4e909746f7e073e590f9ed74adbc0
    }

    public Date convertDate(String value) throws ParseException {
Solution content
    @Test
    public void shouldHandleWrongNumberOfColumns() {
        assertTableAsString("|a|b|\n|a|\n", "|a|b|\n|a||\n");
        assertTableAsString("|a|b|\n|a|b|c|\n", "|a|b|\n|a|b|\n");
    }

    private void assertTableAsString(String tableAsString, String expectedTableAsString) {
        assertThat(new ExamplesTable(tableAsString).asString(), equalTo(expectedTableAsString));
    }

    public Date convertDate(String value) throws ParseException {
File
ExamplesTableBehaviour.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Method signature
Variable