import org.cacert.gigi.dbObjects.Group;
import org.cacert.gigi.dbObjects.ObjectCache;
import org.cacert.gigi.dbObjects.User;
-import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.pages.Manager;
import org.cacert.gigi.pages.account.MyDetails;
import org.cacert.gigi.pages.main.RegisterPage;
/**
* Some password that fulfills the password criteria.
*/
- protected static final String TEST_PASSWORD = "xvXV12°§";
+ public static final String TEST_PASSWORD = "xvXV12°§";
private static TestEmailReceiver ter;
final BufferedReader br = new BufferedReader(new InputStreamReader(gigi.getErrorStream(), "UTF-8"));
String line;
- while ((line = br.readLine()) != null && !line.contains("Server:main: Started")) {
+ while ((line = br.readLine()) != null && !line.contains("System successfully started.")) {
+ System.err.println(line);
}
new Thread() {
try {
ter.receive().verify();
- GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?");
+ GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `id` FROM `users` WHERE `email`=?");
ps.setString(1, email);
try (GigiResultSet rs = ps.executeQuery()) {
public static int createAssuranceUser(String firstName, String lastName, String email, String password) {
int uid = createVerifiedUser(firstName, lastName, email, password);
+ makeAssurer(uid);
+
+ return uid;
+ }
+
+ public static void makeAssurer(int uid) {
GigiPreparedStatement ps1 = DatabaseConnection.getInstance().prepare("INSERT INTO `cats_passed` SET `user_id`=?, `variant_id`=?");
ps1.setInt(1, uid);
ps1.setInt(2, 0);
ps2.setInt(1, uid);
ps2.setInt(2, uid);
ps2.execute();
-
- return uid;
}
static String stripCookie(String headerField) {
}
public static EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException {
- EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld");
- adrr.insert(Language.getInstance(Locale.ENGLISH));
+ EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld", Locale.ENGLISH);
TestMail testMail = getMailReciever().receive();
assertEquals(adrr.getAddress(), testMail.getTo());
String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1);