X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=f3c0044bfa4213901ac4dbd241a8331ed06c4a57;hp=96b4e61b06886d689ebf3d0b6d867f80005ae2b1;hb=0ee41cce6e542df5569376439fea61f08c738ac9;hpb=a0232b6e40e7e09767f0444d24e18bf12dafc362 diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 96b4e61b..f3c0044b 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -38,10 +38,12 @@ import org.cacert.gigi.GigiApiException; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.database.GigiResultSet; import org.cacert.gigi.database.SQLFileManager.ImportType; +import org.cacert.gigi.dbObjects.CATS.CATSType; 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.Job; import org.cacert.gigi.dbObjects.ObjectCache; import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.pages.Manager; @@ -51,6 +53,7 @@ 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.hamcrest.CoreMatchers; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -70,6 +73,8 @@ public class ManagedTest extends ConfiguredTest { */ public static final String TEST_PASSWORD = "xvXV12°§"; + public static final String DIFFICULT_CHARS = "ÜÖÄß𐀀"; + private static TestEmailReceiver ter; private static Process gigi; @@ -92,20 +97,32 @@ public class ManagedTest extends ConfiguredTest { } @BeforeClass - public static void initEnvironment() { - try { - ConfiguredTest.initEnvironment(); + public static void initEnvironmentHook() { + initEnvironment(); + } + + private static boolean inited = false; + public static Properties initEnvironment() { + try { + Properties mainProps = ConfiguredTest.initEnvironment(); + if (inited) { + return mainProps; + } + inited = true; purgeDatabase(); String type = testProps.getProperty("type"); - Properties mainProps = generateMainProps(); + generateMainProps(mainProps); ServerConstants.init(mainProps); if (type.equals("local")) { url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https"); String[] parts = testProps.getProperty("mail").split(":", 2); ter = new TestEmailReceiver(new InetSocketAddress(parts[0], Integer.parseInt(parts[1]))); ter.start(); - return; + if (testProps.getProperty("withSigner", "false").equals("true")) { + SimpleSigner.runSigner(); + } + return mainProps; } url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https"); gigi = Runtime.getRuntime().exec(testProps.getProperty("java")); @@ -143,16 +160,22 @@ public class ManagedTest extends ConfiguredTest { ter = new TestEmailReceiver(new InetSocketAddress("localhost", 8473)); ter.start(); SimpleSigner.runSigner(); + return mainProps; } catch (IOException e) { throw new Error(e); } catch (SQLException e1) { - e1.printStackTrace(); + throw new Error(e1); } catch (InterruptedException e) { - e.printStackTrace(); + throw new Error(e); } } + protected void await(Job j) throws InterruptedException { + SimpleSigner.ping(); + j.waitFor(5000); + } + public static void purgeDatabase() throws SQLException, IOException { System.out.print("... resetting Database"); long ms = System.currentTimeMillis(); @@ -174,8 +197,7 @@ public class ManagedTest extends ConfiguredTest { u.openConnection().getHeaderField("Location"); } - private static Properties generateMainProps() { - Properties mainProps = new Properties(); + private static void generateMainProps(Properties mainProps) { mainProps.setProperty("testrunner", "true"); mainProps.setProperty("host", "127.0.0.1"); mainProps.setProperty("name.secure", testProps.getProperty("name.secure")); @@ -192,7 +214,6 @@ public class ManagedTest extends ConfiguredTest { mainProps.setProperty("sql.user", testProps.getProperty("sql.user")); mainProps.setProperty("sql.password", testProps.getProperty("sql.password")); mainProps.setProperty("testing", "true"); - return mainProps; } @AfterClass @@ -246,19 +267,27 @@ public class ManagedTest extends ConfiguredTest { return d; } + public static org.hamcrest.Matcher hasError() { + return CoreMatchers.containsString("
"); + } + + public static org.hamcrest.Matcher hasNoError() { + return CoreMatchers.not(hasError()); + } + public static String fetchStartErrorMessage(String d) throws IOException { - String formFail = "
"; + String formFail = "
"; int idx = d.indexOf(formFail); if (idx == -1) { return null; } - String startError = d.substring(idx + formFail.length(), idx + 100).trim(); + String startError = d.substring(idx + formFail.length(), idx + formFail.length() + 150).trim(); return startError; } public static void registerUser(String firstName, String lastName, String email, String password) { try { - String query = "fname=" + URLEncoder.encode(firstName, "UTF-8") + "&lname=" + URLEncoder.encode(lastName, "UTF-8") + "&email=" + URLEncoder.encode(email, "UTF-8") + "&pword1=" + URLEncoder.encode(password, "UTF-8") + "&pword2=" + URLEncoder.encode(password, "UTF-8") + "&day=1&month=1&year=1910&cca_agree=1"; + String query = "fname=" + URLEncoder.encode(firstName, "UTF-8") + "&lname=" + URLEncoder.encode(lastName, "UTF-8") + "&email=" + URLEncoder.encode(email, "UTF-8") + "&pword1=" + URLEncoder.encode(password, "UTF-8") + "&pword2=" + URLEncoder.encode(password, "UTF-8") + "&day=1&month=1&year=1910&tos_agree=1"; String data = fetchStartErrorMessage(runRegister(query)); assertNull(data); } catch (UnsupportedEncodingException e) { @@ -318,9 +347,9 @@ public class ManagedTest extends ConfiguredTest { } public static void makeAssurer(int uid) { - try (GigiPreparedStatement ps1 = new GigiPreparedStatement("INSERT INTO `cats_passed` SET `user_id`=?, `variant_id`=?")) { + try (GigiPreparedStatement ps1 = new GigiPreparedStatement("INSERT INTO cats_passed SET user_id=?, variant_id=?, language='en_EN', version=1")) { ps1.setInt(1, uid); - ps1.setInt(2, 1); + ps1.setInt(2, CATSType.ASSURER_CHALLENGE.getId()); ps1.execute(); } @@ -393,14 +422,14 @@ public class ManagedTest extends ConfiguredTest { @Override public X509Certificate[] getCertificateChain(String arg0) { return new X509Certificate[] { - ce + ce }; } @Override public String[] getClientAliases(String arg0, Principal[] arg1) { return new String[] { - "client" + "client" }; } @@ -415,13 +444,13 @@ public class ManagedTest extends ConfiguredTest { @Override public String[] getServerAliases(String arg0, Principal[] arg1) { return new String[] { - "client" + "client" }; } }; SSLContext sc = SSLContext.getInstance("TLS"); sc.init(new KeyManager[] { - km + km }, null, null); if (connection instanceof HttpsURLConnection) { ((HttpsURLConnection) connection).setSSLSocketFactory(sc.getSocketFactory()); @@ -468,13 +497,13 @@ public class ManagedTest extends ConfiguredTest { uc.setDoOutput(true); OutputStream os = uc.getOutputStream(); os.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" // - + query// + + query// ).getBytes("UTF-8")); os.flush(); return (HttpURLConnection) uc; } - public HttpURLConnection get(String cookie, String path) throws IOException { + public static HttpURLConnection get(String cookie, String path) throws IOException { URLConnection uc = new URL("https://" + getServerName() + path).openConnection(); uc.addRequestProperty("Cookie", cookie); return (HttpURLConnection) uc;