X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=cc3215c140f20d84a957e638453f8fd4f11281d5;hp=45b904429dbe1dc4d371ff57e0cd7790a44e762b;hb=673e3f834a719f3b1bfceedfd801a21ca7842cf2;hpb=75fb61d3c3bb51d2bb43c0b28c12d521c32bed02 diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 45b90442..cc3215c1 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -43,7 +43,6 @@ import org.cacert.gigi.dbObjects.EmailAddress; 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; @@ -68,7 +67,7 @@ public class ManagedTest extends ConfiguredTest { /** * 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; @@ -121,6 +120,7 @@ public class ManagedTest extends ConfiguredTest { final BufferedReader br = new BufferedReader(new InputStreamReader(gigi.getErrorStream(), "UTF-8")); String line; while ((line = br.readLine()) != null && !line.contains("System successfully started.")) { + System.err.println(line); } new Thread() { @@ -272,7 +272,7 @@ public class ManagedTest extends ConfiguredTest { 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()) { @@ -467,8 +467,7 @@ public class ManagedTest extends ConfiguredTest { } 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);