ManagedTest: change semantic of fetchStartErrorMessage

[gigi.git] / tests / org / cacert / gigi / testUtils / ManagedTest.java

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index c85ce451aac27e5385e9d071f73485a99aba305a..2fac31820e3277e0d763ffa42908339c25b4012a 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -8,6 +8,7 @@ import java.io.DataOutputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.InetSocketAddress;
@@ -15,6 +16,8 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
 
@@ -166,8 +169,7 @@ public class ManagedTest {
                String d = IOUtils.readURL(uc);
                return d;
        }
-       public String fetchStartErrorMessage(String query) throws IOException {
-               String d = runRegister(query);
+       public String fetchStartErrorMessage(String d) throws IOException {
                String formFail = "<div class='formError'>";
                int idx = d.indexOf(formFail);
                assertNotEquals(-1, idx);
@@ -185,7 +187,7 @@ public class ManagedTest {
                                        + "&pword1=" + URLEncoder.encode(password, "UTF-8")
                                        + "&pword2=" + URLEncoder.encode(password, "UTF-8")
                                        + "&day=1&month=1&year=1910&cca_agree=1";
-                       String data = fetchStartErrorMessage(query);
+                       String data = fetchStartErrorMessage(runRegister(query));
                        assertTrue(data, data.startsWith("</div>"));
                } catch (UnsupportedEncodingException e) {
                        throw new Error(e);
@@ -193,7 +195,7 @@ public class ManagedTest {
                        throw new Error(e);
                }
        }
-       public void createVerifiedUser(String firstName, String lastName,
+       public int createVerifiedUser(String firstName, String lastName,
                        String email, String password) {
                registerUser(firstName, lastName, email, password);
                try {
@@ -203,10 +205,43 @@ public class ManagedTest {
                        URL u = new URL("https://" + getServerName() + "/verify?"
                                        + parts[1]);
                        u.openStream().close();;
+                       PreparedStatement ps = DatabaseConnection.getInstance().prepare(
+                                       "SELECT id FROM users where email=?");
+                       ps.setString(1, email);
+                       ResultSet 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);
+               } catch (SQLException e) {
+                       throw new Error(e);
                }
        }
+       public int createAssuranceUser(String firstName, String lastName,
+                       String email, String password) {
+               int uid = createVerifiedUser(firstName, lastName, email, password);
+               // TODO make him pass CATS and be assured for 100 points
+               return uid;
+       }
+       static int count = 0;
+       public String createUniqueName() {
+               return "test" + System.currentTimeMillis() + "a" + (count++);
+       }
+       public String login(String email, String pw) throws IOException {
+               URL u = new URL("https://" + getServerName() + "/login");
+               HttpURLConnection huc = (HttpURLConnection) u.openConnection();
+               huc.setDoOutput(true);
+               OutputStream os = huc.getOutputStream();
+               String data = "username=" + URLEncoder.encode(email, "UTF-8")
+                               + "&password=" + URLEncoder.encode(pw, "UTF-8");
+               os.write(data.getBytes());
+               os.flush();
+               String headerField = huc.getHeaderField("Set-Cookie");
+               headerField = headerField.substring(0, headerField.indexOf(';'));
+               return headerField;
+       }
 }