mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-17 02:31:14 +01:00
added PushStateDispatcher for production and development to WebResourceServlet
This commit is contained in:
Sebastian Sdorra
@@ -0,0 +1,51 @@
|
||||
package sonia.scm;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
import javax.servlet.RequestDispatcher;
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import static org.mockito.Mockito.doThrow;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class ForwardingPushStateDispatcherTest {
|
||||
|
||||
@Mock
|
||||
private HttpServletRequest request;
|
||||
|
||||
@Mock
|
||||
private RequestDispatcher requestDispatcher;
|
||||
|
||||
@Mock
|
||||
private HttpServletResponse response;
|
||||
|
||||
private ForwardingPushStateDispatcher dispatcher = new ForwardingPushStateDispatcher();
|
||||
|
||||
@Test
|
||||
public void testDispatch() throws ServletException, IOException {
|
||||
when(request.getRequestDispatcher("/index.html")).thenReturn(requestDispatcher);
|
||||
|
||||
dispatcher.dispatch(request, response, "/something");
|
||||
|
||||
verify(requestDispatcher).forward(request, response);
|
||||
}
|
||||
|
||||
@Test(expected = IOException.class)
|
||||
public void testWrapServletException() throws ServletException, IOException {
|
||||
when(request.getRequestDispatcher("/index.html")).thenReturn(requestDispatcher);
|
||||
doThrow(ServletException.class).when(requestDispatcher).forward(request, response);
|
||||
|
||||
dispatcher.dispatch(request, response, "/something");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,139 @@
|
||||
package sonia.scm;
|
||||
|
||||
import com.google.common.base.Charsets;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Lists;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
import javax.servlet.ServletInputStream;
|
||||
import javax.servlet.ServletOutputStream;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.util.*;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class ProxyPushStateDispatcherTest {
|
||||
|
||||
private ProxyPushStateDispatcher dispatcher;
|
||||
|
||||
@Mock
|
||||
private HttpServletRequest request;
|
||||
|
||||
@Mock
|
||||
private HttpServletResponse response;
|
||||
|
||||
@Mock
|
||||
private HttpURLConnection connection;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
dispatcher = new ProxyPushStateDispatcher("http://hitchhiker.com", url -> connection);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWithGetRequest() 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
|
||||
when(connection.getInputStream()).thenReturn(new ByteArrayInputStream("hitchhicker".getBytes(Charsets.UTF_8)));
|
||||
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);
|
||||
|
||||
// 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(200);
|
||||
verify(response).addHeader("Content-Type", "application/yaml");
|
||||
assertEquals("hitchhicker", output.stream.toString());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWithPOSTRequest() throws IOException {
|
||||
// configure request mock
|
||||
when(request.getMethod()).thenReturn("POST");
|
||||
when(request.getHeaderNames()).thenReturn(toEnum());
|
||||
when(request.getInputStream()).thenReturn(new DevServletInputStream("hitchhiker"));
|
||||
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);
|
||||
|
||||
dispatcher.dispatch(request, response, "/people/trillian");
|
||||
|
||||
// verify connection
|
||||
verify(connection).setRequestMethod("POST");
|
||||
assertEquals("hitchhiker", output.toString());
|
||||
|
||||
// verify response
|
||||
verify(response).setStatus(204);
|
||||
}
|
||||
|
||||
private Enumeration<String> toEnum(String... values) {
|
||||
Set<String> set = ImmutableSet.copyOf(values);
|
||||
return toEnum(set);
|
||||
}
|
||||
|
||||
private <T> Enumeration<T> toEnum(Collection<T> collection) {
|
||||
return new Vector<>(collection).elements();
|
||||
}
|
||||
|
||||
private class DevServletInputStream extends ServletInputStream {
|
||||
|
||||
private InputStream inputStream;
|
||||
|
||||
private DevServletInputStream(String content) {
|
||||
inputStream = new ByteArrayInputStream(content.getBytes(Charsets.UTF_8));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int read() throws IOException {
|
||||
return inputStream.read();
|
||||
}
|
||||
}
|
||||
|
||||
private class DevServletOutputStream extends ServletOutputStream {
|
||||
|
||||
private ByteArrayOutputStream stream = new ByteArrayOutputStream();
|
||||
|
||||
@Override
|
||||
public void write(int b) {
|
||||
stream.write(b);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package sonia.scm;
|
||||
|
||||
import org.assertj.core.api.Assertions;
|
||||
import org.junit.After;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
public class PushStateDispatcherProviderTest {
|
||||
|
||||
private PushStateDispatcherProvider provider = new PushStateDispatcherProvider();
|
||||
|
||||
@Test
|
||||
public void testGetProxyPushStateWithPropertySet() {
|
||||
System.setProperty(PushStateDispatcherProvider.PROPERTY_TARGET, "http://localhost:9966");
|
||||
PushStateDispatcher dispatcher = provider.get();
|
||||
Assertions.assertThat(dispatcher).isInstanceOf(ProxyPushStateDispatcher.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetProxyPushStateWithoutProperty() {
|
||||
PushStateDispatcher dispatcher = provider.get();
|
||||
Assertions.assertThat(dispatcher).isInstanceOf(ForwardingPushStateDispatcher.class);
|
||||
}
|
||||
|
||||
@After
|
||||
public void cleanupSystemProperty() {
|
||||
System.clearProperty(PushStateDispatcherProvider.PROPERTY_TARGET);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -40,13 +40,16 @@ public class WebResourceServletTest {
|
||||
@Mock
|
||||
private UberWebResourceLoader webResourceLoader;
|
||||
|
||||
@Mock
|
||||
private PushStateDispatcher pushStateDispatcher;
|
||||
|
||||
private WebResourceServlet servlet;
|
||||
|
||||
@Before
|
||||
public void setUpMocks() {
|
||||
when(pluginLoader.getUberWebResourceLoader()).thenReturn(webResourceLoader);
|
||||
when(request.getContextPath()).thenReturn("/scm");
|
||||
servlet = new WebResourceServlet(pluginLoader);
|
||||
servlet = new WebResourceServlet(pluginLoader, pushStateDispatcher);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -57,17 +60,17 @@ public class WebResourceServletTest {
|
||||
assertFalse("/api/v2/repositories".matches(WebResourceServlet.PATTERN));
|
||||
|
||||
// exclude old style ui template servlets
|
||||
assertFalse("/".matches(WebResourceServlet.PATTERN));
|
||||
assertFalse("/index.html".matches(WebResourceServlet.PATTERN));
|
||||
assertFalse("/error.html".matches(WebResourceServlet.PATTERN));
|
||||
assertFalse("/plugins/resources/js/sonia/scm/hg.config-wizard.js".matches(WebResourceServlet.PATTERN));
|
||||
assertTrue("/".matches(WebResourceServlet.PATTERN));
|
||||
assertTrue("/index.html".matches(WebResourceServlet.PATTERN));
|
||||
assertTrue("/error.html".matches(WebResourceServlet.PATTERN));
|
||||
assertTrue("/plugins/resources/js/sonia/scm/hg.config-wizard.js".matches(WebResourceServlet.PATTERN));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDoGetWithNonExistingResource() {
|
||||
public void testDoGetWithNonExistingResource() throws IOException {
|
||||
when(request.getRequestURI()).thenReturn("/scm/awesome.jpg");
|
||||
servlet.doGet(request, response);
|
||||
verify(response).setStatus(HttpServletResponse.SC_NOT_FOUND);
|
||||
verify(pushStateDispatcher).dispatch(request, response, "/awesome.jpg");
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user