upd: extend add 100 assurance points to be flexible

fixes issue #81

Change-Id: I72a3ac9e9ad6c0650a474dfc930f0bd0a61861a6

diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index 6889bfbe908ba43aef89a43df2c831c1dac26374..c50fd709066380617f338675ec154499ca018df2 100644 (file)
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -265,19 +265,44 @@ public class Manager extends Page {
             resp.getWriter().println("Test '" + test.getDisplayName() + "' was added to user account.");
         } else if (req.getParameter("assure") != null) {
             String mail = req.getParameter("assureEmail");
             resp.getWriter().println("Test '" + test.getDisplayName() + "' was added to user account.");
         } else if (req.getParameter("assure") != null) {
             String mail = req.getParameter("assureEmail");

+            String verificationPoints = req.getParameter("verificationPoints");

             User byEmail = User.getByEmail(mail);
             User byEmail = User.getByEmail(mail);

+

             if (byEmail == null) {
                 resp.getWriter().println("User not found.");
                 return;
             }
             if (byEmail == null) {
                 resp.getWriter().println("User not found.");
                 return;
             }

+
+            int vp = 0;
+            int agentNumber = 0;
+

             try {
             try {

-                for (int i = 0; i < 10; i++) {
-                    Notary.assure(getAssurer(i), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), 10, "Testmanager Assure up code", "2014-11-06", AssuranceType.FACE_TO_FACE);
+                try {
+                    vp = Integer.parseInt(verificationPoints);
+                } catch (NumberFormatException e) {
+                    throw new GigiApiException("No valid Verification Points entered.");

                 }
                 }

+
+                if (vp > 100) { // only allow max 100 Verification points
+                    vp = 100;
+                }
+
+                while (vp > 0) {
+                    int currentVP = 10;
+                    if (vp < 10) {
+                        currentVP = vp;
+                    }
+                    Notary.assure(getAssurer(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Assure up code", "2014-11-06", AssuranceType.FACE_TO_FACE);
+                    agentNumber += 1;
+                    vp -= currentVP;
+                }
+

             } catch (GigiApiException e) {
                 throw new Error(e);
             }
             } catch (GigiApiException e) {
                 throw new Error(e);
             }

-            resp.getWriter().println("User has been assured.");
+
+            resp.getWriter().println("User has been assured " + agentNumber + " times.");
+

         } else if (req.getParameter("letassure") != null) {
             String mail = req.getParameter("letassureEmail");
             User byEmail = User.getByEmail(mail);
         } else if (req.getParameter("letassure") != null) {
             String mail = req.getParameter("letassureEmail");
             User byEmail = User.getByEmail(mail);

diff --git a/util-testing/org/cacert/gigi/pages/Manager.templ b/util-testing/org/cacert/gigi/pages/Manager.templ
index d1cb1f62732ae612d2c55b27ad5d3341d8e7ea81..affc73ddc9512761e7233d7668788010d082a0fd 100644 (file)
--- a/util-testing/org/cacert/gigi/pages/Manager.templ
+++ b/util-testing/org/cacert/gigi/pages/Manager.templ
@@ -57,7 +57,8 @@ Add 100 Assurance points:
 </td><td>
 Email: <input type="text" name="assureEmail"/>
 </td><td>
 </td><td>
 Email: <input type="text" name="assureEmail"/>
 </td><td>

-<input type="submit" value="Assure 100 Points" name="assure"/>
+Verification Points to issue: <input type="text" name="verificationPoints" value="100"/>
+<input type="submit" value="Add Points" name="assure"/>

 </td></tr>
 
 <tr><td>
 </td></tr>
 
 <tr><td>