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.Test;
"&adddomain&csrf=" + csrf;
URL u2 = sendDomainForm(u, content);
- TestMail mail = getMailReciever().recieve();
+ TestMail mail = getMailReciever().receive();
if (emailVariant == 0) {
mail.verify();
}
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;
}
String httpDom = getTestProps().getProperty("domain.http");
assumeNotNull(httpDom);
URL u = new URL("http://" + httpDom + "/cacert-" + token + ".txt");
- return IOUtils.readURL(new InputStreamReader(u.openStream())).trim();
+ return IOUtils.readURL(new InputStreamReader(u.openStream(), "UTF-8")).trim();
}
}