X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=869d417a47b7b932795e3bb6d32e20f075345cb0;hp=20fa9147bebf6e91f9bdf768e655e9ebf0d678f0;hb=d690eda36eba121aa79e4f456d5f0eb481be8b86;hpb=a4d3540a6ff67ca7673d0ff0c308b1ff56a76612

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 20fa9147..869d417a 100644
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -22,8 +22,6 @@ import java.sql.SQLException;
 import java.util.Properties;
 
 import org.cacert.gigi.DevelLauncher;
-import org.cacert.gigi.IOUtils;
-import org.cacert.gigi.InitTruststore;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.cacert.gigi.util.DatabaseManager;
@@ -69,13 +67,19 @@ public class ManagedTest {
 						Integer.parseInt(parts[1])));
 				return;
 			}
-			url = "localhost:" + testProps.getProperty("serverPort");
+			url = testProps.getProperty("name.www") + ":"
+					+ testProps.getProperty("serverPort");
 			gigi = Runtime.getRuntime().exec(testProps.getProperty("java"));
 			DataOutputStream toGigi = new DataOutputStream(
 					gigi.getOutputStream());
 			System.out.println("... starting server");
 			Properties mainProps = new Properties();
 			mainProps.setProperty("host", "127.0.0.1");
+			mainProps.setProperty("name.secure", "sec");
+			mainProps
+					.setProperty("name.www", testProps.getProperty("name.www"));
+			mainProps.setProperty("name.static", "stat");
+
 			mainProps.setProperty("port", testProps.getProperty("serverPort"));
 			mainProps.setProperty("emailProvider",
 					"org.cacert.gigi.email.TestEmailProvider");
@@ -93,15 +97,10 @@ public class ManagedTest {
 			byte[] keystore = Files.readAllBytes(Paths
 					.get("config/keystore.pkcs12"));
 
-			DevelLauncher.writeGigiConfig(toGigi, new byte[]{},
+			DevelLauncher.writeGigiConfig(toGigi, "changeit".getBytes(),
 					"changeit".getBytes(), mainProps, cacerts, keystore);
 			toGigi.flush();
-			// TODO wait for ready
-			try {
-				Thread.sleep(3000);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
+
 			final BufferedReader br = new BufferedReader(new InputStreamReader(
 					gigi.getErrorStream()));
 			String line;
@@ -169,8 +168,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);
@@ -188,7 +186,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);
@@ -225,7 +223,23 @@ public class ManagedTest {
 	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
+		try {
+			PreparedStatement 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();
+
+		} catch (SQLException e) {
+			throw new Error(e);
+		}
 		return uid;
 	}
 	static int count = 0;