X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=28628cb852b11374d50bcb2ee123817c0eefd4c8;hp=d9fb31e77fa2168dbc0e82cb642998f61aeff4d5;hb=a0cae0454cb03690ce318fa0fc8b4ca6d6cca4f1;hpb=b406570c20c8950cb3955c0bb90516ea1d54a723 diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index d9fb31e7..28628cb8 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -39,21 +39,21 @@ 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; -import org.cacert.gigi.testUtils.TestEmailReciever.TestMail; +import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; import org.cacert.gigi.util.DatabaseManager; import org.cacert.gigi.util.ServerConstants; import org.cacert.gigi.util.SimpleSigner; import org.junit.After; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.BeforeClass; /** @@ -69,9 +69,9 @@ 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 TestEmailReciever ter; + private static TestEmailReceiver ter; private static Process gigi; @@ -104,7 +104,7 @@ public class ManagedTest extends ConfiguredTest { if (type.equals("local")) { url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https"); String[] parts = testProps.getProperty("mail").split(":", 2); - ter = new TestEmailReciever(new InetSocketAddress(parts[0], Integer.parseInt(parts[1]))); + ter = new TestEmailReceiver(new InetSocketAddress(parts[0], Integer.parseInt(parts[1]))); ter.start(); return; } @@ -121,7 +121,8 @@ 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("Server:main: Started")) { + while ((line = br.readLine()) != null && !line.contains("System successfully started.")) { + System.err.println(line); } new Thread() { @@ -140,7 +141,7 @@ public class ManagedTest extends ConfiguredTest { if (line == null) { throw new Error("Server startup failed"); } - ter = new TestEmailReciever(new InetSocketAddress("localhost", 8473)); + ter = new TestEmailReceiver(new InetSocketAddress("localhost", 8473)); ter.start(); SimpleSigner.runSigner(); } catch (IOException e) { @@ -169,7 +170,7 @@ public class ManagedTest extends ConfiguredTest { public static void clearCaches() throws IOException { ObjectCache.clearAllCaches(); - String type = testProps.getProperty("type"); + // String type = testProps.getProperty("type"); URL u = new URL("https://" + getServerName() + "/manage"); u.openConnection().getHeaderField("Location"); } @@ -219,18 +220,10 @@ public class ManagedTest extends ConfiguredTest { @After public void clearAcceptLanguage() { - acceptLanguage = null; + ManagedTest.setAcceptLanguage(null); } - public TestMail waitForMail() { - try { - return ter.recieve(); - } catch (InterruptedException e) { - throw new Error(e); - } - } - - public static TestEmailReciever getMailReciever() { + public static TestEmailReceiver getMailReciever() { return ter; } @@ -279,18 +272,18 @@ public class ManagedTest extends ConfiguredTest { public static int createVerifiedUser(String firstName, String lastName, String email, String password) { registerUser(firstName, lastName, email, password); try { - TestMail tm = ter.recieve(); - Assert.assertNotNull(tm); - tm.verify(); - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?"); + ter.receive().verify(); + + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `id` FROM `users` WHERE `email`=?"); ps.setString(1, email); - GigiResultSet rs = ps.executeQuery(); - if (rs.next()) { - return rs.getInt(1); + + try (GigiResultSet rs = ps.executeQuery()) { + if (rs.next()) { + return rs.getInt(1); + } } + throw new Error(); - } catch (InterruptedException e) { - throw new Error(e); } catch (IOException e) { throw new Error(e); } @@ -319,17 +312,24 @@ 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 ps = DatabaseConnection.getInstance().prepare("INSERT INTO `cats_passed` SET `user_id`=?, `variant_id`=?"); - ps.setInt(1, uid); - ps.setInt(2, 0); - ps.execute(); - ps = DatabaseConnection.getInstance().prepare("INSERT INTO `notary` SET `from`=?, `to`=?, points='100'"); - ps.setInt(1, uid); - ps.setInt(2, uid); - ps.execute(); + + 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, 1); + 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(); + } + static String stripCookie(String headerField) { return headerField.substring(0, headerField.indexOf(';')); } @@ -452,6 +452,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); @@ -464,15 +470,18 @@ 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, int formIndex) 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)); - TestMail testMail = getMailReciever().recieve(); - Assert.assertNotNull(testMail); + 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); adrr.verify(hash); @@ -485,4 +494,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); + } + } + }