X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fping%2FTestHTTP.java;h=da9892b41e854cb1735bff4a8d87331ac287e53b;hb=b58a76fd82cff44fb6e1cdf09c8b04d890ac2e1e;hp=4daa0d7e9421e5a4b672c0b966e1a1fb534d0601;hpb=28675b61ff01735e091fb37fd0d150574f2f61b6;p=gigi.git diff --git a/tests/org/cacert/gigi/ping/TestHTTP.java b/tests/org/cacert/gigi/ping/TestHTTP.java index 4daa0d7e..da9892b4 100644 --- a/tests/org/cacert/gigi/ping/TestHTTP.java +++ b/tests/org/cacert/gigi/ping/TestHTTP.java @@ -17,13 +17,12 @@ import javax.naming.NamingException; import org.cacert.gigi.GigiApiException; import org.cacert.gigi.dbObjects.Domain; import org.cacert.gigi.dbObjects.DomainPingConfiguration; -import org.cacert.gigi.dbObjects.DomainPingConfiguration.PingType; +import org.cacert.gigi.dbObjects.DomainPingType; import org.cacert.gigi.pages.account.domain.DomainOverview; import org.cacert.gigi.testUtils.IOUtils; import org.cacert.gigi.testUtils.PingTest; -import org.cacert.gigi.testUtils.TestEmailReciever.TestMail; +import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; import org.cacert.gigi.util.RandomToken; -import org.junit.Assert; import org.junit.Test; public class TestHTTP extends PingTest { @@ -72,9 +71,8 @@ public class TestHTTP extends PingTest { "&adddomain&csrf=" + csrf; URL u2 = sendDomainForm(u, content); - TestMail mail = getMailReciever().recieve(); + TestMail mail = getMailReciever().receive(); if (emailVariant == 0) { - Assert.assertNotNull(mail); mail.verify(); } waitForPings(2); @@ -90,7 +88,7 @@ public class TestHTTP extends PingTest { Domain d = Domain.getById(id); DomainPingConfiguration dpc = null; for (DomainPingConfiguration conf : d.getConfiguredPings()) { - if (conf.getType() == PingType.HTTP) { + if (conf.getType() == DomainPingType.HTTP) { dpc = conf; break; }