add: more tests for revocation by support

Change-Id: I1022e5e6cb743f1009f40157f9d9ce72645223fa

diff --git a/tests/club/wpia/gigi/pages/admin/TestSEAdminPageCertSearch.java b/tests/club/wpia/gigi/pages/admin/TestSEAdminPageCertSearch.java
index a42aef84f938e9ceb3e7a403802a83657684705e..dd7d1970614d99291c172da74418857087abc3ea 100644 (file)
--- a/tests/club/wpia/gigi/pages/admin/TestSEAdminPageCertSearch.java
+++ b/tests/club/wpia/gigi/pages/admin/TestSEAdminPageCertSearch.java
@@ -24,6 +24,7 @@ import club.wpia.gigi.pages.admin.support.FindCertPage;
 import club.wpia.gigi.pages.admin.support.SupportEnterTicketPage;
 import club.wpia.gigi.testUtils.ClientTest;
 import club.wpia.gigi.testUtils.IOUtils;
+import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail;
 import club.wpia.gigi.util.ServerConstants;
 import club.wpia.gigi.util.ServerConstants.Host;
 
@@ -72,6 +73,22 @@ public class TestSEAdminPageCertSearch extends ClientTest {
     public void testRevoke() throws IOException {
         URLConnection conn = post(Certificates.SUPPORT_PATH + "/" + c.getSerial(), "action=revoke");
         assertEquals("https://" + ServerConstants.getHostNamePortSecure(Host.WWW) + Certificates.SUPPORT_PATH + "/" + c.getSerial(), conn.getHeaderField("Location"));
+        boolean hadSupport = false;
+        boolean hadUser = false;
+        for (int i = 0; i < 2; i++) {
+            TestMail tm = getMailReceiver().receive();
+            if (tm.getTo().equals(ServerConstants.getSupportMailAddress())) {
+                hadSupport = true;
+            } else if (tm.getTo().equals(certMail)) {
+                hadUser = true;
+            } else {
+                throw new Error("Unknown mail:" + tm.getTo());
+            }
+            assertThat(tm.getMessage(), CoreMatchers.containsString(certMail));
+            assertThat(tm.getMessage(), CoreMatchers.containsString(c.getSerial()));
+        }
+        assertTrue(hadSupport);
+        assertTrue(hadUser);
         assertEquals(CertificateStatus.REVOKED, c.getStatus());
     }
 

diff --git a/tests/club/wpia/gigi/testUtils/ConfiguredTest.java b/tests/club/wpia/gigi/testUtils/ConfiguredTest.java
index 483f25e1d80a99deb37029e538ce4840ae7f61fc..4dd091edd1aeb881f766f01826ee219c91a6a500 100644 (file)
--- a/tests/club/wpia/gigi/testUtils/ConfiguredTest.java
+++ b/tests/club/wpia/gigi/testUtils/ConfiguredTest.java
@@ -131,6 +131,7 @@ public abstract class ConfiguredTest {
         mainProps.setProperty("name.www", testProps.getProperty("name.www"));
         mainProps.setProperty("name.static", testProps.getProperty("name.static"));
         mainProps.setProperty("name.api", testProps.getProperty("name.api"));
+        mainProps.setProperty("name.suffix", testProps.getProperty("name.suffix"));
 
         mainProps.setProperty("appName", "SomeCA");
         mainProps.setProperty("appIdentifier", "someca");