X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FRegisterPageTest.java;h=9fb618300b5e1c04761b027b61fa1cc55682f073;hb=d7c0f42f9a60ae6dfff83d1f01e547bbf5681c0d;hp=331aad38418c2ae012b3003fb11de8240deca262;hpb=53d9194f480a4351e6b80551fc2aa537e7d5b039;p=gigi.git
diff --git a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
index 331aad38..9fb61830 100644
--- a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
+++ b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
@@ -32,7 +32,9 @@ public class RegisterPageTest extends ManagedTest {
public static final String p;
@Before
- public void setUp() throws Exception {}
+ public void setUp() throws Exception {
+ clearCaches(); // We do many registers in this test suite.
+ }
private static String createBase() {
return createUniqueName() + "@email.de";
@@ -46,7 +48,7 @@ public class RegisterPageTest extends ManagedTest {
String defaultSignup = "fname=" + URLEncoder.encode("ab", "UTF-8") + "&lname=" + URLEncoder.encode("b", "UTF-8") + "&pword1=" + URLEncoder.encode(TEST_PASSWORD, "UTF-8") + "&pword2=" + URLEncoder.encode(TEST_PASSWORD, "UTF-8") + "&day=1&month=1&year=1910&tos_agree=1&mname=mn&suffix=sf&email=";
- String query = defaultSignup + URLEncoder.encode("correct3_" + uniq + "@email.de", "UTF-8") + "&general=1&country=1®ional=1&radius=1";
+ String query = defaultSignup + URLEncoder.encode("correct3_" + uniq + "@email.de", "UTF-8") + "&general=1&country=1®ional=1&radius=1&name-type=western";
String data = fetchStartErrorMessage(runRegister(query));
assertNull(data);
assertSuccessfullRegMail();
@@ -139,19 +141,32 @@ public class RegisterPageTest extends ManagedTest {
public void testTooYoung() throws IOException {
Calendar c = GregorianCalendar.getInstance();
c.add(Calendar.YEAR, -User.MINIMUM_AGE + 2);
- testFailedForm("fname=a&lname=b&email=" + createUniqueName() + "@email.de" + p + "&day=1&month=1&year=" + c.get(Calendar.YEAR) + "&tos_agree=1");
+ testFailedForm("fname=a&lname=b&email=" + createUniqueName() + "@email.de" + p + "&day=" + c.get(Calendar.DAY_OF_MONTH) + "&month=" + (c.get(Calendar.MONTH) + 1) + "&year=" + c.get(Calendar.YEAR) + "&tos_agree=1");
+ }
+
+ @Test
+ public void testTooOld() throws IOException {
+ Calendar c = GregorianCalendar.getInstance();
+ c.add(Calendar.YEAR, -User.MAXIMUM_PLAUSIBLE_AGE);
+ c.add(Calendar.DAY_OF_MONTH, -1);
+ testFailedForm("fname=a&lname=b&email=" + createUniqueName() + "@email.de" + p + "&day=" + c.get(Calendar.DAY_OF_MONTH) + "&month=" + (c.get(Calendar.MONTH) + 1) + "&year=" + c.get(Calendar.YEAR) + "&tos_agree=1");
}
@Test
public void testDataStays() throws IOException {
long uniq = System.currentTimeMillis();
- String run = runRegister("fname=fn" + uniq + "&lname=ln" + uniq + "&email=ma" + uniq + "@cacert.org&pword1=pas" + uniq + "&pword2=pas2" + uniq + "&day=1&month=1&year=0");
+ String run = runRegister("fname=fn" + uniq + "&lname=ln" + uniq + "&email=ma" + uniq + "@cacert.org&pword1=pas" + uniq + "&pword2=pas2" + uniq + "&day=28&month=10&year=1950");
assertThat(run, containsString("fn" + uniq));
assertThat(run, containsString("ln" + uniq));
assertThat(run, containsString("ma" + uniq + "@cacert.org"));
assertThat(run, not(containsString("pas" + uniq)));
assertThat(run, not(containsString("pas2" + uniq)));
-
+ // test year
+ assertThat(run, containsString("name=\"year\" value=\"1950\""));
+ // test month
+ assertThat(run, containsString(""));
}
@Test
@@ -197,4 +212,31 @@ public class RegisterPageTest extends ManagedTest {
assertTrue(startError, !startError.startsWith(""));
}
+ @Test
+ public void testRegisterWithCountry() throws IOException, InterruptedException {
+ long uniq = System.currentTimeMillis();
+ String email = "country" + uniq + "@email.de";
+
+ String defaultSignup = "fname=" + URLEncoder.encode("ab", "UTF-8") + "&lname=" + URLEncoder.encode("b", "UTF-8") + "&pword1=" + URLEncoder.encode(TEST_PASSWORD, "UTF-8") + "&pword2=" + URLEncoder.encode(TEST_PASSWORD, "UTF-8") + "&day=1&month=1&year=1910&tos_agree=1&mname=mn&suffix=sf&email=";
+
+ String query = defaultSignup + URLEncoder.encode(email, "UTF-8") + "&general=1&country=1®ional=1&radius=1&name-type=western&residenceCountry=DE";
+ String data = fetchStartErrorMessage(runRegister(query));
+ assertNull(data);
+ User u = User.getByEmail(email);
+ assertEquals("DE", u.getResidenceCountry().getCode());
+ }
+
+ @Test
+ public void testRegisterWithoutCountry() throws IOException, InterruptedException {
+ long uniq = System.currentTimeMillis();
+ String email = "countryno" + uniq + "@email.de";
+
+ String defaultSignup = "fname=" + URLEncoder.encode("ab", "UTF-8") + "&lname=" + URLEncoder.encode("b", "UTF-8") + "&pword1=" + URLEncoder.encode(TEST_PASSWORD, "UTF-8") + "&pword2=" + URLEncoder.encode(TEST_PASSWORD, "UTF-8") + "&day=1&month=1&year=1910&tos_agree=1&mname=mn&suffix=sf&email=";
+
+ String query = defaultSignup + URLEncoder.encode(email, "UTF-8") + "&general=1&country=1®ional=1&radius=1&name-type=western&residenceCountry=invalid";
+ String data = fetchStartErrorMessage(runRegister(query));
+ assertNull(data);
+ User u = User.getByEmail(email);
+ assertEquals(null, u.getResidenceCountry());
+ }
}