X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FTestOrgManagement.java;h=65951dc8fe7abab569a9dbdc2e4ee73f526f3740;hp=4e606ae7abdd79fdaeab6ce32b5c761e101ce3d8;hb=d0470c5987aaecbc444c7100319df69b6f740680;hpb=bb73860be30af60fdcc26709066d932f91cb02fc
diff --git a/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java b/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java
index 4e606ae7..65951dc8 100644
--- a/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java
+++ b/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java
@@ -13,6 +13,8 @@ import java.sql.SQLException;
import java.util.List;
import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.dbObjects.Country;
+import org.cacert.gigi.dbObjects.Country.CountryCodeType;
import org.cacert.gigi.dbObjects.Organisation;
import org.cacert.gigi.dbObjects.Organisation.Affiliation;
import org.cacert.gigi.dbObjects.User;
@@ -24,7 +26,7 @@ import org.junit.Test;
public class TestOrgManagement extends OrgTest {
- public TestOrgManagement() throws IOException {
+ public TestOrgManagement() throws IOException, GigiApiException {
}
@@ -118,7 +120,7 @@ public class TestOrgManagement extends OrgTest {
Organisation o1 = createUniqueOrg();
o1.addAdmin(u3, u, true);
try {
- // must fail because u4 is no assurer
+ // must fail because u4 is no RA-Agent
o1.addAdmin(u4_dummy, u3, false);
fail("No exception!");
} catch (GigiApiException e) {
@@ -131,7 +133,7 @@ public class TestOrgManagement extends OrgTest {
} catch (GigiApiException e) {
}
try {
- // must fail because u4 is no assurer
+ // must fail because u4 is no RA-Agent
o1.addAdmin(u4_dummy, u, false);
fail("No exception!");
} catch (GigiApiException e) {
@@ -145,9 +147,9 @@ public class TestOrgManagement extends OrgTest {
@Test
public void testUpdateOrgCertData() throws IOException, GigiApiException {
Organisation o1 = createUniqueOrg();
- o1.updateCertData("name", "DE", DIFFICULT_CHARS, "Köln");
+ o1.updateCertData("name", Country.getCountryByCode("DE", CountryCodeType.CODE_2_CHARS), DIFFICULT_CHARS, "Köln");
assertEquals("name", o1.getName());
- assertEquals("DE", o1.getState());
+ assertEquals("DE", o1.getState().getCode());
assertEquals(DIFFICULT_CHARS, o1.getProvince());
assertEquals("Köln", o1.getCity());
o1.delete();
@@ -164,7 +166,7 @@ public class TestOrgManagement extends OrgTest {
}
/**
- * Tests various contraints on organisaion fields.
+ * Tests various contraints on organisation fields.
*/
@Test
public void testLengthConstraint() throws IOException, GigiApiException {
@@ -177,25 +179,25 @@ public class TestOrgManagement extends OrgTest {
String s128 = str128;
String s129 = str128 + "a";
- assertNull(upCertData(o1, o1.getName(), o1.getState(), o1.getProvince(), o1.getCity()));
+ assertNull(upCertData(o1, o1.getName(), null, 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()));
+ assertNotNull(upCertData(o1, "", null, o1.getProvince(), o1.getCity()));
+ assertNull(upCertData(o1, "A", null, o1.getProvince(), o1.getCity()));
+ assertNull(upCertData(o1, s64, null, o1.getProvince(), o1.getCity()));
+ assertNotNull(upCertData(o1, s65, null, 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()));
+ assertNotNull(upCertData(o1, o1.getName(), null, se, o1.getCity()));
+ assertNull(upCertData(o1, o1.getName(), null, "A", o1.getCity()));
+ assertNull(upCertData(o1, o1.getName(), null, s128, o1.getCity()));
+ assertNotNull(upCertData(o1, o1.getName(), null, 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));
+ assertNotNull(upCertData(o1, o1.getName(), null, o1.getProvince(), se));
+ assertNull(upCertData(o1, o1.getName(), null, o1.getProvince(), "A"));
+ assertNull(upCertData(o1, o1.getName(), null, o1.getProvince(), s128));
+ assertNotNull(upCertData(o1, o1.getName(), null, o1.getProvince(), s129));
// test country
assertNotNull(upCertData(o1, o1.getName(), "", o1.getProvince(), o1.getCity()));
@@ -234,7 +236,8 @@ public class TestOrgManagement extends OrgTest {
* @param o
* the new name
* @param c
- * the new country
+ * the new country or null
to keep the current
+ * country.
* @param province
* the new "province/state"
* @param ct
@@ -242,6 +245,9 @@ public class TestOrgManagement extends OrgTest {
* @return an error message or null
*/
private String upCertData(Organisation o1, String o, String c, String province, String ct) throws IOException, MalformedURLException, UnsupportedEncodingException {
+ if (c == null) {
+ c = o1.getState().getCode();
+ }
return executeBasicWebInteraction(cookie, ViewOrgPage.DEFAULT_PATH + "/" + o1.getId(), "action=updateCertificateData&O=" + o + "&C=" + c + "&ST=" + province + "&L=" + ct, 0);
}