refactor: updated code to cover missing cases and resolve comments

Author: haseeb-mhr

src/test/java/apimatic/core/security/DigestCodecFactoryTest.java

@@ -2,27 +2,21 @@
 
 import io.apimatic.core.security.DigestCodec;
 import io.apimatic.core.security.DigestCodecFactory;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DigestCodecFactoryTest {
 
-    /** Rule for expecting exceptions in tests. */
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     private static final byte HEX_BYTE_1 = 0x0A;
     private static final byte HEX_BYTE_2 = 0x1B;
     private static final byte HEX_BYTE_3 = (byte) 0xFF;
 
-    private static final byte[] BASE64_INPUT = {1, 2, 3, 4, 5};
     private static final byte BASE64_BYTE_1 = 1;
     private static final byte BASE64_BYTE_2 = 2;
     private static final byte BASE64_BYTE_3 = 3;
@@ -56,15 +50,17 @@ public void testHexEncodeEmpty() {
     @Test
     public void testHexDecodeInvalidLength() {
         DigestCodec codec = DigestCodecFactory.hex();
-        thrown.expect(IllegalArgumentException.class);
-        codec.decode("abc");
+        assertThrows(IllegalArgumentException.class, () -> {
+            codec.decode("abc");
+        });
     }
 
     @Test
     public void testHexDecodeInvalidCharacter() {
         DigestCodec codec = DigestCodecFactory.hex();
-        thrown.expect(IllegalArgumentException.class);
-        codec.decode("zzzzz");
+        assertThrows(IllegalArgumentException.class, () -> {
+            codec.decode("zzzzz");
+        });
     }
 
     @Test
@@ -88,8 +84,9 @@ public void testBase64EncodeEmpty() {
     @Test
     public void testBase64DecodeInvalid() {
         DigestCodec codec = DigestCodecFactory.base64();
-        thrown.expect(IllegalArgumentException.class);
-        codec.decode("!@#$");
+        assertThrows(IllegalArgumentException.class, () -> {
+            codec.decode("!@#$");
+        });
     }
 
     @Test
@@ -114,7 +111,8 @@ public void testBase64UrlEncodeEmpty() {
     @Test
     public void testBase64UrlDecodeInvalid() {
         DigestCodec codec = DigestCodecFactory.base64Url();
-        thrown.expect(IllegalArgumentException.class);
-        codec.decode("!@#$");
+        assertThrows(IllegalArgumentException.class, () -> {
+            codec.decode("!@#$");
+        });
     }
 }

src/test/java/apimatic/core/security/HmacSignatureVerifierTest.java

@@ -406,6 +406,25 @@ public void verifyAsyncWrongSignatureValueForTemplate() throws Exception {
         );
     }
 
+    @Test
+    public void verifyAsyncWrongSignatureValueWithQuotesForTemplate() throws Exception {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(SIGNATURE_HEADER, "v0=\"a\"complex");
+        Request request = mockRequest(headers, BODY);
+
+        HmacSignatureVerifier verifier = new HmacSignatureVerifier(
+                SECRET_KEY, SIGNATURE_HEADER, DEFAULT_DIGEST_CODEC,
+                SIGNATURE_TEMPLATE_RESOLVER, DEFAULT_ALGORITHM, "v0={digest}complex"
+        );
+
+        VerificationResult result = verifier.verifyAsync(request).get();
+        Assert.assertFalse(result.isSuccess());
+        Assert.assertEquals(
+                "Malformed signature header '" + SIGNATURE_HEADER + "'.",
+                result.getErrors().get(0)
+        );
+    }
+
     // Request signature template resolver tests
 
     @Test