UPD: clean up/document/beatufy testcases.

[gigi.git] / tests / org / cacert / gigi / pages / account / TestContactInformation.java

diff --git a/tests/org/cacert/gigi/pages/account/TestContactInformation.java b/tests/org/cacert/gigi/pages/account/TestContactInformation.java
index 65fd0779991007555a97fed64392827a4acd7546..c63e36d2b3d76866e521fdd7ce305ef111555cd1 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestContactInformation.java
+++ b/tests/org/cacert/gigi/pages/account/TestContactInformation.java
@@ -1,28 +1,26 @@
 package org.cacert.gigi.pages.account;
 
+import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 
+import org.cacert.gigi.testUtils.ClientTest;
 import org.cacert.gigi.testUtils.IOUtils;
-import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 
-public class TestContactInformation extends ManagedTest {
+public class TestContactInformation extends ClientTest {
 
     @Test
     public void testDirectoryListingToggle() throws IOException {
-        String email = createUniqueName() + "@e.fg";
-        createVerifiedUser("Kurti", createUniqueName(), email, TEST_PASSWORD);
-        String cookie = login(email, TEST_PASSWORD);
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "listme=1&contactinfo=&processContact", 1));
         URLConnection url = new URL("https://" + getServerName() + MyDetails.PATH).openConnection();
         url.setRequestProperty("Cookie", cookie);
         String res = IOUtils.readURL(url);
         res = res.split(java.util.regex.Pattern.quote("</table>"))[1];
-        assertTrue(res.contains("value=\"1\" selected"));
+        assertThat(res, containsString("value=\"1\" selected"));
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "listme=0&contactinfo=&processContact", 1));
         url = new URL("https://" + getServerName() + MyDetails.PATH).openConnection();
         url.setRequestProperty("Cookie", cookie);
@@ -33,15 +31,12 @@ public class TestContactInformation extends ManagedTest {
 
     @Test
     public void testContactinfoSet() throws IOException {
-        String email = createUniqueName() + "@e.fg";
-        createVerifiedUser("Kurti", createUniqueName(), email, TEST_PASSWORD);
-        String cookie = login(email, TEST_PASSWORD);
         String text = createUniqueName();
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "listme=1&contactinfo=" + text + "&processContact", 1));
         URLConnection url = new URL("https://" + getServerName() + MyDetails.PATH).openConnection();
         url.setRequestProperty("Cookie", cookie);
         String res = IOUtils.readURL(url);
         res = res.split(java.util.regex.Pattern.quote("</table>"))[1];
-        assertTrue(res.contains(text));
+        assertThat(res, containsString(text));
     }
 }