verify(mockFileGroup).add(((RenameConflict) CONFLICT_BOTH).getServerPath(), TFSVcs.getKey(), null);
}
@Test(expected = VcsException.class)
public void testResolveConflict_Exception() throws Exception {
when(CommandUtils.resolveConflictsByPath(mockServerContext, Arrays.asList(CONFLICT_BOTH.getLocalPath()), ResolveConflictsCommand.AutoResolveType.KeepYours)).thenThrow(new RuntimeException("Test Error"));
<BUG>helper.resolveConflict(CONFLICT_BOTH.getLocalPath(), CONFLICT_BOTH.getLocalPath(), ResolveConflictsCommand.AutoResolveType.KeepYours, mockServerContext, mockResolveConflictsModel, true);
</BUG>
}
@Test
public void testPopulateThreeWayDiff_ContentsChangeOnly() throws Exception {

verify(mockFileGroup).add(((RenameConflict) CONFLICT_BOTH).getServerPath(), TFSVcs.getKey(), null);
}
@Test(expected = VcsException.class)
public void testResolveConflict_Exception() throws Exception {
when(CommandUtils.resolveConflictsByPath(mockServerContext, Arrays.asList(CONFLICT_BOTH.getLocalPath()), ResolveConflictsCommand.AutoResolveType.KeepYours)).thenThrow(new RuntimeException("Test Error"));
helper.resolveConflict(CONFLICT_BOTH.getLocalPath(), CONFLICT_BOTH.getLocalPath(), ResolveConflictsCommand.AutoResolveType.KeepYours, mockServerContext, mockResolveConflictsModel, true, null);
}
@Test
public void testPopulateThreeWayDiff_ContentsChangeOnly() throws Exception {
