X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=2fac31820e3277e0d763ffa42908339c25b4012a;hb=f8808e481a30a36b3bf8dc269c6ac7a30639ea79;hp=c9a44b8a158046c778ac6291f53faee948e078d9;hpb=7cf984749cf0027ccae90a53ebef07ab97ff164b;p=gigi.git diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index c9a44b8a..2fac3182 100644 --- 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,12 +16,17 @@ 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; 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; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -45,6 +51,16 @@ public class ManagedTest { public static void connectToServer() { try { testProps.load(new FileInputStream("config/test.properties")); + if (!DatabaseConnection.isInited()) { + DatabaseConnection.init(testProps); + } + System.out.println("... purging Database"); + DatabaseManager.run(new String[]{ + testProps.getProperty("sql.driver"), + testProps.getProperty("sql.url"), + testProps.getProperty("sql.user"), + testProps.getProperty("sql.password")}); + String type = testProps.getProperty("type"); if (type.equals("local")) { url = testProps.getProperty("server"); @@ -59,12 +75,18 @@ public class ManagedTest { gigi.getOutputStream()); System.out.println("... starting server"); Properties mainProps = new Properties(); - mainProps.load(new FileInputStream("config/gigi.properties")); mainProps.setProperty("host", "127.0.0.1"); mainProps.setProperty("port", testProps.getProperty("serverPort")); mainProps.setProperty("emailProvider", "org.cacert.gigi.email.TestEmailProvider"); mainProps.setProperty("emailProvider.port", "8473"); + mainProps.setProperty("sql.driver", + testProps.getProperty("sql.driver")); + mainProps.setProperty("sql.url", testProps.getProperty("sql.url")); + mainProps + .setProperty("sql.user", testProps.getProperty("sql.user")); + mainProps.setProperty("sql.password", + testProps.getProperty("sql.password")); byte[] cacerts = Files .readAllBytes(Paths.get("config/cacerts.jks")); @@ -108,6 +130,10 @@ public class ManagedTest { new InetSocketAddress("localhost", 8473)); } catch (IOException e) { throw new Error(e); + } catch (ClassNotFoundException e1) { + e1.printStackTrace(); + } catch (SQLException e1) { + e1.printStackTrace(); } } @@ -143,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 = "