X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=880f600631fa7a77c2b976d23bdfd5ae8039126f;hb=40be0663dd6eb549e829aedf1b7dff102ef9fff3;hp=20fa9147bebf6e91f9bdf768e655e9ebf0d678f0;hpb=a4d3540a6ff67ca7673d0ff0c308b1ff56a76612;p=gigi.git diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 20fa9147..880f6006 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -13,6 +13,7 @@ import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.InetSocketAddress; import java.net.URL; +import java.net.URLConnection; import java.net.URLEncoder; import java.nio.file.Files; import java.nio.file.Paths; @@ -20,10 +21,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Properties; +import java.util.regex.Matcher; +import java.util.regex.Pattern; 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; @@ -41,6 +42,7 @@ public class ManagedTest { public static String getServerName() { return url; } + static Properties testProps = new Properties(); static { InitTruststore.run(); @@ -55,59 +57,44 @@ public class ManagedTest { 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")}); + 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"); + url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort"); String[] parts = testProps.getProperty("mail").split(":", 2); - ter = new TestEmailReciever(new InetSocketAddress(parts[0], - Integer.parseInt(parts[1]))); + ter = new TestEmailReciever(new InetSocketAddress(parts[0], 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()); + 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", testProps.getProperty("name.secure")); + mainProps.setProperty("name.www", testProps.getProperty("name.www")); + mainProps.setProperty("name.static", testProps.getProperty("name.static")); + mainProps.setProperty("port", testProps.getProperty("serverPort")); - mainProps.setProperty("emailProvider", - "org.cacert.gigi.email.TestEmailProvider"); + mainProps.setProperty("emailProvider", "org.cacert.gigi.email.TestEmailProvider"); mainProps.setProperty("emailProvider.port", "8473"); - mainProps.setProperty("sql.driver", - testProps.getProperty("sql.driver")); + 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[]{}, - "changeit".getBytes(), mainProps, cacerts, keystore); + 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, "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())); + + final BufferedReader br = new BufferedReader(new InputStreamReader(gigi.getErrorStream())); String line; - while ((line = br.readLine()) != null - && !line.contains("Server:main: Started")) { - System.err.println(line); + while ((line = br.readLine()) != null && !line.contains("Server:main: Started")) { } new Thread() { @Override @@ -122,12 +109,10 @@ public class ManagedTest { } } }.start(); - System.err.println(line); if (line == null) { throw new Error("Server startup failed"); } - ter = new TestEmailReciever( - new InetSocketAddress("localhost", 8473)); + ter = new TestEmailReciever(new InetSocketAddress("localhost", 8473)); } catch (IOException e) { throw new Error(e); } catch (ClassNotFoundException e1) { @@ -137,9 +122,11 @@ public class ManagedTest { } } + @AfterClass public static void tearDownServer() { String type = testProps.getProperty("type"); + ter.destroy(); if (type.equals("local")) { return; } @@ -158,37 +145,35 @@ public class ManagedTest { throw new Error(e); } } + public static TestEmailReciever getMailReciever() { return ter; } + public String runRegister(String param) throws IOException { - HttpURLConnection uc = (HttpURLConnection) new URL("https://" - + getServerName() + registerService).openConnection(); + HttpURLConnection uc = (HttpURLConnection) new URL("https://" + getServerName() + registerService) + .openConnection(); uc.setDoOutput(true); uc.getOutputStream().write(param.getBytes()); 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 = "