Projects >> jcommune >>d7a0c772b156542e5c735dc1a44cc760cd97c97a

Chunk
Conflicting content 
import org.jtalks.jcommune.model.entity.Topic;
import org.jtalks.jcommune.service.BranchService;
import org.jtalks.jcommune.service.LastReadPostService;
<<<<<<< HEAD
=======
import org.jtalks.jcommune.service.PollService;
>>>>>>> 7fad44b72d63920cf8c5babab31d944ea8fc6007
import org.jtalks.jcommune.service.TopicService;
import org.jtalks.jcommune.service.exceptions.NotFoundException;
import org.jtalks.jcommune.service.nontransactional.LocationService;
Solution content 
import org.jtalks.jcommune.model.entity.Topic;
import org.jtalks.jcommune.service.BranchService;
import org.jtalks.jcommune.service.LastReadPostService;
import org.jtalks.jcommune.service.PollService;
import org.jtalks.jcommune.service.TopicService;
import org.jtalks.jcommune.service.exceptions.NotFoundException;
import org.jtalks.jcommune.service.nontransactional.LocationService;
File
TopicControllerTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.ArrayList;

<<<<<<< HEAD
import static org.mockito.Mockito.*;
=======
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
>>>>>>> 7fad44b72d63920cf8c5babab31d944ea8fc6007
import static org.mockito.MockitoAnnotations.initMocks;
import static org.springframework.test.web.ModelAndViewAssert.assertAndReturnModelAttributeOfType;
import static org.springframework.test.web.ModelAndViewAssert.assertModelAttributeAvailable;
Solution content 
import java.util.ArrayList;

import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks;
import static org.springframework.test.web.ModelAndViewAssert.assertAndReturnModelAttributeOfType;
import static org.springframework.test.web.ModelAndViewAssert.assertModelAttributeAvailable;
File
TopicControllerTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    private SessionRegistry registry;
    @Mock
    private LastReadPostService lastReadPostService;
<<<<<<< HEAD
=======
    @Mock
    private PollService pollService;
>>>>>>> 7fad44b72d63920cf8c5babab31d944ea8fc6007

    private TopicController controller;
Solution content 
    private SessionRegistry registry;
    @Mock
    private LastReadPostService lastReadPostService;
    @Mock
    private PollService pollService;

    private TopicController controller;
File
TopicControllerTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
    public void initEnvironment() {
        initMocks(this);
        controller = new TopicController(topicService, branchService, lastReadPostService,
<<<<<<< HEAD
                securityService, breadcrumbBuilder, locationService, registry);
=======
                securityService, breadcrumbBuilder, locationService, registry, pollService);
>>>>>>> 7fad44b72d63920cf8c5babab31d944ea8fc6007
    }

    @BeforeMethod
Solution content 
    public void initEnvironment() {
        initMocks(this);
        controller = new TopicController(topicService, branchService, lastReadPostService,
                securityService, breadcrumbBuilder, locationService, registry, pollService);
    }

    @BeforeMethod
File
TopicControllerTest.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
        verify(breadcrumbBuilder).getForumBreadcrumb(topic);

        //check result
<<<<<<< HEAD
        assertViewName(mav, "editTopic");
=======
        assertViewName(mav, "topicForm");
>>>>>>> 7fad44b72d63920cf8c5babab31d944ea8fc6007
        TopicDto dto = assertAndReturnModelAttributeOfType(mav, "topicDto", TopicDto.class);
        assertEquals(dto.getId(), TOPIC_ID);
Solution content 
        verify(breadcrumbBuilder).getForumBreadcrumb(topic);

        //check result
        assertViewName(mav, "topicForm");
        //merge conflict
        //        assertViewName(mav, "editTopic");

        TopicDto dto = assertAndReturnModelAttributeOfType(mav, "topicDto", TopicDto.class);
        assertEquals(dto.getId(), TOPIC_ID);
File
TopicControllerTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
<<<<<<< HEAD


        ModelAndView mav = controller.editTopic(dto, resultWithErrors, BRANCH_ID, TOPIC_ID);
        assertViewName(mav, "editTopic");
=======
        assertViewName(mav, "topicForm");
>>>>>>> 7fad44b72d63920cf8c5babab31d944ea8fc6007
        long branchId = assertAndReturnModelAttributeOfType(mav, "branchId", Long.class);
        long topicId = assertAndReturnModelAttributeOfType(mav, "topicId", Long.class);
        assertEquals(branchId, BRANCH_ID);
Solution content 
        ModelAndView mav = controller.editTopic(dto, resultWithErrors, BRANCH_ID, TOPIC_ID);

        assertViewName(mav, "topicForm");
        //merge conflict
        //assertViewName(mav, "editTopic");
        long branchId = assertAndReturnModelAttributeOfType(mav, "branchId", Long.class);
        long topicId = assertAndReturnModelAttributeOfType(mav, "topicId", Long.class);
        assertEquals(branchId, BRANCH_ID);
File
TopicControllerTest.java
Developer's decision
Manual
Kind of conflict
Method invocation