Skip to content

Commit

Permalink
Upgrading Wilma to use browsermob-proxy-for-wilma 1.2 version. The in…
Browse files Browse the repository at this point in the history 
…terface of the proxy was changed and the possibility of optimizing the proxy code further was opened. See #14 and #59, those become available in Wilma with this upgrade.
  • Loading branch information
@tkohegyi
tkohegyi committed Oct 5, 2015
1 parent b5b0f76 commit 4bfb074
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 55 deletions.
3 changes: 1 addition & 2 deletions wilma-application/modules/wilma-browsermob-integration/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ dependencies {
compile project(':wilma-application:wilma-core')
compile project(':wilma-application:wilma-properties')

// compile ("com.epam.wilma:browsermob-proxy:2.0-beta-8-wilma-$version"){
compile ('com.epam.wilma:browsermob-proxy:2.0-beta-8-wilma-1.1.32'){
compile ('com.epam.wilma:browsermob-proxy:2.0-beta-8-wilma-1.2.44'){
// compile ('com.epam.wilma:browsermob-proxy:2.0-beta-8-wilma-1.2.DEV'){
exclude (module:'slf4j-jdk14')
exclude (module:'commons-logging')
Expand Down
10 changes: 3 additions & 7 deletions ...egration/src/main/java/com/epam/wilma/browsermob/transformer/HttpResponseTransformer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import com.epam.wilma.browsermob.transformer.helper.WilmaResponseFactory;
import com.epam.wilma.domain.http.WilmaHttpResponse;
import net.lightbody.bmp.core.har.HarNameValuePair;
import net.lightbody.bmp.proxy.http.BrowserMobHttpResponse;
import org.apache.http.Header;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -49,15 +48,12 @@ public WilmaHttpResponse transformResponse(final BrowserMobHttpResponse response
}
}

for (HarNameValuePair header : response.getEntry().getRequest().getHeaders()) {
// for (Header header : response.getRequestHeaders()) {
for (Header header : response.getRequestHeaders()) {
result.addRequestHeader(header.getName(), header.getValue());
}

String body = response.getEntry().getResponse().getContent().getText();
// String body = response.getBody();
int status = response.getEntry().getResponse().getStatus();
// int status = response.getStatus();
String body = response.getBody();
int status = response.getStatus();
result.setBody(body);
result.setContentType(response.getContentType());
result.setStatusCode(status);
Expand Down
67 changes: 21 additions & 46 deletions ...tion/src/test/java/com/epam/wilma/browsermob/transformer/HttpResponseTransformerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import com.epam.wilma.browsermob.transformer.helper.WilmaResponseFactory;
import com.epam.wilma.domain.http.WilmaHttpResponse;
import net.lightbody.bmp.core.har.HarNameValuePair;
import net.lightbody.bmp.proxy.http.BrowserMobHttpResponse;
import org.apache.http.Header;
import org.apache.http.message.BasicHeader;
Expand All @@ -31,9 +30,6 @@
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

import java.util.ArrayList;
import java.util.List;

import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
Expand All @@ -48,8 +44,7 @@ public class HttpResponseTransformerTest {
private static final String RESPONSE_BODY = "response";
private static final String CONTENT_TYPE = "application/xml";
private Header[] responseHeaders;
//private Header[] requestHeaders;
private List<HarNameValuePair> requestHeaders;
private Header[] requestHeaders;

@Mock
private WilmaHttpResponse response;
Expand All @@ -65,24 +60,19 @@ public class HttpResponseTransformerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
given(responseFactory.createNewWilmaHttpResponse()).willReturn(response);
//requestHeaders = new Header[1];
requestHeaders = new ArrayList<>();
requestHeaders = new Header[1];
responseHeaders = new Header[1];
//requestHeaders[0] = new BasicHeader("reqName", "reqValue");
requestHeaders.add(new HarNameValuePair("reqName", "reqValue"));
requestHeaders[0] = new BasicHeader("reqName", "reqValue");
responseHeaders[0] = new BasicHeader("respName", "respValue");
}

@Test
public void testTransformShouldSetRequestHeader() {
//GIVEN
given(browserMobHttpResponse.getRawResponse().getAllHeaders()).willReturn(responseHeaders);
//given(browserMobHttpResponse.getRequestHeaders()).willReturn(requestHeaders);
given(browserMobHttpResponse.getEntry().getRequest().getHeaders()).willReturn(requestHeaders);
//given(browserMobHttpResponse.getBody()).willReturn(RESPONSE_BODY);
given(browserMobHttpResponse.getEntry().getResponse().getContent().getText()).willReturn(RESPONSE_BODY);
//given(browserMobHttpResponse.getStatus()).willReturn(200);
given(browserMobHttpResponse.getEntry().getResponse().getStatus()).willReturn(200);
given(browserMobHttpResponse.getRequestHeaders()).willReturn(requestHeaders);
given(browserMobHttpResponse.getBody()).willReturn(RESPONSE_BODY);
given(browserMobHttpResponse.getStatus()).willReturn(200);

//WHEN
underTest.transformResponse(browserMobHttpResponse);
Expand All @@ -93,12 +83,9 @@ public void testTransformShouldSetRequestHeader() {
@Test
public void testTransformShouldSetResponseHeader() {
given(browserMobHttpResponse.getRawResponse().getAllHeaders()).willReturn(responseHeaders);
//given(browserMobHttpResponse.getRequestHeaders()).willReturn(requestHeaders);
given(browserMobHttpResponse.getEntry().getRequest().getHeaders()).willReturn(requestHeaders);
//given(browserMobHttpResponse.getBody()).willReturn(RESPONSE_BODY);
given(browserMobHttpResponse.getEntry().getResponse().getContent().getText()).willReturn(RESPONSE_BODY);
//given(browserMobHttpResponse.getStatus()).willReturn(200);
given(browserMobHttpResponse.getEntry().getResponse().getStatus()).willReturn(200);
given(browserMobHttpResponse.getRequestHeaders()).willReturn(requestHeaders);
given(browserMobHttpResponse.getBody()).willReturn(RESPONSE_BODY);
given(browserMobHttpResponse.getStatus()).willReturn(200);
//WHEN
underTest.transformResponse(browserMobHttpResponse);
//THEN
Expand All @@ -108,12 +95,9 @@ public void testTransformShouldSetResponseHeader() {
@Test
public void testTransformShouldNotSetResponseHeaderWhenRawResponseIsNull() {
given(browserMobHttpResponse.getRawResponse()).willReturn(null);
//given(browserMobHttpResponse.getRequestHeaders()).willReturn(requestHeaders);
given(browserMobHttpResponse.getEntry().getRequest().getHeaders()).willReturn(requestHeaders);
//given(browserMobHttpResponse.getBody()).willReturn(RESPONSE_BODY);
given(browserMobHttpResponse.getEntry().getResponse().getContent().getText()).willReturn(RESPONSE_BODY);
//given(browserMobHttpResponse.getStatus()).willReturn(200);
given(browserMobHttpResponse.getEntry().getResponse().getStatus()).willReturn(200);
given(browserMobHttpResponse.getRequestHeaders()).willReturn(requestHeaders);
given(browserMobHttpResponse.getBody()).willReturn(RESPONSE_BODY);
given(browserMobHttpResponse.getStatus()).willReturn(200);
//WHEN
underTest.transformResponse(browserMobHttpResponse);
//THEN
Expand All @@ -123,12 +107,9 @@ public void testTransformShouldNotSetResponseHeaderWhenRawResponseIsNull() {
@Test
public void testTransformShouldSetBody() {
given(browserMobHttpResponse.getRawResponse().getAllHeaders()).willReturn(responseHeaders);
//given(browserMobHttpResponse.getRequestHeaders()).willReturn(requestHeaders);
given(browserMobHttpResponse.getEntry().getRequest().getHeaders()).willReturn(requestHeaders);
//given(browserMobHttpResponse.getBody()).willReturn(RESPONSE_BODY);
given(browserMobHttpResponse.getEntry().getResponse().getContent().getText()).willReturn(RESPONSE_BODY);
//given(browserMobHttpResponse.getStatus()).willReturn(200);
given(browserMobHttpResponse.getEntry().getResponse().getStatus()).willReturn(200);
given(browserMobHttpResponse.getRequestHeaders()).willReturn(requestHeaders);
given(browserMobHttpResponse.getBody()).willReturn(RESPONSE_BODY);
given(browserMobHttpResponse.getStatus()).willReturn(200);
//WHEN
underTest.transformResponse(browserMobHttpResponse);
//THEN
Expand All @@ -138,12 +119,9 @@ public void testTransformShouldSetBody() {
@Test
public void testTransformShouldSetContentType() {
given(browserMobHttpResponse.getRawResponse().getAllHeaders()).willReturn(responseHeaders);
//given(browserMobHttpResponse.getRequestHeaders()).willReturn(requestHeaders);
given(browserMobHttpResponse.getEntry().getRequest().getHeaders()).willReturn(requestHeaders);
//given(browserMobHttpResponse.getBody()).willReturn(RESPONSE_BODY);
given(browserMobHttpResponse.getEntry().getResponse().getContent().getText()).willReturn(RESPONSE_BODY);
//given(browserMobHttpResponse.getStatus()).willReturn(200);
given(browserMobHttpResponse.getEntry().getResponse().getStatus()).willReturn(200);
given(browserMobHttpResponse.getRequestHeaders()).willReturn(requestHeaders);
given(browserMobHttpResponse.getBody()).willReturn(RESPONSE_BODY);
given(browserMobHttpResponse.getStatus()).willReturn(200);
given(browserMobHttpResponse.getContentType()).willReturn(CONTENT_TYPE);
//WHEN
underTest.transformResponse(browserMobHttpResponse);
Expand All @@ -154,12 +132,9 @@ public void testTransformShouldSetContentType() {
@Test
public void testTransformShouldSetStatusCode() {
given(browserMobHttpResponse.getRawResponse().getAllHeaders()).willReturn(responseHeaders);
//given(browserMobHttpResponse.getRequestHeaders()).willReturn(requestHeaders);
given(browserMobHttpResponse.getEntry().getRequest().getHeaders()).willReturn(requestHeaders);
//given(browserMobHttpResponse.getBody()).willReturn(RESPONSE_BODY);
given(browserMobHttpResponse.getEntry().getResponse().getContent().getText()).willReturn(RESPONSE_BODY);
//given(browserMobHttpResponse.getStatus()).willReturn(200);
given(browserMobHttpResponse.getEntry().getResponse().getStatus()).willReturn(200);
given(browserMobHttpResponse.getRequestHeaders()).willReturn(requestHeaders);
given(browserMobHttpResponse.getBody()).willReturn(RESPONSE_BODY);
given(browserMobHttpResponse.getStatus()).willReturn(200);
//WHEN
underTest.transformResponse(browserMobHttpResponse);
//THEN
Expand Down

0 comments on commit 4bfb074

Please sign in to comment.