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;
+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;
}
@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");
if (testProps.getProperty("withSigner", "false").equals("true")) {
SimpleSigner.runSigner();
}
- return;
+ return mainProps;
}
url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https");
gigi = Runtime.getRuntime().exec(testProps.getProperty("java"));
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);
}
}
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"));
mainProps.setProperty("sql.user", testProps.getProperty("sql.user"));
mainProps.setProperty("sql.password", testProps.getProperty("sql.password"));
mainProps.setProperty("testing", "true");
- return mainProps;
}
@AfterClass
public static void makeAssurer(int uid) {
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, CATS.ASSURER_CHALLENGE_ID);
+ ps1.setInt(2, CATSType.ASSURER_CHALLENGE.getId());
ps1.execute();
}