X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=8f6e6c5d44f360301e6efd0f5e323583bcc4081f;hp=ce96cf2894497caac41c31b93f710856e973dcb1;hb=28675b61ff01735e091fb37fd0d150574f2f61b6;hpb=8af6231b22da4fef795bcb54913faad6592b1a02

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index ce96cf28..8f6e6c5d 100644
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -38,6 +38,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
+import org.cacert.gigi.database.SQLFileManager.ImportType;
 import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.ObjectCache;
@@ -48,11 +49,11 @@ import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.pages.main.RegisterPage;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.cacert.gigi.util.DatabaseManager;
-import org.cacert.gigi.util.DatabaseManager.ImportType;
 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")) {
             }
@@ -178,6 +180,7 @@ public class ManagedTest extends ConfiguredTest {
         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("name.api", testProps.getProperty("name.api"));
 
         mainProps.setProperty("https.port", testProps.getProperty("serverPort.https"));
         mainProps.setProperty("http.port", testProps.getProperty("serverPort.http"));
@@ -245,7 +248,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;
     }
@@ -276,11 +279,8 @@ public class ManagedTest extends ConfiguredTest {
         registerUser(firstName, lastName, email, password);
         try {
             TestMail tm = ter.recieve();
-            String verifyLink = tm.extractLink();
-            String[] parts = verifyLink.split("\\?");
-            URL u = new URL("https://" + getServerName() + "/verify?" + parts[1]);
-            u.openStream().close();
-
+            Assert.assertNotNull(tm);
+            tm.verify();
             GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?");
             ps.setString(1, email);
             GigiResultSet rs = ps.executeQuery();
@@ -298,7 +298,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());
     }
 
@@ -329,7 +329,7 @@ public class ManagedTest extends ConfiguredTest {
         return uid;
     }
 
-    private static String stripCookie(String headerField) {
+    static String stripCookie(String headerField) {
         return headerField.substring(0, headerField.indexOf(';'));
     }
 
@@ -354,7 +354,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) {
@@ -461,7 +461,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;
@@ -471,6 +471,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);