X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FTestOrgManagement.java;h=9700271276bca2eefe4730b8b53280fa088d83e5;hb=46f79afcdf6712a830db12c6859ed91111a9b464;hp=4b8556c02cc78c90fa105c1ec59b3c082a5e39d4;hpb=a515b0fa4bd4cb4f636d3a60c7f66ca9e16de67c;p=gigi.git

diff --git a/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java b/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java
index 4b8556c0..97002712 100644
--- a/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java
+++ b/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java
@@ -4,7 +4,9 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.sql.SQLException;
@@ -36,13 +38,15 @@ public class TestOrgManagement extends OrgTest {
         for (Organisation i : Organisation.getOrganisations(0, 30)) {
             i.delete();
         }
-        executeBasicWebInteraction(cookie, CreateOrgPage.DEFAULT_PATH, "action=new&O=name&contact=mail&L=K%C3%B6ln&ST=%C3%9C%C3%96%C3%84%C3%9F&C=DE&comments=jkl%C3%B6loiuzfdfgjlh%C3%B6", 0);
+        executeBasicWebInteraction(cookie, CreateOrgPage.DEFAULT_PATH, "action=new&O=name&contact=mail@serv.tld&L=K%C3%B6ln&ST=" + URLEncoder.encode(DIFFICULT_CHARS, "UTF-8") + "&C=DE&comments=jkl%C3%B6loiuzfdfgjlh%C3%B6&optionalName=opname&postalAddress=postaladdress", 0);
         Organisation[] orgs = Organisation.getOrganisations(0, 30);
         assertEquals(1, orgs.length);
-        assertEquals("mail", orgs[0].getContactEmail());
+        assertEquals("mail@serv.tld", orgs[0].getContactEmail());
         assertEquals("name", orgs[0].getName());
         assertEquals("Köln", orgs[0].getCity());
-        assertEquals("ÜÖÄß", orgs[0].getProvince());
+        assertEquals(DIFFICULT_CHARS, orgs[0].getProvince());
+        assertEquals("opname", orgs[0].getOptionalName());
+        assertEquals("postaladdress", orgs[0].getPostalAddress());
 
         User u2 = User.getById(createAssuranceUser("testworker", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD));
         executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + orgs[0].getId(), "email=" + URLEncoder.encode(u2.getEmail(), "UTF-8") + "&do_affiliate=y&master=y", 1);
@@ -137,4 +141,104 @@ public class TestOrgManagement extends OrgTest {
         assertEquals(0, o1.getAllAdmins().size());
         o1.delete();
     }
+
+    @Test
+    public void testUpdateOrgCertData() throws IOException, GigiApiException {
+        Organisation o1 = createUniqueOrg();
+        o1.updateCertData("name", "DE", DIFFICULT_CHARS, "Köln");
+        assertEquals("name", o1.getName());
+        assertEquals("DE", o1.getState());
+        assertEquals(DIFFICULT_CHARS, o1.getProvince());
+        assertEquals("Köln", o1.getCity());
+        o1.delete();
+    }
+
+    @Test
+    public void testUpdateOrgData() throws IOException, GigiApiException {
+        Organisation o1 = createUniqueOrg();
+        o1.updateOrgData("mail", "opname", "Köln" + DIFFICULT_CHARS);
+        assertEquals("mail", o1.getContactEmail());
+        assertEquals("opname", o1.getOptionalName());
+        assertEquals("Köln" + DIFFICULT_CHARS, o1.getPostalAddress());
+        o1.delete();
+    }
+
+    /**
+     * Tests various contraints on organisaion fields.
+     */
+    @Test
+    public void testLengthConstraint() throws IOException, GigiApiException {
+        Organisation o1 = createUniqueOrg();
+        String str128 = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz-_";
+        String se = "";
+        String s64 = str128.substring(0, 64);
+        String s65 = str128.substring(0, 65);
+
+        String s128 = str128;
+        String s129 = str128 + "a";
+
+        assertNull(upCertData(o1, o1.getName(), o1.getState(), o1.getProvince(), o1.getCity()));
+
+        // test organisation name
+        assertNotNull(upCertData(o1, "", o1.getState(), o1.getProvince(), o1.getCity()));
+        assertNull(upCertData(o1, "A", o1.getState(), o1.getProvince(), o1.getCity()));
+        assertNull(upCertData(o1, s64, o1.getState(), o1.getProvince(), o1.getCity()));
+        assertNotNull(upCertData(o1, s65, o1.getState(), o1.getProvince(), o1.getCity()));
+
+        // test state
+        assertNotNull(upCertData(o1, o1.getName(), o1.getState(), se, o1.getCity()));
+        assertNull(upCertData(o1, o1.getName(), o1.getState(), "A", o1.getCity()));
+        assertNull(upCertData(o1, o1.getName(), o1.getState(), s128, o1.getCity()));
+        assertNotNull(upCertData(o1, o1.getName(), o1.getState(), s129, o1.getCity()));
+
+        // test town
+        assertNotNull(upCertData(o1, o1.getName(), o1.getState(), o1.getProvince(), se));
+        assertNull(upCertData(o1, o1.getName(), o1.getState(), o1.getProvince(), "A"));
+        assertNull(upCertData(o1, o1.getName(), o1.getState(), o1.getProvince(), s128));
+        assertNotNull(upCertData(o1, o1.getName(), o1.getState(), o1.getProvince(), s129));
+
+        // test country
+        assertNotNull(upCertData(o1, o1.getName(), "", o1.getProvince(), o1.getCity()));
+        assertNotNull(upCertData(o1, o1.getName(), "D", o1.getProvince(), o1.getCity()));
+        assertNull(upCertData(o1, o1.getName(), "DE", o1.getProvince(), o1.getCity()));
+        assertNotNull(upCertData(o1, o1.getName(), "DES", o1.getProvince(), o1.getCity()));
+
+        // test contact mail
+        assertNull(upOptData(o1, o1.getContactEmail()));
+        assertNotNull(upOptData(o1, "_mail@domail"));
+
+    }
+
+    /**
+     * Updates Organisation optional data via web interface.
+     * 
+     * @param o1
+     *            Organisation to update.
+     * @param email
+     *            the new contact email
+     * @return an error message or <code>null</code>
+     */
+    private String upOptData(Organisation o1, String email) throws IOException, MalformedURLException, UnsupportedEncodingException {
+        return executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + o1.getId(), "action=updateOrganisationData&contact=" + email + "&optionalName=" + o1.getOptionalName() + "&postalAddress=" + o1.getPostalAddress(), 0);
+    }
+
+    /**
+     * Updates Organisation certificate data via web interface.
+     * 
+     * @param o1
+     *            Organisation to update.
+     * @param o
+     *            the new name
+     * @param c
+     *            the new country
+     * @param province
+     *            the new "province/state"
+     * @param ct
+     *            the new city or "locality"
+     * @return an error message or <code>null</code>
+     */
+    private String upCertData(Organisation o1, String o, String c, String province, String ct) throws IOException, MalformedURLException, UnsupportedEncodingException {
+        return executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + o1.getId(), "action=updateCertificateData&O=" + o + "&C=" + c + "&ST=" + province + "&L=" + ct, 0);
+    }
+
 }