|
|
|
|
@ -1,188 +1,128 @@
|
|
|
|
|
package com.englishtown.bitbucket.hook; |
|
|
|
|
|
|
|
|
|
import com.atlassian.bitbucket.hook.repository.RepositoryHookContext; |
|
|
|
|
import com.atlassian.bitbucket.i18n.I18nService; |
|
|
|
|
import com.atlassian.bitbucket.concurrent.BucketedExecutor; |
|
|
|
|
import com.atlassian.bitbucket.concurrent.ConcurrencyService; |
|
|
|
|
import com.atlassian.bitbucket.hook.repository.PostRepositoryHookContext; |
|
|
|
|
import com.atlassian.bitbucket.hook.repository.RepositoryPushHookRequest; |
|
|
|
|
import com.atlassian.bitbucket.project.Project; |
|
|
|
|
import com.atlassian.bitbucket.repository.Repository; |
|
|
|
|
import com.atlassian.bitbucket.repository.RepositoryService; |
|
|
|
|
import com.atlassian.bitbucket.scm.CommandErrorHandler; |
|
|
|
|
import com.atlassian.bitbucket.scm.CommandExitHandler; |
|
|
|
|
import com.atlassian.bitbucket.scm.CommandOutputHandler; |
|
|
|
|
import com.atlassian.bitbucket.scm.ScmService; |
|
|
|
|
import com.atlassian.bitbucket.scm.git.command.GitCommand; |
|
|
|
|
import com.atlassian.bitbucket.scm.git.command.GitScmCommandBuilder; |
|
|
|
|
import com.atlassian.bitbucket.scm.git.GitScm; |
|
|
|
|
import com.atlassian.bitbucket.scope.Scope; |
|
|
|
|
import com.atlassian.bitbucket.scope.Scopes; |
|
|
|
|
import com.atlassian.bitbucket.server.ApplicationPropertiesService; |
|
|
|
|
import com.atlassian.bitbucket.setting.Settings; |
|
|
|
|
import com.atlassian.bitbucket.setting.SettingsValidationErrors; |
|
|
|
|
import com.atlassian.sal.api.pluginsettings.PluginSettings; |
|
|
|
|
import com.atlassian.sal.api.pluginsettings.PluginSettingsFactory; |
|
|
|
|
import org.junit.Before; |
|
|
|
|
import org.junit.Rule; |
|
|
|
|
import org.junit.Test; |
|
|
|
|
import org.mockito.ArgumentCaptor; |
|
|
|
|
import org.mockito.ArgumentMatchers; |
|
|
|
|
import org.mockito.Captor; |
|
|
|
|
import org.mockito.Mock; |
|
|
|
|
import org.mockito.junit.MockitoJUnit; |
|
|
|
|
import org.mockito.junit.MockitoRule; |
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Collections; |
|
|
|
|
import java.util.HashMap; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.concurrent.ScheduledExecutorService; |
|
|
|
|
import java.util.Set; |
|
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
|
|
|
|
|
|
import static com.atlassian.bitbucket.mockito.MockitoUtils.returnArg; |
|
|
|
|
import static com.englishtown.bitbucket.hook.MirrorRepositoryHook.PROP_ATTEMPTS; |
|
|
|
|
import static com.englishtown.bitbucket.hook.MirrorRepositoryHook.PROP_THREADS; |
|
|
|
|
import static org.junit.Assert.assertEquals; |
|
|
|
|
import static org.mockito.Mockito.*; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Unit tests for {@link MirrorRepositoryHook} |
|
|
|
|
* Unit tests for {@link MirrorRepositoryHook}. |
|
|
|
|
*/ |
|
|
|
|
public class MirrorRepositoryHookTest { |
|
|
|
|
|
|
|
|
|
private MirrorRepositoryHook hook; |
|
|
|
|
private GitScmCommandBuilder builder; |
|
|
|
|
|
|
|
|
|
@Rule |
|
|
|
|
public MockitoRule mockitoRule = MockitoJUnit.rule(); |
|
|
|
|
public MockitoRule mockitoRule = MockitoJUnit.rule().silent(); |
|
|
|
|
|
|
|
|
|
private final String mirrorRepoUrlHttp = "https://bitbucket-mirror.englishtown.com/scm/test/test.git"; |
|
|
|
|
private final String mirrorRepoUrlSsh = "ssh://git@bitbucket-mirror.englishtown.com/scm/test/test.git"; |
|
|
|
|
private final String password = "test-password"; |
|
|
|
|
private final String refspec = "+refs/heads/master:refs/heads/master +refs/heads/develop:refs/heads/develop"; |
|
|
|
|
private final String username = "test-user"; |
|
|
|
|
|
|
|
|
|
@Mock |
|
|
|
|
private ScmService scmService; |
|
|
|
|
private BucketedExecutor<MirrorRequest> bucketedExecutor; |
|
|
|
|
@Mock |
|
|
|
|
private GitCommand<String> cmd; |
|
|
|
|
private MirrorBucketProcessor bucketProcessor; |
|
|
|
|
@Mock |
|
|
|
|
private ScheduledExecutorService executor; |
|
|
|
|
private ConcurrencyService concurrencyService; |
|
|
|
|
private MirrorRepositoryHook hook; |
|
|
|
|
@Mock |
|
|
|
|
private PasswordEncryptor passwordEncryptor; |
|
|
|
|
@Mock |
|
|
|
|
private SettingsReflectionHelper settingsReflectionHelper; |
|
|
|
|
@Mock |
|
|
|
|
private PluginSettingsFactory pluginSettingsFactory; |
|
|
|
|
@Mock |
|
|
|
|
private PluginSettings pluginSettings; |
|
|
|
|
@Mock |
|
|
|
|
private RepositoryService repositoryService; |
|
|
|
|
|
|
|
|
|
private final String mirrorRepoUrlHttp = "https://bitbucket-mirror.englishtown.com/scm/test/test.git"; |
|
|
|
|
private final String mirrorRepoUrlSsh = "ssh://git@bitbucket-mirror.englishtown.com/scm/test/test.git"; |
|
|
|
|
private final String username = "test-user"; |
|
|
|
|
private final String password = "test-password"; |
|
|
|
|
private final String repository = "https://test-user:test-password@bitbucket-mirror.englishtown.com/scm/test/test.git"; |
|
|
|
|
private final String refspec = "+refs/heads/master:refs/heads/master +refs/heads/develop:refs/heads/develop"; |
|
|
|
|
|
|
|
|
|
private ApplicationPropertiesService propertiesService; |
|
|
|
|
@Captor |
|
|
|
|
ArgumentCaptor<Runnable> argumentCaptor; |
|
|
|
|
private ArgumentCaptor<MirrorRequest> requestCaptor; |
|
|
|
|
@Mock |
|
|
|
|
private SettingsReflectionHelper settingsReflectionHelper; |
|
|
|
|
|
|
|
|
|
@Before |
|
|
|
|
public void setup() { |
|
|
|
|
doReturn(bucketedExecutor).when(concurrencyService).getBucketedExecutor(anyString(), any()); |
|
|
|
|
|
|
|
|
|
builder = mock(GitScmCommandBuilder.class); |
|
|
|
|
when(builder.command(anyString())).thenReturn(builder); |
|
|
|
|
when(builder.argument(anyString())).thenReturn(builder); |
|
|
|
|
when(builder.errorHandler(any(CommandErrorHandler.class))).thenReturn(builder); |
|
|
|
|
when(builder.exitHandler(any(CommandExitHandler.class))).thenReturn(builder); |
|
|
|
|
when(builder.<String>build(any(CommandOutputHandler.class))).thenReturn(cmd); |
|
|
|
|
|
|
|
|
|
doReturn(builder).when(scmService).createBuilder(any()); |
|
|
|
|
|
|
|
|
|
when(pluginSettingsFactory.createSettingsForKey(anyString())).thenReturn(pluginSettings); |
|
|
|
|
|
|
|
|
|
hook = new MirrorRepositoryHook(scmService, mock(I18nService.class), executor, passwordEncryptor |
|
|
|
|
, settingsReflectionHelper, pluginSettingsFactory, repositoryService); |
|
|
|
|
when(propertiesService.getPluginProperty(eq(PROP_ATTEMPTS), anyInt())).thenAnswer(returnArg(1)); |
|
|
|
|
when(propertiesService.getPluginProperty(eq(PROP_THREADS), anyInt())).thenAnswer(returnArg(1)); |
|
|
|
|
|
|
|
|
|
hook = new MirrorRepositoryHook(concurrencyService, passwordEncryptor, |
|
|
|
|
propertiesService, bucketProcessor, settingsReflectionHelper); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
public void testPostReceive() throws Exception { |
|
|
|
|
public void testPostUpdate() { |
|
|
|
|
when(passwordEncryptor.decrypt(anyString())).thenReturn(password); |
|
|
|
|
|
|
|
|
|
Repository repo = mock(Repository.class); |
|
|
|
|
when(repo.getId()).thenReturn(1); |
|
|
|
|
when(repo.getScmId()).thenReturn(GitScm.ID); |
|
|
|
|
|
|
|
|
|
hook.postUpdate(buildContext(), new RepositoryPushHookRequest.Builder(repo).build()); |
|
|
|
|
|
|
|
|
|
hook.postReceive(buildContext(repo), new ArrayList<>()); |
|
|
|
|
verifyExecutor(); |
|
|
|
|
verify(repo).getId(); |
|
|
|
|
verify(repo).getScmId(); |
|
|
|
|
verify(bucketedExecutor).schedule(requestCaptor.capture(), eq(5L), same(TimeUnit.SECONDS)); |
|
|
|
|
|
|
|
|
|
MirrorRequest request = requestCaptor.getValue(); |
|
|
|
|
assertEquals(1, request.getRepositoryId()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
public void testEmptyRepositoriesNotMirrored() { |
|
|
|
|
public void testPostUpdateForHgRepository() { |
|
|
|
|
Repository repo = mock(Repository.class); |
|
|
|
|
when(repositoryService.isEmpty(repo)).thenReturn(true); |
|
|
|
|
when(repo.getScmId()).thenReturn("hg"); |
|
|
|
|
|
|
|
|
|
hook.postReceive(buildContext(repo), new ArrayList<>()); |
|
|
|
|
hook.postUpdate(buildContext(), new RepositoryPushHookRequest.Builder(repo).build()); |
|
|
|
|
|
|
|
|
|
verify(executor, never()).submit(ArgumentMatchers.<Runnable>any()); |
|
|
|
|
verifyZeroInteractions(bucketedExecutor); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
public void testRunMirrorCommand_Retries() throws Exception { |
|
|
|
|
|
|
|
|
|
when(scmService.createBuilder(any())).thenThrow(new RuntimeException("Intentional unit test exception")); |
|
|
|
|
MirrorRepositoryHook hook = new MirrorRepositoryHook(scmService, mock(I18nService.class), executor, |
|
|
|
|
passwordEncryptor, settingsReflectionHelper, pluginSettingsFactory, repositoryService); |
|
|
|
|
MirrorRepositoryHook.MirrorSettings ms = new MirrorRepositoryHook.MirrorSettings(); |
|
|
|
|
ms.mirrorRepoUrl = mirrorRepoUrlHttp; |
|
|
|
|
ms.username = username; |
|
|
|
|
ms.password = password; |
|
|
|
|
hook.runMirrorCommand(ms, mock(Repository.class)); |
|
|
|
|
|
|
|
|
|
verify(executor).submit(argumentCaptor.capture()); |
|
|
|
|
Runnable runnable = argumentCaptor.getValue(); |
|
|
|
|
runnable.run(); |
|
|
|
|
|
|
|
|
|
verify(executor, times(1)).schedule(argumentCaptor.capture(), anyLong(), any(TimeUnit.class)); |
|
|
|
|
runnable = argumentCaptor.getValue(); |
|
|
|
|
runnable.run(); |
|
|
|
|
|
|
|
|
|
verify(executor, times(2)).schedule(argumentCaptor.capture(), anyLong(), any(TimeUnit.class)); |
|
|
|
|
runnable = argumentCaptor.getValue(); |
|
|
|
|
runnable.run(); |
|
|
|
|
|
|
|
|
|
verify(executor, times(3)).schedule(argumentCaptor.capture(), anyLong(), any(TimeUnit.class)); |
|
|
|
|
runnable = argumentCaptor.getValue(); |
|
|
|
|
runnable.run(); |
|
|
|
|
|
|
|
|
|
verify(executor, times(4)).schedule(argumentCaptor.capture(), anyLong(), any(TimeUnit.class)); |
|
|
|
|
runnable = argumentCaptor.getValue(); |
|
|
|
|
runnable.run(); |
|
|
|
|
|
|
|
|
|
// Make sure it is only called 5 times
|
|
|
|
|
runnable.run(); |
|
|
|
|
runnable.run(); |
|
|
|
|
runnable.run(); |
|
|
|
|
verify(executor, times(4)).schedule(argumentCaptor.capture(), anyLong(), any(TimeUnit.class)); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void verifyExecutor() throws Exception { |
|
|
|
|
|
|
|
|
|
verify(executor).submit(argumentCaptor.capture()); |
|
|
|
|
Runnable runnable = argumentCaptor.getValue(); |
|
|
|
|
runnable.run(); |
|
|
|
|
|
|
|
|
|
verify(builder, times(1)).command(eq("push")); |
|
|
|
|
verify(builder, times(1)).argument(eq("--prune")); |
|
|
|
|
verify(builder, times(1)).argument(eq("--atomic")); |
|
|
|
|
verify(builder, times(1)).argument(eq(repository)); |
|
|
|
|
verify(builder, times(1)).argument(eq("--force")); |
|
|
|
|
verify(builder, times(1)).argument(eq("+refs/heads/master:refs/heads/master")); |
|
|
|
|
verify(builder, times(1)).argument(eq("+refs/heads/develop:refs/heads/develop")); |
|
|
|
|
verify(builder, times(1)).argument(eq("+refs/tags/*:refs/tags/*")); |
|
|
|
|
verify(builder, times(1)).argument(eq("+refs/notes/*:refs/notes/*")); |
|
|
|
|
verify(cmd, times(1)).call(); |
|
|
|
|
public void testPostUpdateUnconfigured() { |
|
|
|
|
Repository repo = mock(Repository.class); |
|
|
|
|
when(repo.getScmId()).thenReturn(GitScm.ID); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
Settings settings = mock(Settings.class); |
|
|
|
|
when(settings.asMap()).thenReturn(Collections.emptyMap()); |
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
public void testGetAuthenticatedUrl() throws Exception { |
|
|
|
|
PostRepositoryHookContext context = mock(PostRepositoryHookContext.class); |
|
|
|
|
when(context.getSettings()).thenReturn(settings); |
|
|
|
|
|
|
|
|
|
String result = hook.getAuthenticatedUrl(mirrorRepoUrlHttp, username, password); |
|
|
|
|
assertEquals(repository, result); |
|
|
|
|
hook.postUpdate(context, new RepositoryPushHookRequest.Builder(repo).build()); |
|
|
|
|
|
|
|
|
|
verifyZeroInteractions(bucketedExecutor); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
public void testValidate() throws Exception { |
|
|
|
|
|
|
|
|
|
public void testValidate() { |
|
|
|
|
Settings settings = mock(Settings.class); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<String, Object>(); |
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
map.put(MirrorRepositoryHook.SETTING_MIRROR_REPO_URL + "0", ""); |
|
|
|
|
|
|
|
|
|
when(settings.asMap()).thenReturn(map); |
|
|
|
|
@ -215,15 +155,16 @@ public class MirrorRepositoryHookTest {
|
|
|
|
|
.thenReturn(""); |
|
|
|
|
|
|
|
|
|
Repository repo = mock(Repository.class); |
|
|
|
|
Scope scope = Scopes.repository(repo); |
|
|
|
|
SettingsValidationErrors errors; |
|
|
|
|
|
|
|
|
|
errors = mock(SettingsValidationErrors.class); |
|
|
|
|
hook.validate(settings, errors, repo); |
|
|
|
|
hook.validate(settings, errors, scope); |
|
|
|
|
verify(errors, times(1)).addFormError(anyString()); |
|
|
|
|
verify(errors, never()).addFieldError(anyString(), anyString()); |
|
|
|
|
|
|
|
|
|
errors = mock(SettingsValidationErrors.class); |
|
|
|
|
hook.validate(settings, errors, repo); |
|
|
|
|
hook.validate(settings, errors, scope); |
|
|
|
|
verify(errors, never()).addFormError(anyString()); |
|
|
|
|
verify(errors).addFieldError(eq(MirrorRepositoryHook.SETTING_MIRROR_REPO_URL + "0"), anyString()); |
|
|
|
|
verify(errors, never()).addFieldError(eq(MirrorRepositoryHook.SETTING_USERNAME + "0"), anyString()); |
|
|
|
|
@ -231,54 +172,75 @@ public class MirrorRepositoryHookTest {
|
|
|
|
|
verify(errors).addFieldError(eq(MirrorRepositoryHook.SETTING_REFSPEC + "0"), anyString()); |
|
|
|
|
|
|
|
|
|
errors = mock(SettingsValidationErrors.class); |
|
|
|
|
hook.validate(settings, errors, repo); |
|
|
|
|
hook.validate(settings, errors, scope); |
|
|
|
|
verify(errors, never()).addFormError(anyString()); |
|
|
|
|
verify(errors, never()).addFieldError(eq(MirrorRepositoryHook.SETTING_MIRROR_REPO_URL + "0"), anyString()); |
|
|
|
|
verify(errors).addFieldError(eq(MirrorRepositoryHook.SETTING_USERNAME + "0"), anyString()); |
|
|
|
|
verify(errors).addFieldError(eq(MirrorRepositoryHook.SETTING_PASSWORD + "0"), anyString()); |
|
|
|
|
|
|
|
|
|
errors = mock(SettingsValidationErrors.class); |
|
|
|
|
hook.validate(settings, errors, repo); |
|
|
|
|
hook.validate(settings, errors, scope); |
|
|
|
|
verify(errors, never()).addFormError(anyString()); |
|
|
|
|
verify(errors, never()).addFieldError(eq(MirrorRepositoryHook.SETTING_MIRROR_REPO_URL + "0"), anyString()); |
|
|
|
|
verify(errors, never()).addFieldError(anyString(), anyString()); |
|
|
|
|
|
|
|
|
|
errors = mock(SettingsValidationErrors.class); |
|
|
|
|
hook.validate(settings, errors, repo); |
|
|
|
|
hook.validate(settings, errors, scope); |
|
|
|
|
verify(errors, never()).addFormError(anyString()); |
|
|
|
|
verify(errors).addFieldError(eq(MirrorRepositoryHook.SETTING_MIRROR_REPO_URL + "0"), anyString()); |
|
|
|
|
verify(errors, never()).addFieldError(eq(MirrorRepositoryHook.SETTING_USERNAME + "0"), anyString()); |
|
|
|
|
verify(errors, never()).addFieldError(eq(MirrorRepositoryHook.SETTING_PASSWORD + "0"), anyString()); |
|
|
|
|
|
|
|
|
|
errors = mock(SettingsValidationErrors.class); |
|
|
|
|
hook.validate(settings, errors, repo); |
|
|
|
|
hook.validate(settings, errors, scope); |
|
|
|
|
verify(errors, never()).addFormError(anyString()); |
|
|
|
|
verify(errors, never()).addFieldError(eq(MirrorRepositoryHook.SETTING_MIRROR_REPO_URL + "0"), anyString()); |
|
|
|
|
verify(errors, never()).addFieldError(eq(MirrorRepositoryHook.SETTING_USERNAME + "0"), anyString()); |
|
|
|
|
verify(errors, never()).addFieldError(eq(MirrorRepositoryHook.SETTING_PASSWORD + "0"), anyString()); |
|
|
|
|
|
|
|
|
|
errors = mock(SettingsValidationErrors.class); |
|
|
|
|
hook.validate(settings, errors, repo); |
|
|
|
|
hook.validate(settings, errors, scope); |
|
|
|
|
verify(errors, never()).addFormError(anyString()); |
|
|
|
|
verify(errors, never()).addFieldError(anyString(), anyString()); |
|
|
|
|
|
|
|
|
|
errors = mock(SettingsValidationErrors.class); |
|
|
|
|
hook.validate(settings, errors, repo); |
|
|
|
|
hook.validate(settings, errors, scope); |
|
|
|
|
verify(errors, never()).addFormError(anyString()); |
|
|
|
|
verify(errors, never()).addFieldError(anyString(), anyString()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
public void testValidateForGlobal() { |
|
|
|
|
SettingsValidationErrors errors = mock(SettingsValidationErrors.class); |
|
|
|
|
Settings settings = mock(Settings.class); |
|
|
|
|
|
|
|
|
|
hook.validate(settings, errors, Scopes.global()); |
|
|
|
|
|
|
|
|
|
verifyZeroInteractions(bucketedExecutor, errors, settings); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private RepositoryHookContext buildContext(Repository repo) { |
|
|
|
|
RepositoryHookContext context = mock(RepositoryHookContext.class); |
|
|
|
|
@Test |
|
|
|
|
public void testValidateForProject() { |
|
|
|
|
SettingsValidationErrors errors = mock(SettingsValidationErrors.class); |
|
|
|
|
Project project = mock(Project.class); |
|
|
|
|
Settings settings = mock(Settings.class); |
|
|
|
|
|
|
|
|
|
hook.validate(settings, errors, Scopes.project(project)); |
|
|
|
|
|
|
|
|
|
verifyZeroInteractions(bucketedExecutor, errors, settings); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private PostRepositoryHookContext buildContext() { |
|
|
|
|
Settings settings = defaultSettings(); |
|
|
|
|
|
|
|
|
|
PostRepositoryHookContext context = mock(PostRepositoryHookContext.class); |
|
|
|
|
when(context.getSettings()).thenReturn(settings); |
|
|
|
|
when(context.getRepository()).thenReturn(repo); |
|
|
|
|
|
|
|
|
|
return context; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private Settings defaultSettings() { |
|
|
|
|
Map<String, Object> map = new HashMap<String, Object>(); |
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
map.put(MirrorRepositoryHook.SETTING_MIRROR_REPO_URL, ""); |
|
|
|
|
|
|
|
|
|
Settings settings = mock(Settings.class); |
|
|
|
|
@ -290,6 +252,7 @@ public class MirrorRepositoryHookTest {
|
|
|
|
|
when(settings.getBoolean(eq(MirrorRepositoryHook.SETTING_TAGS), eq(true))).thenReturn(true); |
|
|
|
|
when(settings.getBoolean(eq(MirrorRepositoryHook.SETTING_NOTES), eq(true))).thenReturn(true); |
|
|
|
|
when(settings.getBoolean(eq(MirrorRepositoryHook.SETTING_ATOMIC), eq(true))).thenReturn(true); |
|
|
|
|
|
|
|
|
|
return settings; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
Adrian
6 years ago
committed by
GitHub