X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2FTestSEAdminPageUserDomainSearch.java;h=a4fb4b437b77d6084087d782ff69c53490d11bad;hb=7243641e3fc1ded767f1070a7300a099ad98ecad;hp=4337e3324babc19f956991655398639cac941d9b;hpb=aa5723dbb64ec8efa63909d39ff72364f0a5ee96;p=gigi.git

diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java
index 4337e332..a4fb4b43 100644
--- a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java
+++ b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java
@@ -13,7 +13,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;
-import org.cacert.gigi.pages.admin.support.FindDomainPage;
+import org.cacert.gigi.pages.admin.support.FindUserByDomainPage;
 import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage;
 import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage;
 import org.cacert.gigi.testUtils.ClientTest;
@@ -23,37 +23,42 @@ import org.junit.Test;
 
 public class TestSEAdminPageUserDomainSearch extends ClientTest {
 
-    public TestSEAdminPageUserDomainSearch() throws IOException {
+    private Domain d;
+
+    private String domainName;
+
+    private String unique;
+
+    private int tid;
+
+    public TestSEAdminPageUserDomainSearch() throws IOException, GigiApiException {
         grant(email, Group.SUPPORTER);
         assertEquals(302, post(cookie, SupportEnterTicketPage.PATH, "ticketno=a20140808.8&setTicket=action", 0).getResponseCode());
+
+        String mail = createUniqueName() + "@example.com";
+        tid = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD);
+        User user = User.getById(tid);
+        unique = createUniqueName();
+        domainName = unique + "pattern.org";
+        this.d = new Domain(user, user, domainName);
     }
 
     @Test
     public void testDomainSearch() throws MalformedURLException, UnsupportedEncodingException, IOException, GigiApiException {
-        String mail = createUniqueName() + "@example.com";
-        int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD);
-        User user = User.getById(id);
-        String domainName = createUniqueName() + ".org";
-        new Domain(user, user, domainName);
-        URLConnection uc = post(FindDomainPage.PATH, "process&domain=" + URLEncoder.encode(domainName, "UTF-8"));
+        URLConnection uc = post(FindUserByDomainPage.PATH, "process&domain=" + URLEncoder.encode(domainName, "UTF-8"));
 
-        assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + id, uc.getHeaderField("Location"));
+        assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + tid, uc.getHeaderField("Location"));
     }
 
     @Test
     public void testDomainSearchById() throws MalformedURLException, UnsupportedEncodingException, IOException, GigiApiException {
-        String mail = createUniqueName() + "@example.com";
-        int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD);
-        User user = User.getById(id);
-        String domainName = createUniqueName() + ".org";
-        Domain d = new Domain(user, user, domainName);
-        URLConnection uc = post(FindDomainPage.PATH, "process&domain=#" + d.getId());
-        assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + id, uc.getHeaderField("Location"));
+        URLConnection uc = post(FindUserByDomainPage.PATH, "process&domain=#" + d.getId());
+        assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + tid, uc.getHeaderField("Location"));
     }
 
     @Test
     public void testDomainSearchNonExist() throws MalformedURLException, UnsupportedEncodingException, IOException, GigiApiException {
-        URLConnection uc = post(FindDomainPage.PATH, "process&domain=" + URLEncoder.encode(createUniqueName() + ".de", "UTF-8"));
+        URLConnection uc = post(FindUserByDomainPage.PATH, "process&domain=" + URLEncoder.encode(createUniqueName() + ".de", "UTF-8"));
         assertNotNull(fetchStartErrorMessage(IOUtils.readURL(uc)));
     }
 
@@ -71,7 +76,7 @@ public class TestSEAdminPageUserDomainSearch extends ClientTest {
             found = true;
         }
         assumeTrue(found);
-        URLConnection uc = post(FindDomainPage.PATH, "process&domain=#" + id);
+        URLConnection uc = post(FindUserByDomainPage.PATH, "process&domain=#" + id);
         assertNotNull(fetchStartErrorMessage(IOUtils.readURL(uc)));
     }
 }