From 8b97e00b36628dd38469a2f558c94fc0580c26c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 7 Dec 2018 13:28:21 +0100 Subject: [PATCH] Fix unit test --- .../sonia/scm/repository/spi/GitMergeCommandTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java index d0c7db6657..e36d50aa43 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java @@ -38,13 +38,15 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { @Rule public ShiroRule shiro = new ShiroRule(); + private GitRepositoryHandler gitRepositoryHandler; + private HookEventFacade hookEventFacade; @Before public void bindScmProtocol() { HookContextFactory hookContextFactory = new HookContextFactory(mock(PreProcessorUtil.class)); RepositoryManager repositoryManager = mock(RepositoryManager.class); - HookEventFacade hookEventFacade = new HookEventFacade(of(repositoryManager), hookContextFactory); - GitRepositoryHandler gitRepositoryHandler = mock(GitRepositoryHandler.class); + hookEventFacade = new HookEventFacade(of(repositoryManager), hookContextFactory); + gitRepositoryHandler = mock(GitRepositoryHandler.class); Transport.register(new ScmTransportProtocol(of(hookEventFacade), of(gitRepositoryHandler))); when(gitRepositoryHandler.getRepositoryId(any())).thenReturn("1"); @@ -116,6 +118,8 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { Repository repository = createContext().open(); 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); assertThat(secondMergeCommandResult.isSuccess()).isTrue();