add: new test cases for handling of residence country in user account

Change-Id: I8314cd0cd19f07a7145ca2c4481b24614f28f79e

diff --git a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
index e2b8b9ab0bb122460ab97af46d2434aa7731e6c5..b0fb4b96e91b9822798976c20676e6595d099feb 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
+++ b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
@@ -94,4 +94,18 @@ public class TestMyDetailsEdit extends ManagedTest {
         c.add(Calendar.DAY_OF_MONTH, -1);
         assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "day=" + c.get(Calendar.DAY_OF_MONTH) + "&month=" + (c.get(Calendar.MONTH) + 1) + "&year=" + c.get(Calendar.YEAR) + "&action=updateDoB", 0));
     }
+
+    @Test
+    public void testChangeResidenceCountry() throws IOException {
+        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "residenceCountry=DE&action=updateResidenceCountry", 0));
+        User user = User.getById(id);
+        assertEquals("DE", user.getResidenceCountry().getCountryCode());
+    }
+
+    @Test
+    public void testChangeResidenceCountryToNull() throws IOException {
+        User user = User.getById(id);
+        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "residenceCountry=invalid&action=updateResidenceCountry", 0));
+        assertEquals(null, user.getResidenceCountry());
+    }
 }

diff --git a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
index f440bc8de2f67ec6297686830ac1cb515336b761..eba981237f9fd2117a44063f1308ab93b5abb1d1 100644 (file)
--- a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
+++ b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
@@ -212,4 +212,31 @@ public class RegisterPageTest extends ManagedTest {
         assertTrue(startError, !startError.startsWith("</div>"));
     }
 
+    @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&regional=1&radius=1&name-type=western&residenceCountry=DE";
+        String data = fetchStartErrorMessage(runRegister(query));
+        assertNull(data);
+        User u = User.getByEmail(email);
+        assertEquals("DE", u.getResidenceCountry().getCountryCode());
+    }
+
+    @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&regional=1&radius=1&name-type=western&residenceCountry=invalid";
+        String data = fetchStartErrorMessage(runRegister(query));
+        assertNull(data);
+        User u = User.getByEmail(email);
+        assertEquals(null, u.getResidenceCountry());
+    }
 }