Skip to content

Extracted duplicated stubbings in HttpContentServiceImplTest into 2 helpers #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mia-li-001 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Extracted duplicated stubbings in HttpContentServiceImplTest into 2 helpers #291

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/test/java/org/jasig/portlet/proxy/service/web/HttpContentServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ public void setUp() {

@Test
public void testPostFormNoParams() {
when(request.getParameter(HttpContentServiceImpl.IS_FORM_PARAM)).thenReturn("true");
when(request.getParameter(HttpContentServiceImpl.FORM_METHOD_PARAM)).thenReturn("POST");
when(processor.process(any(String.class), any(PortletRequest.class))).thenReturn("http://somewhere.com/path/page.html");
setupSpringELProcessorProcessAndGetParameterStubs2("POST");
HttpContentRequestImpl proxyRequest = new HttpContentRequestImpl(request, processor);

final HttpUriRequest httpRequest = service.getHttpRequest(proxyRequest, request);
Expand All @@ -75,9 +73,7 @@ public void testGetForm() {
params.put("param1", new String[]{"value1"});
params.put("param2", new String[]{"value3", "value4"});

when(request.getParameter(HttpContentServiceImpl.IS_FORM_PARAM)).thenReturn("true");
when(request.getParameter(HttpContentServiceImpl.FORM_METHOD_PARAM)).thenReturn("GET");
when(processor.process(any(String.class), any(PortletRequest.class))).thenReturn("http://somewhere.com/path/page.html");
setupSpringELProcessorProcessAndGetParameterStubs2("GET");
HttpContentRequestImpl proxyRequest = new HttpContentRequestImpl(request, processor);

final HttpUriRequest httpRequest = service.getHttpRequest(proxyRequest, request);
Expand All @@ -88,9 +84,7 @@ public void testGetForm() {

@Test
public void testGetFormNoParams() {
when(request.getParameter(HttpContentServiceImpl.IS_FORM_PARAM)).thenReturn("true");
when(request.getParameter(HttpContentServiceImpl.FORM_METHOD_PARAM)).thenReturn("GET");
when(processor.process(any(String.class), any(PortletRequest.class))).thenReturn("http://somewhere.com/path/page.html");
setupSpringELProcessorProcessAndGetParameterStubs2("GET");
HttpContentRequestImpl proxyRequest = new HttpContentRequestImpl(request, processor);

final HttpUriRequest httpRequest = service.getHttpRequest(proxyRequest, request);
Expand All @@ -103,8 +97,7 @@ public void testGetFormNoParams() {
@Test
public void testNonForm() {

when(request.getParameter(HttpContentServiceImpl.IS_FORM_PARAM)).thenReturn("false");
when(processor.process(any(String.class), any(PortletRequest.class))).thenReturn("http://somewhere.com/path/page.html");
setupSpringELProcessorProcessAndGetParameterStubs("false");
HttpContentRequestImpl proxyRequest = new HttpContentRequestImpl(request, processor);

final HttpUriRequest httpRequest = service.getHttpRequest(proxyRequest, request);
Expand All @@ -113,5 +106,13 @@ public void testNonForm() {

}

private void setupSpringELProcessorProcessAndGetParameterStubs(String getParameterReturnValue) {
when(request.getParameter(HttpContentServiceImpl.IS_FORM_PARAM)).thenReturn(getParameterReturnValue);
when(processor.process(any(String.class), any(PortletRequest.class))).thenReturn("http://somewhere.com/path/page.html");
}

private void setupSpringELProcessorProcessAndGetParameterStubs2(String getParameterReturnValue) {
setupSpringELProcessorProcessAndGetParameterStubs("true");
when(request.getParameter(HttpContentServiceImpl.FORM_METHOD_PARAM)).thenReturn(getParameterReturnValue);
}
}