X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=d9fb31e77fa2168dbc0e82cb642998f61aeff4d5;hb=b406570c20c8950cb3955c0bb90516ea1d54a723;hp=312c351e294aee8f6668109054b7c6d0e674f42a;hpb=9136e3e03b6881b32aada896be3241e46cbd33d9;p=gigi.git

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 312c351e..d9fb31e7 100644
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -53,6 +53,7 @@ import org.cacert.gigi.util.ServerConstants;
 import org.cacert.gigi.util.SimpleSigner;
 import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 
 /**
@@ -104,6 +105,7 @@ public class ManagedTest extends ConfiguredTest {
                 url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https");
                 String[] parts = testProps.getProperty("mail").split(":", 2);
                 ter = new TestEmailReciever(new InetSocketAddress(parts[0], Integer.parseInt(parts[1])));
+                ter.start();
                 return;
             }
             url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https");
@@ -114,10 +116,10 @@ public class ManagedTest extends ConfiguredTest {
             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);
+            DevelLauncher.writeGigiConfig(toGigi, "changeit".getBytes("UTF-8"), "changeit".getBytes("UTF-8"), mainProps, cacerts, keystore);
             toGigi.flush();
 
-            final BufferedReader br = new BufferedReader(new InputStreamReader(gigi.getErrorStream()));
+            final BufferedReader br = new BufferedReader(new InputStreamReader(gigi.getErrorStream(), "UTF-8"));
             String line;
             while ((line = br.readLine()) != null && !line.contains("Server:main: Started")) {
             }
@@ -139,6 +141,7 @@ public class ManagedTest extends ConfiguredTest {
                 throw new Error("Server startup failed");
             }
             ter = new TestEmailReciever(new InetSocketAddress("localhost", 8473));
+            ter.start();
             SimpleSigner.runSigner();
         } catch (IOException e) {
             throw new Error(e);
@@ -246,7 +249,7 @@ public class ManagedTest extends ConfiguredTest {
         String csrf = getCSRF(csrfConn);
         uc.addRequestProperty("Cookie", headerField);
         uc.setDoOutput(true);
-        uc.getOutputStream().write((param + "&csrf=" + csrf).getBytes());
+        uc.getOutputStream().write((param + "&csrf=" + csrf).getBytes("UTF-8"));
         String d = IOUtils.readURL(uc);
         return d;
     }
@@ -277,6 +280,7 @@ public class ManagedTest extends ConfiguredTest {
         registerUser(firstName, lastName, email, password);
         try {
             TestMail tm = ter.recieve();
+            Assert.assertNotNull(tm);
             tm.verify();
             GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?");
             ps.setString(1, email);
@@ -295,7 +299,7 @@ public class ManagedTest extends ConfiguredTest {
     public static void grant(String email, Group g) throws IOException {
         HttpURLConnection huc = (HttpURLConnection) new URL("https://" + getServerName() + Manager.PATH).openConnection();
         huc.setDoOutput(true);
-        huc.getOutputStream().write(("addpriv=y&priv=" + URLEncoder.encode(g.getDatabaseName(), "UTF-8") + "&email=" + URLEncoder.encode(email, "UTF-8")).getBytes());
+        huc.getOutputStream().write(("addpriv=y&priv=" + URLEncoder.encode(g.getDatabaseName(), "UTF-8") + "&email=" + URLEncoder.encode(email, "UTF-8")).getBytes("UTF-8"));
         assertEquals(200, huc.getResponseCode());
     }
 
@@ -351,7 +355,7 @@ public class ManagedTest extends ConfiguredTest {
         huc.setDoOutput(true);
         OutputStream os = huc.getOutputStream();
         String data = "username=" + URLEncoder.encode(email, "UTF-8") + "&password=" + URLEncoder.encode(pw, "UTF-8") + "&csrf=" + URLEncoder.encode(csrf, "UTF-8");
-        os.write(data.getBytes());
+        os.write(data.getBytes("UTF-8"));
         os.flush();
         headerField = huc.getHeaderField("Set-Cookie");
         if (headerField == null) {
@@ -458,7 +462,7 @@ public class ManagedTest extends ConfiguredTest {
         OutputStream os = uc.getOutputStream();
         os.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" //
         + query//
-        ).getBytes());
+        ).getBytes("UTF-8"));
         os.flush();
         String error = fetchStartErrorMessage(IOUtils.readURL(uc));
         return error;
@@ -468,6 +472,7 @@ public class ManagedTest extends ConfiguredTest {
         EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld");
         adrr.insert(Language.getInstance(Locale.ENGLISH));
         TestMail testMail = getMailReciever().recieve();
+        Assert.assertNotNull(testMail);
         assertEquals(adrr.getAddress(), testMail.getTo());
         String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1);
         adrr.verify(hash);