Skip to content

Add abstract client tests #246

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

Merged
pavolloffay merged 7 commits into from
Feb 3, 2021
Merged

Add abstract client tests #246

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f84f83d
adding AbstractHttpClientTest and an echo target in TestHttpServer
shashank11p Jan 29, 2021
029e2dd
updating AbstractHttpClientTest
shashank11p Feb 1, 2021
d775706
updating AbstractHttpClientTest
shashank11p Feb 1, 2021
b7190b2
updating okHttp and apache http client tests
shashank11p Feb 2, 2021
7cbcb85
review comments, refactoring
shashank11p Feb 2, 2021
a405879
review comments and removing apache async http client changes
shashank11p Feb 2, 2021
e163156
review comments
shashank11p Feb 3, 2021
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
Prev Previous commit
Next Next commit
updating AbstractHttpClientTest
  • Loading branch information
@shashank11p
shashank11p committed Feb 1, 2021
commit 029e2dd1303f5d0d1b108a5336be75b9430f1d33
110 changes: 77 additions & 33 deletions testing-common/src/main/java/org/hypertrace/agent/testing/AbstractHttpClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,18 @@
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeoutException;

public abstract class AbstractHttpClientTest extends AbstractInstrumenterTest {

protected static final TestHttpServer testHttpServer = new TestHttpServer();

public static final String GET_NO_CONTENT_PATH = "http://localhost:%d/get_no_content";

public static final String GET_JSON_PATH = "http://localhost:%d/get_json";

public static final String POST_PATH = "http://localhost:%d/post";

public static final String POST_REDIRECT_PATH =
"http://localhost:%d/post_redirect_to_get_no_content";

public static final String ECHO_PATH = "http://localhost:%d/echo";
Comment thread
shashank11p marked this conversation as resolved.
Outdated

@BeforeAll
Expand All @@ -48,19 +46,75 @@ public static void closeServer() throws Exception {
}

/**
* Test for post request with json body. Use ECHO_PATH as url string
* Make request using client and return response status code
* @param uri URI to send request to
* @param headers Request headers
* @param body Request body if applicable on given method
* @param contentType Content-type of request body
* @return status code of response
*/
public abstract void echoJson() throws Exception;
public abstract int doPostRequest(String uri, Map<String, String> headers, String body, String contentType) throws IOException;
Comment thread
shashank11p marked this conversation as resolved.
Outdated

/**
* Test for post request with url encoded form body. Use ECHO_PATH as url string
*/
public abstract void echoUrlEncoded() throws Exception;
@Test
public void echoJson() throws TimeoutException, InterruptedException, IOException {
String body = "{\"foo\": \"bar\"}";
Map<String, String> headers = new HashMap<>();
headers.put("headerName", "headerValue");
Comment thread
shashank11p marked this conversation as resolved.
Outdated
String uri = String.format(ECHO_PATH, testHttpServer.port());

int status = doPostRequest(uri, headers, body, "application/json");

Assertions.assertEquals(200, status);

TEST_WRITER.waitForTraces(1);
List<List<SpanData>> traces = TEST_WRITER.getTraces();
Assertions.assertEquals(1, traces.size());
Assertions.assertEquals(1, traces.get(0).size());
SpanData clientSpan = traces.get(0).get(0);

assertEchoJson(clientSpan, body);
}

@Test
public void echoUrlEncoded() throws TimeoutException, InterruptedException, IOException {
String body = "key1=value1&key2=value2";
Map<String, String> headers = new HashMap<>();
headers.put("headerName", "headerValue");
String uri = String.format(ECHO_PATH, testHttpServer.port());

int status = doPostRequest(uri, headers, body, "application/x-www-form-urlencoded");

Assertions.assertEquals(200, status);

TEST_WRITER.waitForTraces(1);
List<List<SpanData>> traces = TEST_WRITER.getTraces();
Assertions.assertEquals(1, traces.size());
Assertions.assertEquals(1, traces.get(0).size());
SpanData clientSpan = traces.get(0).get(0);

assertEchoUrlEncoded(clientSpan, body);
}

@Test
public void echoPlainText() throws TimeoutException, InterruptedException, IOException {
String body = "foobar";
Map<String, String> headers = new HashMap<>();
headers.put("headerName", "headerValue");
String uri = String.format(ECHO_PATH, testHttpServer.port());

int status = doPostRequest(uri, headers, body, "text/plain");

Assertions.assertEquals(200, status);

TEST_WRITER.waitForTraces(1);
List<List<SpanData>> traces = TEST_WRITER.getTraces();
Assertions.assertEquals(1, traces.size());
Assertions.assertEquals(1, traces.get(0).size());
SpanData clientSpan = traces.get(0).get(0);

assertEchoPlainText(clientSpan);
}

Comment thread
shashank11p marked this conversation as resolved.
/**
* Test for post request with plain text body. Use ECHO_PATH as url string
*/
public abstract void echoPlainText() throws Exception;

public void assertResponseHeaders(SpanData spanData) {
Comment thread
shashank11p marked this conversation as resolved.
Outdated
Assertions.assertEquals(
Expand All @@ -72,26 +126,16 @@ public void assertResponseHeaders(SpanData spanData) {
TestHttpServer.RESPONSE_HEADER_NAME)));
}

public void assertGetJsonResponseBody(SpanData spanData) {
Assertions.assertEquals(
TestHttpServer.GetJsonHandler.RESPONSE_BODY,
spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY));
}

public void assertEchoJson(SpanData spanData) {
public void assertEchoJson(SpanData spanData, String requestBody) {
assertResponseHeaders(spanData);
Assertions.assertNotNull(spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY));
Assertions.assertEquals(requestBody, spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_REQUEST_BODY));
Assertions.assertEquals(
Comment thread
shashank11p marked this conversation as resolved.
spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY),
spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_REQUEST_BODY));
}

public void assertEchoUrlEncoded(SpanData spanData) {
assertResponseHeaders(spanData);
Assertions.assertNotNull(spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY));
Assertions.assertEquals(
spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY),
spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_REQUEST_BODY));
public void assertEchoUrlEncoded(SpanData spanData, String requestBody) {
assertEchoJson(spanData, requestBody);
}

public void assertEchoPlainText(SpanData spanData) {
Comment thread
shashank11p marked this conversation as resolved.
Outdated
Expand Down