X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FTestAssurance.java;h=0af859ccc979ad664a0cc47a682ae9365ce25bba;hb=d3fae2244debf99eb93281c7302e8bd397868c49;hp=b950389b07c9922c16667496fa815f2f78920ebb;hpb=2a62920f111cb873e4b67ca57449f95e654a96e2;p=gigi.git

diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/org/cacert/gigi/pages/wot/TestAssurance.java
index b950389b..0af859cc 100644
--- a/tests/org/cacert/gigi/pages/wot/TestAssurance.java
+++ b/tests/org/cacert/gigi/pages/wot/TestAssurance.java
@@ -18,11 +18,13 @@ import java.util.regex.Pattern;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.GigiPreparedStatement;
-import org.cacert.gigi.dbObjects.CountryCode;
+import org.cacert.gigi.dbObjects.Country;
+import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.testUtils.IOUtils;
 import org.cacert.gigi.testUtils.ManagedTest;
+import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail;
 import org.cacert.gigi.util.DayDate;
 import org.cacert.gigi.util.Notary;
 import org.hamcrest.Matcher;
@@ -236,7 +238,7 @@ public class TestAssurance extends ManagedTest {
         String resp = IOUtils.readURL(url);
         resp = resp.split(Pattern.quote("</table>"))[1];
         assertThat(resp, containsString(uniqueLoc));
-        assertThat(resp, containsString(CountryCode.getCountryCode("DE", CountryCode.CountryCodeType.CODE_2_CHARS).getCountry()));
+        assertThat(resp, containsString(Country.getCountryByCode("DE", Country.CountryCodeType.CODE_2_CHARS).getName()));
     }
 
     @Test
@@ -248,7 +250,7 @@ public class TestAssurance extends ManagedTest {
         String resp = IOUtils.readURL(url);
         resp = resp.split(Pattern.quote("</table>"))[2];
         assertThat(resp, containsString(uniqueLoc));
-        assertThat(resp, containsString(CountryCode.getCountryCode("DE", CountryCode.CountryCodeType.CODE_2_CHARS).getCountry()));
+        assertThat(resp, containsString(Country.getCountryByCode("DE", Country.CountryCodeType.CODE_2_CHARS).getName()));
     }
 
     private void executeFails(String query) throws MalformedURLException, IOException {
@@ -323,4 +325,52 @@ public class TestAssurance extends ManagedTest {
         executeFails("date=" + validVerificationDateString() + "&location=testcase&countryCode=&certify=1&rules=1&assertion=1&points=10");
     }
 
+    @Test
+    public void testRANotificationSet() throws IOException, GigiApiException {
+        getMailReceiver().clearMails();
+
+        User users[] = User.findByEmail(assurerM);
+        assertTrue("user RA Agent not found", users != null && users.length > 0);
+
+        User u = users[0];
+        u.grantGroup(u, Group.VERIFY_NOTIFICATION);
+        clearCaches();
+        cookie = login(assurerM, TEST_PASSWORD);
+
+        String targetMail = u.getEmail();
+
+        // enter verification
+        String uniqueLoc = createUniqueName();
+        executeSuccess("date=" + validVerificationDateString() + "&location=" + uniqueLoc + "&countryCode=DE&certify=1&rules=1&assertion=1&points=10");
+        TestMail tm;
+
+        do {
+            tm = getMailReceiver().receive();
+        } while ( !tm.getTo().equals(targetMail));
+        assertThat(tm.getMessage(), containsString("You entered a verification for the account with email address " + assureeM));
+
+    }
+
+    @Test
+    public void testRANotificationNotSet() throws IOException, GigiApiException {
+        getMailReceiver().clearMails();
+
+        User users[] = User.findByEmail(assurerM);
+        assertTrue("user RA Agent not found", users != null && users.length > 0);
+
+        User u = users[0];
+        u.revokeGroup(u, Group.VERIFY_NOTIFICATION);
+        clearCaches();
+        cookie = login(assurerM, TEST_PASSWORD);
+
+        // enter verification
+        String uniqueLoc = createUniqueName();
+        executeSuccess("date=" + validVerificationDateString() + "&location=" + uniqueLoc + "&countryCode=DE&certify=1&rules=1&assertion=1&points=10");
+
+        TestMail tm;
+
+        tm = getMailReceiver().receive();
+        assertThat(tm.getMessage(), not(containsString("You entered a verification for the account with email address " + assureeM)));
+
+    }
 }