Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 02:31:14 +01:00
Code Issues Packages Projects Releases Activity

fix timeout for 404 proxy resources

Browse Source
This commit is contained in:
Sebastian Sdorra
2018-08-29 09:56:33 +02:00
parent 5ae8494e94
commit c05e45271f
2 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
scm-webapp/src/test/java/sonia/scm/ProxyPushStateDispatcherTest.java
View File

@@ -51,11 +51,15 @@ public class ProxyPushStateDispatcherTest {
when(request.getHeaders("Content-Type")).thenReturn(toEnum("application/json"));
// configure proxy url connection mock
when(connection.getInputStream()).thenReturn(new ByteArrayInputStream("hitchhicker".getBytes(Charsets.UTF_8)));
byte[] data = "hitchhicker".getBytes(Charsets.UTF_8);
when(connection.getErrorStream()).thenReturn(null);
when(connection.getInputStream()).thenReturn(new ByteArrayInputStream(data));
Map<String, List<String>> headerFields = new HashMap<>();
headerFields.put("Content-Type", Lists.newArrayList("application/yaml"));
when(connection.getHeaderFields()).thenReturn(headerFields);
when(connection.getResponseCode()).thenReturn(200);
when(connection.getContentLength()).thenReturn(data.length);
// configure response mock
DevServletOutputStream output = new DevServletOutputStream();
@@ -70,6 +74,41 @@ public class ProxyPushStateDispatcherTest {
// verify response
verify(response).setStatus(200);
verify(response).addHeader("Content-Type", "application/yaml");
assertEquals("hitchhicker", output.stream.toString());
}
@Test
public void testGetNotFound() throws IOException {
// configure request mock
when(request.getMethod()).thenReturn("GET");
when(request.getHeaderNames()).thenReturn(toEnum("Content-Type"));
when(request.getHeaders("Content-Type")).thenReturn(toEnum("application/json"));
// configure proxy url connection mock
byte[] data = "hitchhicker".getBytes(Charsets.UTF_8);
when(connection.getErrorStream()).thenReturn(new ByteArrayInputStream(data));
Map<String, List<String>> headerFields = new HashMap<>();
headerFields.put("Content-Type", Lists.newArrayList("application/yaml"));
when(connection.getHeaderFields()).thenReturn(headerFields);
when(connection.getResponseCode()).thenReturn(404);
when(connection.getContentLength()).thenReturn(data.length);
// configure response mock
DevServletOutputStream output = new DevServletOutputStream();
when(response.getOutputStream()).thenReturn(output);
dispatcher.dispatch(request, response, "/people/trillian");
// verify connection
verify(connection).setRequestMethod("GET");
verify(connection).setRequestProperty("Content-Type", "application/json");
// verify response
verify(response).setStatus(404);
verify(response).addHeader("Content-Type", "application/yaml");
assertEquals("hitchhicker", output.stream.toString());
}
@@ -82,14 +121,10 @@ public class ProxyPushStateDispatcherTest {
when(request.getContentLength()).thenReturn(1);
// configure proxy url connection mock
when(connection.getInputStream()).thenReturn(new ByteArrayInputStream(new byte[0]));
Map<String, List<String>> headerFields = new HashMap<>();
when(connection.getHeaderFields()).thenReturn(headerFields);
when(connection.getResponseCode()).thenReturn(204);
// configure response mock
when(response.getOutputStream()).thenReturn(new DevServletOutputStream());
ByteArrayOutputStream output = new ByteArrayOutputStream();
when(connection.getOutputStream()).thenReturn(output);