upd: enforce that test cases receive all mails explicitly

[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 b1bec53e4292ea94236257c1c74aa6e4424e2b48..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 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;

+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.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;
 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());
         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("body", mail.getMessage());
         assertThat(mail.getSubject(), containsString("the-subject"));

-        assertEquals(us2.getEmail(), mail.getTo());

     }
 
     @Test
     }
 
     @Test