X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Fclub%2Fwpia%2Fgigi%2Fpages%2Fmain%2FKeyCompromiseTest.java;h=406590d2d161ba4c32ac6da90cee0b2f4c449b35;hb=b1732ef0669da21ed47e01f1d5675569829786a1;hp=1074a519886f0b7a96660749886873643048d7bc;hpb=11786136386ee067ed7a17b25bc07b3cd257ecb0;p=gigi.git

diff --git a/tests/club/wpia/gigi/pages/main/KeyCompromiseTest.java b/tests/club/wpia/gigi/pages/main/KeyCompromiseTest.java
index 1074a519..406590d2 100644
--- a/tests/club/wpia/gigi/pages/main/KeyCompromiseTest.java
+++ b/tests/club/wpia/gigi/pages/main/KeyCompromiseTest.java
@@ -36,6 +36,8 @@ import club.wpia.gigi.util.PEM;
 @RunWith(Parameterized.class)
 public class KeyCompromiseTest extends ClientTest {
 
+    private static final String NOT_FOUND = "not found";
+
     private static class TestParameters {
 
         private final String query;
@@ -48,6 +50,9 @@ public class KeyCompromiseTest extends ClientTest {
         }
 
         public String getError() {
+            if (NOT_FOUND.equals(error)) {
+                return KeyCompromiseForm.NOT_FOUND.getRaw();
+            }
             return error;
         }
 
@@ -91,18 +96,18 @@ public class KeyCompromiseTest extends ClientTest {
                 params("cert=%cert&priv=%priv", null),// cert+key
                 params("serial=%serial&signature=%signature", null),
                 // Zero serial
-                params("serial=0000&priv=%priv", KeyCompromiseForm.NOT_FOUND.getRaw()),
-                params("serial=0lkd&priv=%priv", KeyCompromiseForm.NOT_FOUND.getRaw()),
+                params("serial=0000&priv=%priv", "Malformed serial"),
+                params("serial=0lkd&priv=%priv", "Malformed serial"),
                 // tampered cert
                 params("cert=%tamperedCert&priv=%priv", "not be parsed"),
                 params("cert=%cert&priv=%tamperedPriv", "Private Key is malformed"),
-                params("serial=1&priv=%priv", KeyCompromiseForm.NOT_FOUND.getRaw()),
-                params("serial=1%serial&priv=%priv", KeyCompromiseForm.NOT_FOUND.getRaw()),
+                params("serial=1&priv=%priv", NOT_FOUND),
+                params("serial=1%serial&priv=%priv", NOT_FOUND),
                 // missing certificate identification
-                params("serial=&cert=&priv=%priv", "identification"),
-                params("cert=&priv=%priv", "identification"),
-                params("serial=&priv=%priv", "identification"),
-                params("priv=%priv", "identification"),
+                params("serial=&cert=&priv=%priv", "No information to identify"),
+                params("cert=&priv=%priv", "No information to identify"),
+                params("serial=&priv=%priv", "No information to identify"),
+                params("priv=%priv", "No information to identify"),
                 // sign missing
                 params("serial=%serial&priv=&signature=", "No verification"),
                 params("serial=%serial&signature=", "No verification"),
@@ -110,7 +115,7 @@ public class KeyCompromiseTest extends ClientTest {
                 params("serial=%serial", "No verification"),
                 params("cert=%cert&signature=%tamperedSignature", "Verification does not match"),
 
-                params("cert=-_&signature=%signature", "certificate could not be parsed"),
+                params("cert=-_&signature=%signature", "Certificate could not be parsed"),
                 params("cert=%cert&signature=-_", "Signature is malformed"),
                 params("cert=%cert&priv=-_", "Private Key is malformed"),
         };
@@ -122,7 +127,7 @@ public class KeyCompromiseTest extends ClientTest {
         };
     }
 
-    private String getQuery(String data) {
+    private String getQuery(String data) throws GigiApiException {
         String cData = null;
         {
             Pattern challenge = Pattern.compile(" data-challenge=\"([a-zA-Z0-9]+)\"");
@@ -182,6 +187,7 @@ public class KeyCompromiseTest extends ClientTest {
         if (error == null) {
             assertThat(result, hasNoError());
             assertRevoked(result);
+            getMailReceiver().receive(u.getEmail());
         } else if ("error".equals(error)) {
             assertThat(result, hasError());
             assertNotEquals(CertificateStatus.REVOKED, cert.getStatus());