package org.cacert.gigi.pages.account;
-import static org.junit.Assert.*;
import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.cacert.gigi.Digest;
-import org.cacert.gigi.User;
import org.cacert.gigi.crypto.SPKAC;
+import org.cacert.gigi.dbObjects.Digest;
+import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.pages.account.certs.CertificateAdd;
+import org.cacert.gigi.pages.account.certs.CertificateIssueForm;
import org.cacert.gigi.testUtils.IOUtils;
import org.cacert.gigi.testUtils.ManagedTest;
import org.cacert.gigi.util.PEM;
final long MS_PER_DAY = 24 * 60 * 60 * 1000;
now -= now % MS_PER_DAY;
now += MS_PER_DAY;
- SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
Date start = new Date(now);