X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2FTestSEAdminPageDetails.java;h=d1f0139f65d04927b69c2fd9c7156ac1a97bed8b;hb=6ce23e45d8e9abefae1627cecd6fd16e3f89e340;hp=39e7c5de3c30ac4df605bfbc1be23aa119e96b72;hpb=410465079ef6887884118bee366a3f9931563602;p=gigi.git

diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java
index 39e7c5de..d1f0139f 100644
--- a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java
+++ b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageDetails.java
@@ -5,12 +5,17 @@ import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.net.URL;
 import java.net.URLConnection;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.Group;
+import org.cacert.gigi.dbObjects.ObjectCache;
+import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.pages.account.History;
 import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage;
 import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage;
@@ -31,15 +36,39 @@ public class TestSEAdminPageDetails extends ClientTest {
         String fname = "Först";
         String lname = "Secönd";
         int id = createVerifiedUser(fname, lname, email, TEST_PASSWORD);
-        URLConnection uc = new URL("https://" + getServerName() + SupportUserDetailsPage.PATH + id).openConnection();
-        uc.addRequestProperty("Cookie", cookie);
+        URLConnection uc = get(SupportUserDetailsPage.PATH + id);
         uc.setDoOutput(true);
         String res = IOUtils.readURL(uc);
-        assertThat(res, containsString("<input type=\"text\" value=\"" + fname + "\" name=\"fname\">"));
-        assertThat(res, containsString("<input type=\"text\" value=\"" + lname + "\" name=\"lname\">"));
+        assertThat(res, containsString("type=\"text\" value=\"" + fname + "\" name=\"fname\">"));
+        assertThat(res, containsString("type=\"text\" value=\"" + lname + "\" name=\"lname\">"));
         assertThat(res, containsString(email));
     }
 
+    @Test
+    public void testUserDetailsEmail() throws MalformedURLException, IOException, GigiApiException {
+        String email = createUniqueName() + "@example.com";
+        String fname = "Först";
+        String lname = "Secönd";
+        int id = createVerifiedUser(fname, lname, email, TEST_PASSWORD);
+        String email2 = createUniqueName() + "@example.com";
+        EmailAddress ea = new EmailAddress(User.getById(id), email2, Locale.ENGLISH);
+        getMailReciever().receive().verify();
+        // Refresh email Object
+        ObjectCache.clearAllCaches();
+        ea = EmailAddress.getById(ea.getId());
+        assertTrue(ea.isVerified());
+
+        String res = IOUtils.readURL(get(SupportUserDetailsPage.PATH + id));
+        assertEquals(2, countRegex(res, Pattern.quote(email)));
+        assertEquals(1, countRegex(res, Pattern.quote(email2)));
+
+        User.getById(id).updateDefaultEmail(ea);
+        clearCaches();
+        res = IOUtils.readURL(get(SupportUserDetailsPage.PATH + id));
+        assertEquals(1, countRegex(res, Pattern.quote(email)));
+        assertEquals(2, countRegex(res, Pattern.quote(email2)));
+    }
+
     @Test
     public void testUserDetailsEdit() throws MalformedURLException, IOException {
         String email = createUniqueName() + "@example.com";
@@ -48,25 +77,84 @@ public class TestSEAdminPageDetails extends ClientTest {
         int id = createVerifiedUser(fname, lname, email, TEST_PASSWORD);
 
         String userCookie = login(email, TEST_PASSWORD);
-        assertEquals("Först", getFname(IOUtils.readURL(get(userCookie, MyDetails.PATH, 0))));
+        assertEquals("Först", getFname(IOUtils.readURL(get(userCookie, MyDetails.PATH))));
         // User can change his name
         assertNull(executeBasicWebInteraction(userCookie, MyDetails.PATH, "fname=Kurti&lname=Hansel&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
-        assertEquals("Kurti", getFname(IOUtils.readURL(get(userCookie, MyDetails.PATH, 0))));
+        assertEquals("Kurti", getFname(IOUtils.readURL(get(userCookie, MyDetails.PATH))));
         // But when assurer
         makeAssurer(id);
         // User cannot change his name, and the form changed
         assertNotNull(executeBasicWebInteraction(userCookie, MyDetails.PATH, "fname=Kurti2&lname=Hansel&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
-        assertNull(getFname(IOUtils.readURL(get(userCookie, MyDetails.PATH, 0))));
-        assertEquals("Kurti", getFnamePlain(IOUtils.readURL(get(userCookie, MyDetails.PATH, 0))));
+        assertNull(getFname(IOUtils.readURL(get(userCookie, MyDetails.PATH))));
+        assertEquals("Kurti", getFnamePlain(IOUtils.readURL(get(userCookie, MyDetails.PATH))));
 
         // but support still can
         assertNull(executeBasicWebInteraction(cookie, SupportUserDetailsPage.PATH + id, "fname=Kurti3&lname=Hansel&mname=&suffix=&dobd=1&dobm=2&doby=2000&detailupdate", 0));
-        assertEquals("Kurti3", getFnamePlain(IOUtils.readURL(get(userCookie, MyDetails.PATH, 0))));
+        assertEquals("Kurti3", getFnamePlain(IOUtils.readURL(get(userCookie, MyDetails.PATH))));
+
+    }
 
+    @Test
+    public void testUserDetailsEditToLog() throws MalformedURLException, IOException {
+        String email = createUniqueName() + "@example.com";
+        String fname = "Först";
+        String lname = "Secönd";
+        int id = createVerifiedUser(fname, lname, email, TEST_PASSWORD);
+        String clientCookie = login(email, TEST_PASSWORD);
+
+        assertEquals(0, logCountAdmin(id));
+        assertEquals(0, logCountUser(clientCookie));
+        // chaniging both leads to 2 entries
+        assertNull(executeBasicWebInteraction(cookie, SupportUserDetailsPage.PATH + id, "fname=Kurti&lname=Hansel&mname=&suffix=&dobd=1&dobm=2&doby=2000&detailupdate", 0));
+        assertEquals(2, logCountAdmin(id));
+        assertEquals(2, logCountUser(clientCookie));
+
+        // Sending same data keeps same
+        assertNull(executeBasicWebInteraction(cookie, SupportUserDetailsPage.PATH + id, "fname=Kurti&lname=Hansel&mname=&suffix=&dobd=1&dobm=2&doby=2000&detailupdate", 0));
+        assertEquals(2, logCountAdmin(id));
+        assertEquals(2, logCountUser(clientCookie));
+
+        // changing one leads to one entry
+        assertNull(executeBasicWebInteraction(cookie, SupportUserDetailsPage.PATH + id, "fname=Kurti2&lname=Hansel&mname=&suffix=&dobd=1&dobm=2&doby=2000&detailupdate", 0));
+        assertEquals(3, logCountAdmin(id));
+        assertEquals(3, logCountUser(clientCookie));
+
+        // changing one leads to one entry
+        assertNull(executeBasicWebInteraction(cookie, SupportUserDetailsPage.PATH + id, "fname=Kurti2&lname=Hansel&mname=&suffix=&dobd=2&dobm=2&doby=2000&detailupdate", 0));
+        assertEquals(4, logCountAdmin(id));
+        assertEquals(4, logCountUser(clientCookie));
+
+        // changing none -> no entry
+        assertNull(executeBasicWebInteraction(cookie, SupportUserDetailsPage.PATH + id, "fname=Kurti2&lname=Hansel&mname=&suffix=&dobd=2&dobm=2&doby=2000&detailupdate", 0));
+        assertEquals(4, logCountAdmin(id));
+        assertEquals(4, logCountUser(clientCookie));
+
+    }
+
+    private int logCountAdmin(int id) throws IOException {
+        return getLogEntryCount(IOUtils.readURL(get(History.SUPPORT_PATH.replace("*", Integer.toString(id)))));
+    }
+
+    private int logCountUser(String cookie) throws IOException {
+        return getLogEntryCount(IOUtils.readURL(get(cookie, History.PATH)));
+    }
+
+    private int getLogEntryCount(String readURL) {
+        String s = "<tr><th>Support actions";
+        int start = readURL.indexOf(s);
+        int end = readURL.indexOf("</table>", start);
+        String logs = readURL.substring(start + s.length(), end);
+        int i = 0;
+        int c = -1;
+        while (i != -1) {
+            i = logs.indexOf("<tr>", i + 1);
+            c++;
+        }
+        return c;
     }
 
     private String getFname(String res) {
-        Pattern p = Pattern.compile("<input type=\"text\" name=\"fname\" value=\"([^\"]*)\">");
+        Pattern p = Pattern.compile("type=\"text\" name=\"fname\" value=\"([^\"]*)\">");
         Matcher m = p.matcher(res);
         if (m.find()) {
             return m.group(1);
@@ -75,7 +163,7 @@ public class TestSEAdminPageDetails extends ClientTest {
     }
 
     private String getFnamePlain(String res) {
-        Pattern p = Pattern.compile("\\s*<td width=\"125\">First Name: </td>\\s*<td width=\"125\">([^<]*)</td>");
+        Pattern p = Pattern.compile("\\s*<td[^>]*>First Name: </td>\\s*<td[^>]*>([^<]*)</td>");
         Matcher m = p.matcher(res);
         if (m.find()) {
             return m.group(1);