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;
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");
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;
@AfterClass
public static void tearDownServer() {
String type = testProps.getProperty("type");
+ ter.destroy();
if (type.equals("local")) {
return;
}
gigi.destroy();
}
-
@After
public void removeMails() {
ter.reset();
throw new Error(e);
}
}
+ /**
+ * Creates a new user with 100 Assurance points given by an (invalid)
+ * assurance.
+ *
+ * @param firstName
+ * the first name
+ * @param lastName
+ * the last name
+ * @param email
+ * the email
+ * @param password
+ * the password
+ * @return a new userid.
+ */
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;