Merged branch feature/branches_v2_endpoint

This commit is contained in:
Philipp Czora
2018-08-09 11:53:45 +02:00
83 changed files with 594 additions and 311 deletions

View File

@@ -37,7 +37,7 @@ package sonia.scm.repository;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import sonia.scm.io.DefaultFileSystem;
import sonia.scm.store.ConfigurationStoreFactory;

View File

@@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.Tag;
import sonia.scm.repository.spi.HookChangesetProvider;
@@ -101,4 +101,4 @@ public class HgHookTagProviderTest {
HookChangesetResponse response = new HookChangesetResponse(list);
when(changesetProvider.handleRequest(Mockito.any(HookChangesetRequest.class))).thenReturn(response);
}
}
}

View File

@@ -39,7 +39,7 @@ import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import static org.mockito.Mockito.*;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.repository.RepositoryProvider;
@@ -85,4 +85,4 @@ public class HgPermissionFilterTest {
when(request.getMethod()).thenReturn(method);
return filter.isWriteRequest(request);
}
}
}