Projects >> atlas >>bf1cceba9bf4d87eb7ed0ed54678ad3b9c2f53cb

Chunk
Conflicting content 
    @Test
    public void testMatchingWithApostrophe() {
<<<<<<< HEAD
=======
        //This test case covers cases when non-abbrivating apostrophe is used in the end of the word
        // like "Girls' Night In" with "Girls' Night In"
>>>>>>> d6661a17d6619376d5c53b77fb914d7c35fe2723
        DefaultDescription desc = new DefaultDescription();
        score(2, scorer.score(itemWithTitle("Girls' Night In"), of(itemWithTitle("Girls' Night In")), desc));
        score(2, scorer.score(itemWithTitle("Girls Night In"), of(itemWithTitle("Girls' Night In")), desc));
Solution content 
    @Test
    public void testMatchingWithApostrophe() {
        //This test case covers cases when non-abbrivating apostrophe is used in the end of the word
        // like "Girls' Night In" with "Girls' Night In"
        DefaultDescription desc = new DefaultDescription();
        score(2, scorer.score(itemWithTitle("Girls' Night In"), of(itemWithTitle("Girls' Night In")), desc));
        score(2, scorer.score(itemWithTitle("Girls Night In"), of(itemWithTitle("Girls' Night In")), desc));
File
TitleMatchingItemScorerTest.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
    @Test
    public void testMatchingWithApostropheWithinWord() {
        DefaultDescription desc = new DefaultDescription();
<<<<<<< HEAD
=======
        //This test case covers cases when non-abbrivating apostrophe is used within a word
        // like Charlies Big Catch" with "Charlie's Big Catch"
>>>>>>> d6661a17d6619376d5c53b77fb914d7c35fe2723
        score(2, scorer.score(itemWithTitle("Charlies Big Catch"), of(itemWithTitle("Charlie's Big Catch")), desc));
        score(2, scorer.score(itemWithTitle("Charlie's Big Catch"), of(itemWithTitle("Charlie's Big Catch")), desc));
        score(2, scorer.score(itemWithTitle("Charlie's Big Catch"), of(itemWithTitle("Charlies Big Catch")), desc));
Solution content 
    @Test
    public void testMatchingWithApostropheWithinWord() {
        DefaultDescription desc = new DefaultDescription();
        //This test case covers cases when non-abbrivating apostrophe is used within a word
        // like Charlies Big Catch" with "Charlie's Big Catch"
        score(2, scorer.score(itemWithTitle("Charlies Big Catch"), of(itemWithTitle("Charlie's Big Catch")), desc));
        score(2, scorer.score(itemWithTitle("Charlie's Big Catch"), of(itemWithTitle("Charlie's Big Catch")), desc));
        score(2, scorer.score(itemWithTitle("Charlie's Big Catch"), of(itemWithTitle("Charlies Big Catch")), desc));
File
TitleMatchingItemScorerTest.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
        score(2, scorer.score(itemWithTitle("C'harlies Big Catch"), of(itemWithTitle("Charlies Big Catch")), desc));
        score(2, scorer.score(itemWithTitle("Charlies Big Catch"), of(itemWithTitle("C'harlies Big Catch")), desc));
        score(2, scorer.score(itemWithTitle("C'harlies Big Catch"), of(itemWithTitle("C'harlies Big Catch")), desc));
<<<<<<< HEAD
=======
        score(0, scorer.score(itemWithTitle("C'harlie Big Catch"), of(itemWithTitle("C'harlies Big Catch")), desc));
>>>>>>> d6661a17d6619376d5c53b77fb914d7c35fe2723
    }
    
    private void score(double expected, ScoredCandidates scores) {
Solution content 
        score(2, scorer.score(itemWithTitle("C'harlies Big Catch"), of(itemWithTitle("Charlies Big Catch")), desc));
        score(2, scorer.score(itemWithTitle("Charlies Big Catch"), of(itemWithTitle("C'harlies Big Catch")), desc));
        score(2, scorer.score(itemWithTitle("C'harlies Big Catch"), of(itemWithTitle("C'harlies Big Catch")), desc));
        score(0, scorer.score(itemWithTitle("C'harlie Big Catch"), of(itemWithTitle("C'harlies Big Catch")), desc));
    }
    
    private void score(double expected, ScoredCandidates scores) {
File
TitleMatchingItemScorerTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation