X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Fclub%2Fwpia%2Fgigi%2FtestUtils%2FBusinessTest.java;h=727310db225bc6b0e9b1cd7499e6ab087ddd994b;hb=a1fb2906862d4edc566a49d5a6c9133cffcfba68;hp=d62713a6026c6e2e333344fd05a28b1b2f3f60f6;hpb=bccd4cc0dba0f89aa045b113bac46eb8cc1dab4e;p=gigi.git diff --git a/tests/club/wpia/gigi/testUtils/BusinessTest.java b/tests/club/wpia/gigi/testUtils/BusinessTest.java index d62713a6..727310db 100644 --- a/tests/club/wpia/gigi/testUtils/BusinessTest.java +++ b/tests/club/wpia/gigi/testUtils/BusinessTest.java @@ -22,8 +22,8 @@ import club.wpia.gigi.dbObjects.Domain; import club.wpia.gigi.dbObjects.EmailAddress; import club.wpia.gigi.dbObjects.Group; import club.wpia.gigi.dbObjects.NamePart; -import club.wpia.gigi.dbObjects.User; import club.wpia.gigi.dbObjects.NamePart.NamePartType; +import club.wpia.gigi.dbObjects.User; import club.wpia.gigi.email.EmailProvider; import club.wpia.gigi.ping.PingerDaemon; import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail; @@ -76,11 +76,16 @@ public abstract class BusinessTest extends ConfiguredTest { @Override public TestMail receive() { + TestMail poll; try { - return mails.poll(30, TimeUnit.SECONDS); + poll = mails.poll(30, TimeUnit.SECONDS); } catch (InterruptedException e) { throw new Error(e); } + if (poll == null) { + throw new AssertionError("Mail receiving timed out"); + } + return poll; } @Override @@ -148,9 +153,9 @@ public abstract class BusinessTest extends ConfiguredTest { return u; } - public static int createAssuranceUser(String f, String l, String mail, String pw) throws GigiApiException { + public static int createVerificationUser(String f, String l, String mail, String pw) throws GigiApiException { int u = createVerifiedUser(f, l, mail, pw); - makeAssurer(u); + makeAgent(u); return u; }