Merge "add: show more certificates on the "roots" page"

[gigi.git] / tests / club / wpia / gigi / api / TestFindAgent.java

diff --git a/tests/club/wpia/gigi/api/TestFindAgent.java b/tests/club/wpia/gigi/api/TestFindAgent.java
index cae8b812a6aa4f6ad9d2c4e438d2617c0629d060..753eb7790f9c117d9cd7b2526ad25ad89cf05777 100644 (file)
--- a/tests/club/wpia/gigi/api/TestFindAgent.java
+++ b/tests/club/wpia/gigi/api/TestFindAgent.java
@@ -15,14 +15,13 @@ import org.json.JSONTokener;
 import org.junit.Test;
 
 import club.wpia.gigi.GigiApiException;
-import club.wpia.gigi.api.FindAgent;
 import club.wpia.gigi.dbObjects.Certificate;
+import club.wpia.gigi.dbObjects.Certificate.CSRType;
+import club.wpia.gigi.dbObjects.Certificate.SANType;
 import club.wpia.gigi.dbObjects.CertificateProfile;
 import club.wpia.gigi.dbObjects.Digest;
 import club.wpia.gigi.dbObjects.Group;
 import club.wpia.gigi.dbObjects.User;
-import club.wpia.gigi.dbObjects.Certificate.CSRType;
-import club.wpia.gigi.dbObjects.Certificate.SANType;
 import club.wpia.gigi.pages.account.FindAgentAccess;
 import club.wpia.gigi.testUtils.IOUtils;
 import club.wpia.gigi.testUtils.RestrictedApiTest;
@@ -73,10 +72,9 @@ public class TestFindAgent extends RestrictedApiTest {
         grant((userUFirst ? us2 : u), Group.LOCATE_AGENT);
         v = doApi(FindAgent.PATH_MAIL, "from=" + id + "&to=" + u2 + "&subject=the-subject&body=body");
         assertEquals(v.getResponseMessage(), 200, v.getResponseCode());
-        TestMail mail = getMailReceiver().receive();
+        TestMail mail = getMailReceiver().receive(us2.getEmail());
         assertEquals("body", mail.getMessage());
         assertThat(mail.getSubject(), containsString("the-subject"));
-        assertEquals(us2.getEmail(), mail.getTo());
     }
 
     @Test
@@ -92,11 +90,11 @@ public class TestFindAgent extends RestrictedApiTest {
         JSONTokener jt = new JSONTokener(res);
         JSONObject j1 = new JSONObject();
         j1.put("id", id);
-        j1.put("canAssure", true);
+        j1.put("canVerify", true);
         j1.put("name", u.getPreferredName().toAbbreviatedString());
         JSONObject j2 = new JSONObject();
         j2.put("id", u2);
-        j2.put("canAssure", false);
+        j2.put("canVerify", false);
         j2.put("name", User.getById(u2).getPreferredName().toAbbreviatedString());
         JSONArray ja = new JSONArray(Arrays.asList(j1, j2));
         assertEquals(ja.toString(), new JSONArray(jt).toString());