Skip to content

Commit 15aa77d

Browse files
committed
Fix test
1 parent 51f8d8c commit 15aa77d

1 file changed

Lines changed: 42 additions & 24 deletions

File tree

datamodel/odata-client/src/test/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataHealthyResponseValidatorTest.java

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,55 @@
22

33
import static org.assertj.core.api.Assertions.assertThat;
44
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
5-
import static org.mockito.Mockito.lenient;
6-
import static org.mockito.Mockito.mock;
7-
import static org.mockito.Mockito.when;
85

96
import java.nio.charset.StandardCharsets;
107

11-
import org.apache.http.Header;
128
import org.apache.http.HttpResponse;
139
import org.apache.http.HttpStatus;
14-
import org.apache.http.StatusLine;
10+
import org.apache.http.HttpVersion;
1511
import org.apache.http.entity.StringEntity;
16-
import org.junit.jupiter.api.BeforeEach;
12+
import org.apache.http.message.BasicHttpResponse;
1713
import org.junit.jupiter.api.Test;
1814

1915
import com.sap.cloud.sdk.datamodel.odata.client.ODataProtocol;
2016
import com.sap.cloud.sdk.datamodel.odata.client.exception.ODataResponseException;
2117
import com.sap.cloud.sdk.datamodel.odata.client.exception.ODataServiceErrorException;
2218

19+
import lombok.Getter;
20+
2321
class ODataHealthyResponseValidatorTest
2422
{
25-
private final ODataRequestResult odataResult = mock(ODataRequestResult.class);
26-
private final ODataRequestGeneric odataRequest = mock(ODataRequestGeneric.class);
27-
private final HttpResponse httpResponse = mock(HttpResponse.class);
28-
private final StatusLine httpResponseStatusLine = mock(StatusLine.class);
29-
30-
@BeforeEach
31-
void adjustMocks()
32-
{
33-
lenient().when(odataRequest.getProtocol()).thenReturn(ODataProtocol.V2);
34-
lenient().when(odataResult.getHttpResponse()).thenReturn(httpResponse);
35-
lenient().when(odataResult.getODataRequest()).thenReturn(odataRequest);
36-
lenient().when(httpResponse.getStatusLine()).thenReturn(httpResponseStatusLine);
37-
lenient().when(httpResponse.getAllHeaders()).thenReturn(new Header[0]);
38-
lenient().when(httpResponseStatusLine.getStatusCode()).thenReturn(HttpStatus.SC_OK);
39-
}
23+
private static final ODataRequestGeneric REQUEST =
24+
new ODataRequestRead("service-path", "EntitySet", null, ODataProtocol.V2);
4025

4126
@Test
4227
void testSuccess()
4328
{
29+
final ODataRequestResult odataResult = new ODataRequestResult()
30+
{
31+
@Getter
32+
private final ODataRequestGeneric oDataRequest = REQUEST;
33+
34+
@Getter
35+
private final HttpResponse httpResponse =
36+
new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
37+
};
38+
4439
ODataHealthyResponseValidator.requireHealthyResponse(odataResult);
4540
}
4641

4742
@Test
4843
void testNotFound()
4944
{
50-
when(httpResponseStatusLine.getStatusCode()).thenReturn(HttpStatus.SC_NOT_FOUND);
45+
final ODataRequestResult odataResult = new ODataRequestResult()
46+
{
47+
@Getter
48+
private final ODataRequestGeneric oDataRequest = REQUEST;
49+
50+
@Getter
51+
private final HttpResponse httpResponse =
52+
new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_FOUND, "Not Found");
53+
};
5154

5255
assertThatExceptionOfType(ODataResponseException.class)
5356
.isThrownBy(() -> ODataHealthyResponseValidator.requireHealthyResponse(odataResult))
@@ -78,8 +81,23 @@ void testODataError()
7881
}
7982
""";
8083

81-
when(httpResponseStatusLine.getStatusCode()).thenReturn(HttpStatus.SC_INTERNAL_SERVER_ERROR);
82-
when(httpResponse.getEntity()).thenReturn(new StringEntity(odata_error_json, StandardCharsets.UTF_8));
84+
final ODataRequestResult odataResult = new ODataRequestResult()
85+
{
86+
@Getter
87+
private final ODataRequestGeneric oDataRequest = REQUEST;
88+
89+
@Getter
90+
private final HttpResponse httpResponse =
91+
new BasicHttpResponse(
92+
HttpVersion.HTTP_1_1,
93+
HttpStatus.SC_INTERNAL_SERVER_ERROR,
94+
"Internal Server Error")
95+
{
96+
{
97+
setEntity(new StringEntity(odata_error_json, StandardCharsets.UTF_8));
98+
}
99+
};
100+
};
83101

84102
assertThatExceptionOfType(ODataServiceErrorException.class)
85103
.isThrownBy(() -> ODataHealthyResponseValidator.requireHealthyResponse(odataResult))

0 commit comments

Comments
 (0)