Projects >> jcommune >>c5ae1bfc01b95f48b9e8ae40735f4b7f3fe0e550

Chunk
Conflicting content 
        Article sameArticle = dao.get(id);
        assertEquals(sameArticle.getArticleContent(), newContent);
    }
<<<<<<< HEAD

    @Test
    public void testGetFirstArticle(){         
        Article article = ObjectsFactory.getDefaultArticle();           
        session.save(article);         
        session.flush();
        session.evict(article);

        Article obtainedArticle = dao.getFirstArticleFromCollection(article.getArticleCollection().getId());
        assertEquals(article,obtainedArticle);
    }

=======
    
    @Test
>>>>>>> 94a116a9b486272993d8ffb25134045cd4bd9149
    public void testDelete() {
        int initCount = getCount();
        Article article = ObjectsFactory.getDefaultArticle();
Solution content 
        Article sameArticle = dao.get(id);
        assertEquals(sameArticle.getArticleContent(), newContent);
    }

    @Test
    public void testGetFirstArticle(){         
        Article article = ObjectsFactory.getDefaultArticle();           
        session.save(article);         
        session.flush();
        session.evict(article);

        Article obtainedArticle = dao.getFirstArticleFromCollection(article.getArticleCollection().getId());
        assertEquals(article,obtainedArticle);
    }

    public void testDelete() {
        int initCount = getCount();
        Article article = ObjectsFactory.getDefaultArticle();
File
ArticleHibernateDoaTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
    @BeforeMethod
    public void init() {
        articleCollectionService = mock(ArticleCollectionService.class);
<<<<<<< HEAD
=======
        articleService = mock(ArticleService.class);
>>>>>>> 94a116a9b486272993d8ffb25134045cd4bd9149
        controller = new ArticleCollectionController(articleCollectionService, articleService);
    }
Solution content 
    @BeforeMethod
    public void init() {
        articleCollectionService = mock(ArticleCollectionService.class);
<<<<<<< HEAD
=======
        articleService = mock(ArticleService.class);
>>>>>>> 0c685a7da2985cea36314fa4f132a1ea3639c349
        controller = new ArticleCollectionController(articleCollectionService, articleService);
    }
File
ArticleCollectionControllerTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation