X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=96b4e61b06886d689ebf3d0b6d867f80005ae2b1;hp=584b10e42c5dba8aaf733727184a21605ed7a7c7;hb=a0232b6e40e7e09767f0444d24e18bf12dafc362;hpb=98024a6c871785aa7966f55c174715fec317fb94 diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 584b10e4..96b4e61b 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -35,15 +35,15 @@ import javax.net.ssl.X509KeyManager; import org.cacert.gigi.DevelLauncher; import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.DatabaseConnection; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.database.GigiResultSet; import org.cacert.gigi.database.SQLFileManager.ImportType; +import org.cacert.gigi.dbObjects.Domain; +import org.cacert.gigi.dbObjects.DomainPingType; 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 +68,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 +121,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,10 +273,10 @@ public class ManagedTest extends ConfiguredTest { try { ter.receive().verify(); - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?"); - ps.setString(1, email); + try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `id` FROM `users` WHERE `email`=?")) { + ps.setString(1, email); - try (GigiResultSet rs = ps.executeQuery()) { + GigiResultSet rs = ps.executeQuery(); if (rs.next()) { return rs.getInt(1); } @@ -311,20 +312,26 @@ public class ManagedTest extends ConfiguredTest { public static int createAssuranceUser(String firstName, String lastName, String email, String password) { int uid = createVerifiedUser(firstName, lastName, email, password); - GigiPreparedStatement ps1 = DatabaseConnection.getInstance().prepare("INSERT INTO `cats_passed` SET `user_id`=?, `variant_id`=?"); - ps1.setInt(1, uid); - ps1.setInt(2, 0); - ps1.execute(); - - GigiPreparedStatement ps2 = DatabaseConnection.getInstance().prepare("INSERT INTO `notary` SET `from`=?, `to`=?, points='100'"); - ps2.setInt(1, uid); - ps2.setInt(2, uid); - ps2.execute(); + makeAssurer(uid); return uid; } - static String stripCookie(String headerField) { + public static void makeAssurer(int uid) { + try (GigiPreparedStatement ps1 = new GigiPreparedStatement("INSERT INTO `cats_passed` SET `user_id`=?, `variant_id`=?")) { + ps1.setInt(1, uid); + ps1.setInt(2, 1); + ps1.execute(); + } + + try (GigiPreparedStatement ps2 = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, points='100'")) { + ps2.setInt(1, uid); + ps2.setInt(2, uid); + ps2.execute(); + } + } + + protected static String stripCookie(String headerField) { return headerField.substring(0, headerField.indexOf(';')); } @@ -446,6 +453,12 @@ public class ManagedTest extends ConfiguredTest { } public static String executeBasicWebInteraction(String cookie, String path, String query, int formIndex) throws IOException, MalformedURLException, UnsupportedEncodingException { + URLConnection uc = post(cookie, path, query, formIndex); + String error = fetchStartErrorMessage(IOUtils.readURL(uc)); + return error; + } + + public static HttpURLConnection post(String cookie, String path, String query, int formIndex) throws IOException, MalformedURLException, UnsupportedEncodingException { URLConnection uc = new URL("https://" + getServerName() + path).openConnection(); uc.addRequestProperty("Cookie", cookie); String csrf = getCSRF(uc, formIndex); @@ -458,13 +471,17 @@ public class ManagedTest extends ConfiguredTest { + query// ).getBytes("UTF-8")); os.flush(); - String error = fetchStartErrorMessage(IOUtils.readURL(uc)); - return error; + return (HttpURLConnection) uc; + } + + public HttpURLConnection get(String cookie, String path) throws IOException { + URLConnection uc = new URL("https://" + getServerName() + path).openConnection(); + uc.addRequestProperty("Cookie", cookie); + return (HttpURLConnection) uc; } 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); @@ -478,4 +495,18 @@ public class ManagedTest extends ConfiguredTest { return openConnection; } + public static void verify(Domain d) { + try { + System.out.println(d.getId()); + d.addPing(DomainPingType.EMAIL, "admin"); + TestMail testMail = ter.receive(); + testMail.verify(); + assertTrue(d.isVerified()); + } catch (GigiApiException e) { + throw new Error(e); + } catch (IOException e) { + throw new Error(e); + } + } + }