[EMPTY] Organize all imports

[gigi.git] / tests / org / cacert / gigi / LoginTest.java

diff --git a/tests/org/cacert/gigi/LoginTest.java b/tests/org/cacert/gigi/LoginTest.java
index f4bfe85fb5e71fa622d83cd46806dc30370c998c..d6c6fc4941910fc1828d29cbc17abd70e67147f9 100644 (file)
--- a/tests/org/cacert/gigi/LoginTest.java
+++ b/tests/org/cacert/gigi/LoginTest.java
@@ -1,42 +1,49 @@
 package org.cacert.gigi;
 
-import java.io.IOException;
 import static org.junit.Assert.*;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
+
+import java.io.IOException;
 import java.net.URL;
-import java.net.URLEncoder;
 
 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);
+        waitForMail();
+        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 {
+        cookie(new URL("https://" + getServerName() + "/logout").openConnection(), cookie).getHeaderField("Location");
+    }
 
 }