AUT-2623 Fix broken tests

Author: madislm

src/test/java/eu/webeid/ocsp/OcspCertificateRevocationCheckerTest.java

@@ -22,6 +22,7 @@
 
 package eu.webeid.ocsp;
 
+import eu.webeid.ocsp.exceptions.OCSPClientException;
 import eu.webeid.security.exceptions.CertificateExpiredException;
 import eu.webeid.security.exceptions.CertificateNotTrustedException;
 import eu.webeid.security.exceptions.JceException;
@@ -60,15 +61,15 @@
 import static eu.webeid.security.testutil.DateMocker.mockDate;
 import static eu.webeid.ocsp.service.OcspServiceMaker.getAiaOcspServiceProvider;
 import static eu.webeid.ocsp.service.OcspServiceMaker.getDesignatedOcspServiceProvider;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;
 
-// TODO Fix failing tests
-@Disabled
 public class OcspCertificateRevocationCheckerTest extends AbstractTestWithValidator {
 
     private final OcspClient ocspClient = OcspClientImpl.build(Duration.ofSeconds(5));
@@ -122,7 +123,7 @@ void whenOcspUrlIsInvalid_thenThrows() throws Exception {
         final OcspCertificateRevocationChecker validator = getOcspCertificateRevocationChecker(ocspServiceProvider);
         assertThatCode(() ->
             validator.validateCertificateNotRevoked(estEid2018Cert, testEsteid2018CA))
-            .isInstanceOf(UserCertificateOCSPCheckFailedException.class)
+            .isInstanceOf(OCSPClientException.class)
             .cause()
             .isInstanceOf(ConnectException.class);
     }
@@ -131,12 +132,10 @@ void whenOcspUrlIsInvalid_thenThrows() throws Exception {
     void whenOcspRequestFails_thenThrows() throws Exception {
         final OcspServiceProvider ocspServiceProvider = getDesignatedOcspServiceProvider("http://demo.sk.ee/ocsps");
         final OcspCertificateRevocationChecker validator = getOcspCertificateRevocationChecker(ocspServiceProvider);
-        assertThatCode(() ->
-            validator.validateCertificateNotRevoked(estEid2018Cert, testEsteid2018CA))
-            .isInstanceOf(UserCertificateOCSPCheckFailedException.class)
-            .cause()
-            .isInstanceOf(IOException.class)
-            .hasMessageStartingWith("OCSP request was not successful, response: (POST http://demo.sk.ee/ocsps) 404");
+        OCSPClientException ex = assertThrows(OCSPClientException.class, () ->
+            validator.validateCertificateNotRevoked(estEid2018Cert, testEsteid2018CA));
+        assertThat(ex).hasMessageStartingWith("OCSP request was not successful");
+        assertThat(ex.getStatusCode()).isEqualTo(404);
     }
 
     @Test
@@ -146,7 +145,7 @@ void whenOcspRequestHasInvalidBody_thenThrows() throws Exception {
         );
         assertThatCode(() ->
             validator.validateCertificateNotRevoked(estEid2018Cert, testEsteid2018CA))
-            .isInstanceOf(UserCertificateOCSPCheckFailedException.class)
+            .isInstanceOf(OCSPClientException.class)
             .cause()
             .isInstanceOf(IOException.class)
             .hasMessage("DEF length 110 object truncated by 105");
@@ -410,7 +409,7 @@ private OcspClient getMockClient(HttpResponse<byte[]> response) {
             try {
                 return new OCSPResp(Objects.requireNonNull(response.body()));
             } catch (IOException e) {
-                throw new RuntimeException(e);
+                throw new OCSPClientException(e);
             }
         };
     }

src/test/java/eu/webeid/ocsp/client/OcspClientOverrideTest.java

@@ -30,7 +30,6 @@
 import eu.webeid.security.validator.AuthTokenValidator;
 import org.bouncycastle.cert.ocsp.OCSPReq;
 import org.bouncycastle.cert.ocsp.OCSPResp;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -43,15 +42,12 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-// TODO Fix failing tests
-@Disabled
 class OcspClientOverrideTest extends AbstractTestWithValidator {
 
     @Test
     void whenOcspClientIsOverridden_thenItIsUsed() throws JceException, CertificateException, IOException {
         final AuthTokenValidator validator = getAuthTokenValidatorWithOverriddenOcspClient(new OcpClientThatThrows());
         assertThatThrownBy(() -> validator.validate(validAuthToken, VALID_CHALLENGE_NONCE))
-            .cause()
             .isInstanceOf(OcpClientThatThrowsException.class);
     }
 

src/test/java/eu/webeid/resilientocsp/ResilientOcspCertificateRevocationCheckerTest.java

@@ -81,9 +81,8 @@ void setUp() throws Exception {
         ocspRespGood = new OCSPResp(getOcspResponseBytesFromResources("ocsp_response.der"));
     }
 
-    // TODO Rename to match the expected result
     @Test
-    void whenMultipleValidationCalls_thenStaleListenersMutatePreviousResults() throws Exception {
+    void whenMultipleValidationCalls_thenPreviousResultsAreNotModified() throws Exception {
         OcspClient ocspClient = mock(OcspClient.class);
         when(ocspClient.request(eq(PRIMARY_URI), any()))
             .thenThrow(new OCSPClientException("Primary OCSP service unavailable (call1)"))