fixed broken tests

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

@@ -1,6 +1,7 @@
 package sonia.scm.web.protocol;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -11,6 +12,7 @@ import sonia.scm.PushStateDispatcher;
 import sonia.scm.repository.DefaultRepositoryProvider;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
+import sonia.scm.repository.RepositoryTestData;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.repository.spi.HttpScmProtocol;
@@ -21,18 +23,23 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Optional;
 
-import static org.mockito.AdditionalMatchers.not;
+import static org.mockito.Mockito.verify;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
 class HttpProtocolServletTest {
 
   @Mock
   private RepositoryServiceFactory serviceFactory;
+
+  @Mock
+  private NamespaceAndNameFromPathExtractor extractor;
+
   @Mock
   private PushStateDispatcher dispatcher;
+
   @Mock
   private UserAgentParser userAgentParser;
 
@@ -41,23 +48,27 @@ class HttpProtocolServletTest {
 
   @Mock
   private RepositoryService repositoryService;
+
   @Mock
   private UserAgent userAgent;
 
   @Mock
   private HttpServletRequest request;
+
   @Mock
   private HttpServletResponse response;
+
   @Mock
   private HttpScmProtocol protocol;
 
+  @Nested
+  class Browser {
+
     @BeforeEach
-  void init() {
+    void prepareMocks() {
       when(userAgentParser.parse(request)).thenReturn(userAgent);
-    when(userAgent.isBrowser()).thenReturn(false);
+      when(userAgent.isBrowser()).thenReturn(true);
-    NamespaceAndName existingRepo = new NamespaceAndName("space", "repo");
+      when(request.getRequestURI()).thenReturn("uri");
-    when(serviceFactory.create(not(eq(existingRepo)))).thenThrow(new NotFoundException("Test", "a"));
-    when(serviceFactory.create(existingRepo)).thenReturn(repositoryService);
     }
 
     @Test
@@ -70,6 +81,17 @@ class HttpProtocolServletTest {
       verify(dispatcher).dispatch(request, response, "uri");
     }
 
+  }
+
+  @Nested
+  class ScmClient {
+
+    @BeforeEach
+    void prepareMocks() {
+      when(userAgentParser.parse(request)).thenReturn(userAgent);
+      when(userAgent.isBrowser()).thenReturn(false);
+    }
+
     @Test
     void shouldHandleBadPaths() throws IOException, ServletException {
       when(request.getPathInfo()).thenReturn("/illegal");
@@ -83,6 +105,10 @@ class HttpProtocolServletTest {
     void shouldHandleNotExistingRepository() throws IOException, ServletException {
       when(request.getPathInfo()).thenReturn("/not/exists");
 
+      NamespaceAndName repo = new NamespaceAndName("not", "exists");
+      when(extractor.fromUri("/not/exists")).thenReturn(Optional.of(repo));
+      when(serviceFactory.create(repo)).thenThrow(new NotFoundException("Test", "a"));
+
       servlet.service(request, response);
 
       verify(response).setStatus(404);
@@ -90,10 +116,12 @@ class HttpProtocolServletTest {
 
     @Test
     void shouldDelegateToProvider() throws IOException, ServletException {
+      NamespaceAndName repo = new NamespaceAndName("space", "name");
+      when(extractor.fromUri("/space/name")).thenReturn(Optional.of(repo));
+      when(serviceFactory.create(repo)).thenReturn(repositoryService);
+
       when(request.getPathInfo()).thenReturn("/space/name");
-    NamespaceAndName namespaceAndName = new NamespaceAndName("space", "name");
+      Repository repository = RepositoryTestData.createHeartOfGold();
-    doReturn(repositoryService).when(serviceFactory).create(namespaceAndName);
-    Repository repository = new Repository();
       when(repositoryService.getRepository()).thenReturn(repository);
       when(repositoryService.getProtocol(HttpScmProtocol.class)).thenReturn(protocol);
 
@@ -103,4 +131,6 @@ class HttpProtocolServletTest {
       verify(protocol).serve(request, response, null);
       verify(repositoryService).close();
     }
+
+  }
 }