Resolving conflicts
This commit is contained in:
parent
8a0733f064
commit
3c050f7053
|
@ -49,7 +49,13 @@ public class OkHttpPostingLiveTest {
|
||||||
public void whenSendPostRequestWithAuthorization_thenCorrect() throws IOException {
|
public void whenSendPostRequestWithAuthorization_thenCorrect() throws IOException {
|
||||||
final String postBody = "test post";
|
final String postBody = "test post";
|
||||||
|
|
||||||
final Request request = new Request.Builder().url(URL_SECURED_BY_BASIC_AUTHENTICATION).addHeader("Authorization", Credentials.basic("test", "test")).post(RequestBody.create(MediaType.parse("text/x-markdown; charset=utf-8"), postBody)).build();
|
client = new OkHttpClient();
|
||||||
|
|
||||||
|
final Request request = new Request.Builder()
|
||||||
|
.url(URL_SECURED_BY_BASIC_AUTHENTICATION)
|
||||||
|
.addHeader("Authorization", Credentials.basic("test", "test"))
|
||||||
|
.post(RequestBody.create(MediaType.parse("text/x-markdown; charset=utf-8"), "test post"))
|
||||||
|
.build();
|
||||||
|
|
||||||
final Call call = client.newCall(request);
|
final Call call = client.newCall(request);
|
||||||
final Response response = call.execute();
|
final Response response = call.execute();
|
||||||
|
@ -61,8 +67,9 @@ public class OkHttpPostingLiveTest {
|
||||||
public void whenPostJson_thenCorrect() throws IOException {
|
public void whenPostJson_thenCorrect() throws IOException {
|
||||||
final String json = "{\"id\":1,\"name\":\"John\"}";
|
final String json = "{\"id\":1,\"name\":\"John\"}";
|
||||||
|
|
||||||
final RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
|
client = new OkHttpClient();
|
||||||
|
|
||||||
|
final RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), "{\"id\":1,\"name\":\"John\"}");
|
||||||
final Request request = new Request.Builder().url(BASE_URL + "/users/detail").post(body).build();
|
final Request request = new Request.Builder().url(BASE_URL + "/users/detail").post(body).build();
|
||||||
|
|
||||||
final Call call = client.newCall(request);
|
final Call call = client.newCall(request);
|
||||||
|
|
Loading…
Reference in New Issue