X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=869d417a47b7b932795e3bb6d32e20f075345cb0;hp=f591e77259e0f6a1a6d9fd3cf576f0f92469fa45;hb=d690eda36eba121aa79e4f456d5f0eb481be8b86;hpb=a95fcf745db63e39d16aa3ec34a4d4f00b9b60d5 diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index f591e772..869d417a 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,11 +16,15 @@ 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.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; @@ -35,10 +40,25 @@ public class ManagedTest { return url; } static Properties testProps = new Properties(); + static { + InitTruststore.run(); + HttpURLConnection.setFollowRedirects(false); + } + @BeforeClass 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"); @@ -47,33 +67,40 @@ 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.load(new FileInputStream("config/gigi.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"); 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")); 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; @@ -102,6 +129,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(); } } @@ -137,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 = "