Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-23 06:50:49 +01:00
Code Issues Packages Projects Releases Activity

Incorporate peer review

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-17 17:49:08 +02:00
parent 37ce4fbabe
commit babea160c3
12 changed files with 58 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scm-webapp/src/test/java/sonia/scm/web/protocol/HttpProtocolServletTest.java
View File

@@ -20,20 +20,16 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Optional;
import static java.util.Optional.of;
import static org.mockito.AdditionalMatchers.not;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks;
public class HttpProtocolServletTest {
private static final NamespaceAndName EXISTING_REPO = new NamespaceAndName("space", "repo");
@Mock
private RepositoryServiceFactory serviceFactory;
@@ -44,8 +40,6 @@ public class HttpProtocolServletTest {
@Mock
private UserAgentParser userAgentParser;
@Mock
private NamespaceAndNameFromPathExtractor namespaceAndNameFromPathExtractor;
@Mock
private Provider<HttpServletRequest> requestProvider;
@InjectMocks
@@ -68,8 +62,9 @@ public class HttpProtocolServletTest {
initMocks(this);
when(userAgentParser.parse(request)).thenReturn(userAgent);
when(userAgent.isBrowser()).thenReturn(false);
when(serviceFactory.create(not(eq(EXISTING_REPO)))).thenThrow(RepositoryNotFoundException.class);
when(serviceFactory.create(EXISTING_REPO)).thenReturn(repositoryService);
NamespaceAndName existingRepo = new NamespaceAndName("space", "repo");
when(serviceFactory.create(not(eq(existingRepo)))).thenThrow(RepositoryNotFoundException.class);
when(serviceFactory.create(existingRepo)).thenReturn(repositoryService);
when(requestProvider.get()).thenReturn(httpServletRequest);
}
@@ -85,8 +80,7 @@ public class HttpProtocolServletTest {
@Test
public void shouldHandleBadPaths() throws IOException, ServletException {
when(request.getPathInfo()).thenReturn("/space/name");
when(namespaceAndNameFromPathExtractor.fromUri("/space/name")).thenReturn(Optional.empty());
when(request.getPathInfo()).thenReturn("/illegal");
servlet.service(request, response);
@@ -94,11 +88,8 @@ public class HttpProtocolServletTest {
}
@Test
public void shouldHandleNotExistingRepository() throws RepositoryNotFoundException, IOException, ServletException {
when(request.getPathInfo()).thenReturn("/space/name");
NamespaceAndName namespaceAndName = new NamespaceAndName("space", "name");
when(namespaceAndNameFromPathExtractor.fromUri("/space/name")).thenReturn(of(namespaceAndName));
doThrow(new RepositoryNotFoundException(namespaceAndName)).when(serviceFactory).create(namespaceAndName);
public void shouldHandleNotExistingRepository() throws IOException, ServletException {
when(request.getPathInfo()).thenReturn("/not/exists");
servlet.service(request, response);
@@ -109,7 +100,6 @@ public class HttpProtocolServletTest {
public void shouldDelegateToProvider() throws RepositoryNotFoundException, IOException, ServletException {
when(request.getPathInfo()).thenReturn("/space/name");
NamespaceAndName namespaceAndName = new NamespaceAndName("space", "name");
when(namespaceAndNameFromPathExtractor.fromUri("/space/name")).thenReturn(of(namespaceAndName));
doReturn(repositoryService).when(serviceFactory).create(namespaceAndName);
Repository repository = new Repository();
when(repositoryService.getRepository()).thenReturn(repository);