elkkhan commented on code in PR #12320: URL: https://github.com/apache/kafka/pull/12320#discussion_r912532683
########## connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/RestClientTest.java: ########## @@ -0,0 +1,128 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.kafka.connect.runtime.rest; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.kafka.connect.runtime.WorkerConfig; +import org.apache.kafka.connect.runtime.rest.entities.ErrorMessage; +import org.apache.kafka.connect.runtime.rest.errors.ConnectRestException; +import org.eclipse.jetty.client.HttpClient; +import org.eclipse.jetty.client.api.ContentResponse; +import org.eclipse.jetty.client.api.Request; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import javax.ws.rs.core.Response; +import java.util.Collections; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeoutException; + +import static org.easymock.EasyMock.anyString; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.niceMock; +import static org.easymock.EasyMock.replay; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class RestClientTest { + + private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); + private static final TypeReference<TestDTO> TEST_TYPE = new TypeReference<TestDTO>() { + }; + private HttpClient httpClient; + + private static String toJsonString(Object obj) { + try { + return OBJECT_MAPPER.writeValueAsString(obj); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + + private static <T> RestClient.HttpResponse<T> httpRequest(HttpClient httpClient, TypeReference<T> typeReference) { + return RestClient.httpRequest( + httpClient, null, null, null, null, typeReference, null, null); + } + + @BeforeEach + public void mockSetup() { + httpClient = niceMock(HttpClient.class); + } + + @Test + public void testSuccess() throws ExecutionException, InterruptedException, TimeoutException { + int statusCode = Response.Status.OK.getStatusCode(); + String expectedResponse = toJsonString(new TestDTO("someContent")); + setupHttpClient(statusCode, expectedResponse); + + RestClient.HttpResponse<TestDTO> httpResp = httpRequest(httpClient, TEST_TYPE); + assertEquals(httpResp.status(), statusCode); + assertEquals(toJsonString(httpResp.body()), expectedResponse); + } + + @Test + public void testNoContent() throws ExecutionException, InterruptedException, TimeoutException { + int statusCode = Response.Status.NO_CONTENT.getStatusCode(); + setupHttpClient(statusCode, null); + + RestClient.HttpResponse<TestDTO> httpResp = httpRequest(httpClient, TEST_TYPE); + assertEquals(httpResp.status(), statusCode); + assertNull(httpResp.body()); + } + + @Test + public void testError() throws ExecutionException, InterruptedException, TimeoutException { Review Comment: I've added tests for the cases you've mentioned. sending the request may trigger 3 different exceptions, so i've put them in a parameterised test, but in junit 4 you can't have a single parameterised test case - the whole class runs once for each parameter. I've used [this](https://stackoverflow.com/a/35057629) approach to isolate that test case, but IMO the test class became a little hard to read. Do you know any better way to isolate that one parameterised test case? I know JUnit5 can do that but it's not in the classpath unfortunately there could also just be 3 separate test cases, but a parameterised test seems like the perfect fit here -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org