X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FLoginTest.java;h=29456c7b2a24a8d20b3580ea0801ec91ae330c79;hb=01f05be0083ef503ad5eafb8118aae23835abd2b;hp=729a5988e8053f4f4cf4e3b26828acec9b801a63;hpb=a4d3540a6ff67ca7673d0ff0c308b1ff56a76612;p=gigi.git

diff --git a/tests/org/cacert/gigi/LoginTest.java b/tests/org/cacert/gigi/LoginTest.java
index 729a5988..29456c7b 100644
--- a/tests/org/cacert/gigi/LoginTest.java
+++ b/tests/org/cacert/gigi/LoginTest.java
@@ -1,39 +1,48 @@
 package org.cacert.gigi;
 
-import java.io.IOException;
 import static org.junit.Assert.*;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
+
+import java.io.IOException;
 
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 
 public class LoginTest extends ManagedTest {
-	public static final String secureReference = "/account/certs/email";
-	@Test
-	public void testLoginUnverified() throws IOException {
-		long uniq = System.currentTimeMillis();
-		String email = "system" + uniq + "@testmail.org";
-		String pw = "1'aAaA";
-		registerUser("an", "bn", email, pw);
-		waitForMail();
-		assertFalse(isLoggedin(login(email, pw)));
-	}
-	@Test
-	public void testLoginVerified() throws IOException {
-		long uniq = System.currentTimeMillis();
-		String email = "system2" + uniq + "@testmail.org";
-		String pw = "1'aAaA";
-		createVerifiedUser("an", "bn", email, pw);
-		assertTrue(isLoggedin(login(email, pw)));
-	}
-	public boolean isLoggedin(String cookie) throws IOException {
-		URL u = new URL("https://" + getServerName() + secureReference);
-		HttpURLConnection huc = (HttpURLConnection) u.openConnection();
-		huc.addRequestProperty("Cookie", cookie);
-		return huc.getResponseCode() == 200;
-	}
+
+    @Test
+    public void testLoginUnverified() throws IOException {
+        String email = createUniqueName() + "@testmail.org";
+        registerUser("an", "bn", email, TEST_PASSWORD);
+        getMailReciever().receive();
+        assertFalse(isLoggedin(login(email, TEST_PASSWORD)));
+    }
+
+    @Test
+    public void testLoginVerified() throws IOException {
+        String email = createUniqueName() + "@testmail.org";
+        createVerifiedUser("an", "bn", email, TEST_PASSWORD);
+        assertTrue(isLoggedin(login(email, TEST_PASSWORD)));
+    }
+
+    @Test
+    public void testLoginWrongPassword() throws IOException {
+        String email = createUniqueName() + "@testmail.org";
+        createVerifiedUser("an", "bn", email, TEST_PASSWORD);
+        assertFalse(isLoggedin(login(email, TEST_PASSWORD + "b")));
+    }
+
+    @Test
+    public void testLogoutVerified() throws IOException {
+        String email = createUniqueName() + "@testmail.org";
+        createVerifiedUser("an", "bn", email, TEST_PASSWORD);
+        String cookie = login(email, TEST_PASSWORD);
+        assertTrue(isLoggedin(cookie));
+        logout(cookie);
+        assertFalse(isLoggedin(cookie));
+    }
+
+    private void logout(String cookie) throws IOException {
+        get(cookie, "/logout").getHeaderField("Location");
+    }
 
 }