Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 05:55:44 +01:00
Code Issues Packages Projects Releases Activity

Fix unit test

Browse Source
This commit is contained in:
René Pfeuffer
2018-12-07 13:28:21 +01:00
parent 133655418f
commit 8b97e00b36
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
View File

@@ -38,13 +38,15 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
@Rule @Rule
public ShiroRule shiro = new ShiroRule(); public ShiroRule shiro = new ShiroRule();
private GitRepositoryHandler gitRepositoryHandler;
private HookEventFacade hookEventFacade;
@Before @Before
public void bindScmProtocol() { public void bindScmProtocol() {
HookContextFactory hookContextFactory = new HookContextFactory(mock(PreProcessorUtil.class)); HookContextFactory hookContextFactory = new HookContextFactory(mock(PreProcessorUtil.class));
RepositoryManager repositoryManager = mock(RepositoryManager.class); RepositoryManager repositoryManager = mock(RepositoryManager.class);
HookEventFacade hookEventFacade = new HookEventFacade(of(repositoryManager), hookContextFactory); hookEventFacade = new HookEventFacade(of(repositoryManager), hookContextFactory);
GitRepositoryHandler gitRepositoryHandler = mock(GitRepositoryHandler.class); gitRepositoryHandler = mock(GitRepositoryHandler.class);
Transport.register(new ScmTransportProtocol(of(hookEventFacade), of(gitRepositoryHandler))); Transport.register(new ScmTransportProtocol(of(hookEventFacade), of(gitRepositoryHandler)));
when(gitRepositoryHandler.getRepositoryId(any())).thenReturn("1"); when(gitRepositoryHandler.getRepositoryId(any())).thenReturn("1");
@@ -116,6 +118,8 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
Repository repository = createContext().open(); Repository repository = createContext().open();
ObjectId firstMergeCommit = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call().iterator().next().getId(); ObjectId firstMergeCommit = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call().iterator().next().getId();
Transport.register(new ScmTransportProtocol(of(hookEventFacade), of(gitRepositoryHandler)));
MergeCommandResult secondMergeCommandResult = command.merge(request); MergeCommandResult secondMergeCommandResult = command.merge(request);
assertThat(secondMergeCommandResult.isSuccess()).isTrue(); assertThat(secondMergeCommandResult.isSuccess()).isTrue();