Merge "upd: redesign of find cert result page"

[gigi.git] / tests / club / wpia / gigi / pages / admin / TestSEAdminPageCertSearch.java

diff --git a/tests/club/wpia/gigi/pages/admin/TestSEAdminPageCertSearch.java b/tests/club/wpia/gigi/pages/admin/TestSEAdminPageCertSearch.java
index cf9b403b253aa6438b7c38f0483e39832b0120ae..0d556419bbdd8095139b60928eda63925bce1f39 100644 (file)
--- a/tests/club/wpia/gigi/pages/admin/TestSEAdminPageCertSearch.java
+++ b/tests/club/wpia/gigi/pages/admin/TestSEAdminPageCertSearch.java
@@ -1,5 +1,6 @@
 package club.wpia.gigi.pages.admin;
 
+import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
@@ -89,6 +90,24 @@ public class TestSEAdminPageCertSearch extends SEClientTest {
         assertThat(result, CoreMatchers.containsString("N/A"));
     }
 
+    @Test
+    public void testShowDraft() throws GeneralSecurityException, IOException, GigiApiException, InterruptedException {
+        KeyPair kp = generateKeypair();
+        String key = generatePEMCSR(kp, "CN=" + certMail);
+        Certificate c1 = new Certificate(u, u, Certificate.buildDN("CN", certMail), Digest.SHA512, key, CSRType.CSR, getClientProfile(), new Certificate.SubjectAlternateName(SANType.EMAIL, certMail));
+        URLConnection uc = post(cookie, FindCertPage.PATH, "certType=email&process=Next&cert=" + URLEncoder.encode(certMail, "UTF-8"), 0);
+        String result = IOUtils.readURL(uc);
+        assertThat(result, CoreMatchers.containsString(c.getSerial()));
+        assertThat(result, CoreMatchers.containsString("Draft"));
+
+        await(c1.issue(null, "2y", u));
+        uc = post(cookie, FindCertPage.PATH, "certType=email&process=Next&cert=" + URLEncoder.encode(certMail, "UTF-8"), 0);
+        result = IOUtils.readURL(uc);
+        assertThat(result, CoreMatchers.containsString(c.getSerial()));
+        assertThat(result, CoreMatchers.containsString(c1.getSerial()));
+        assertThat(result, not(CoreMatchers.containsString("Draft")));
+    }
+
     private Certificate createCertificate() throws GeneralSecurityException, IOException, GigiApiException, InterruptedException {
         User u1 = User.getById(id);
         KeyPair kp = generateKeypair();