X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FTestAssurance.java;h=4108cf8f12d04d5a0058919fdf24f7cca63578d0;hp=6a585abd4e1dc64acdae125289cc8bcb596be2b1;hb=1bcc2e29be77cc7347141997de16b90a672d5287;hpb=a8a6c492e30d4202e499778b69a5354494f86f84

diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/org/cacert/gigi/pages/wot/TestAssurance.java
index 6a585abd..4108cf8f 100644
--- a/tests/org/cacert/gigi/pages/wot/TestAssurance.java
+++ b/tests/org/cacert/gigi/pages/wot/TestAssurance.java
@@ -10,14 +10,19 @@ import java.net.MalformedURLException;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.regex.Pattern;
 
+import org.cacert.gigi.database.GigiPreparedStatement;
+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.util.DayDate;
+import org.hamcrest.Matcher;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -41,32 +46,36 @@ public class TestAssurance extends ManagedTest {
         cookie = login(assurerM, TEST_PASSWORD);
     }
 
+    private Matcher<String> isAssuranceForm() {
+        return containsString("<select name=\"assuranceType\">");
+    }
+
     @Test
     public void testAssureSearch() throws IOException {
         String loc = search("email=" + URLEncoder.encode(assureeM, "UTF-8") + "&day=1&month=1&year=1910");
-        assertTrue(loc, loc.contains("type=\"checkbox\" name=\"tos_agree\""));
+        assertThat(loc, isAssuranceForm());
     }
 
     @Test
     public void testAssureSearchEmail() throws IOException {
         String loc = search("email=1" + URLEncoder.encode(assureeM, "UTF-8") + "&day=1&month=1&year=1910");
-        assertTrue(loc, !loc.contains("type=\"checkbox\" name=\"tos_agree\""));
+        assertThat(loc, not(isAssuranceForm()));
     }
 
     @Test
     public void testAssureSearchDobInvalid() throws IOException {
         String loc = search("email=" + URLEncoder.encode(assureeM, "UTF-8") + "&day=1&month=1&year=mal");
-        assertNotNull(fetchStartErrorMessage(loc));
+        assertThat(loc, not(isAssuranceForm()));
     }
 
     @Test
     public void testAssureSearchDob() throws IOException {
         String loc = search("email=" + URLEncoder.encode(assureeM, "UTF-8") + "&day=2&month=1&year=1910");
-        assertTrue(loc, !loc.contains("type=\"checkbox\" name=\"tos_agree\""));
+        assertThat(loc, not(isAssuranceForm()));
         loc = search("email=" + URLEncoder.encode(assureeM, "UTF-8") + "&day=1&month=2&year=1910");
-        assertTrue(loc, !loc.contains("type=\"checkbox\" name=\"tos_agree\""));
+        assertThat(loc, not(isAssuranceForm()));
         loc = search("email=" + URLEncoder.encode(assureeM, "UTF-8") + "&day=1&month=1&year=1911");
-        assertTrue(loc, !loc.contains("type=\"checkbox\" name=\"tos_agree\""));
+        assertThat(loc, not(isAssuranceForm()));
     }
 
     private String search(String query) throws MalformedURLException, IOException, UnsupportedEncodingException {
@@ -80,14 +89,13 @@ public class TestAssurance extends ManagedTest {
 
     @Test
     public void testAssureForm() throws IOException {
-        String error = getError("date=2000-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
-        assertNull(error);
+        executeSuccess("date=2000-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10");
     }
 
     @Test
     public void testAssureFormContanisData() throws IOException {
         URLConnection uc = buildupAssureFormConnection(true);
-        uc.getOutputStream().write(("date=2000-01-01&location=testcase&rules=1&tos_agree=1&assertion=1&points=10").getBytes("UTF-8"));
+        uc.getOutputStream().write(("date=2000-01-01&location=testcase&rules=1&assertion=1&points=10").getBytes("UTF-8"));
         uc.getOutputStream().flush();
         String data = IOUtils.readURL(uc);
         assertThat(data, containsString("2000-01-01"));
@@ -98,7 +106,7 @@ public class TestAssurance extends ManagedTest {
     public void testAssureFormNoCSRF() throws IOException {
         // override csrf
         HttpURLConnection uc = (HttpURLConnection) buildupAssureFormConnection(false);
-        uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10").getBytes("UTF-8"));
+        uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10").getBytes("UTF-8"));
         uc.getOutputStream().flush();
         assertEquals(500, uc.getResponseCode());
     }
@@ -107,7 +115,7 @@ public class TestAssurance extends ManagedTest {
     public void testAssureFormWrongCSRF() throws IOException {
         // override csrf
         HttpURLConnection uc = (HttpURLConnection) buildupAssureFormConnection(false);
-        uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10&csrf=aragc").getBytes("UTF-8"));
+        uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10&csrf=aragc").getBytes("UTF-8"));
         uc.getOutputStream().flush();
         assertEquals(500, uc.getResponseCode());
     }
@@ -141,7 +149,7 @@ public class TestAssurance extends ManagedTest {
 
         assertNull(executeBasicWebInteraction(assureeCookie, MyDetails.PATH, newName + "&" + newDob + "&processDetails", 0));
 
-        uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10").getBytes("UTF-8"));
+        uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10").getBytes("UTF-8"));
         uc.getOutputStream().flush();
         String error = fetchStartErrorMessage(IOUtils.readURL(uc));
         if (succeed) {
@@ -156,8 +164,7 @@ public class TestAssurance extends ManagedTest {
     public void testAssureFormFuture() throws IOException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
         int year = Integer.parseInt(sdf.format(new Date(System.currentTimeMillis()))) + 2;
-        String error = getError("date=" + year + "-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
-        assertTrue(error, !error.startsWith("</div>"));
+        executeFails("date=" + year + "-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10");
     }
 
     @Test
@@ -167,43 +174,33 @@ public class TestAssurance extends ManagedTest {
         c.setTimeInMillis(System.currentTimeMillis());
         c.add(Calendar.HOUR_OF_DAY, 12);
 
-        String error = getError("date=" + sdf.format(new Date(c.getTimeInMillis())) + "&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
-        assertNull(error);
+        executeSuccess("date=" + sdf.format(new Date(c.getTimeInMillis())) + "&location=testcase&certify=1&rules=1&assertion=1&points=10");
     }
 
     @Test
     public void testAssureFormNoLoc() throws IOException {
-        String error = getError("date=2000-01-01&location=a&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
-        assertTrue(error, !error.startsWith("</div>"));
-        error = getError("date=2000-01-01&location=&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
-        assertTrue(error, !error.startsWith("</div>"));
+        executeFails("date=2000-01-01&location=a&certify=1&rules=1&assertion=1&points=10");
+        executeFails("date=2000-01-01&location=&certify=1&rules=1&assertion=1&points=10");
     }
 
     @Test
     public void testAssureFormInvalDate() throws IOException {
-        String error = getError("date=20000101&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
-        assertTrue(error, !error.startsWith("</div>"));
-        error = getError("date=&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
-        assertTrue(error, !error.startsWith("</div>"));
+        executeFails("date=20000101&location=testcase&certify=1&rules=1&assertion=1&points=10");
+        executeFails("date=&location=testcase&certify=1&rules=1&assertion=1&points=10");
     }
 
     @Test
     public void testAssureFormBoxes() throws IOException {
-        String error = getError("date=2000-01-01&location=testcase&certify=0&rules=1&tos_agree=1&assertion=1&points=10");
-        assertTrue(error, !error.startsWith("</div>"));
-        error = getError("date=2000-01-01&location=testcase&certify=1&rules=&tos_agree=1&assertion=1&points=10");
-        assertTrue(error, !error.startsWith("</div>"));
-        error = getError("date=2000-01-01&location=testcase&certify=1&rules=1&tos_agree=a&assertion=1&points=10");
-        assertTrue(error, !error.startsWith("</div>"));
-        error = getError("date=2000-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=z&points=10");
-        assertTrue(error, !error.startsWith("</div>"));
+        executeFails("date=2000-01-01&location=testcase&certify=0&rules=1&assertion=1&points=10");
+        executeFails("date=2000-01-01&location=testcase&certify=1&rules=&assertion=1&points=10");
+        executeFails("date=2000-01-01&location=testcase&certify=1&rules=1&assertion=z&points=10");
     }
 
     @Test
     public void testAssureListingValid() throws IOException {
         String uniqueLoc = createUniqueName();
-        String error = getError("date=2000-01-01&location=" + uniqueLoc + "&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
-        assertNull(error);
+        execute("date=2000-01-01&location=" + uniqueLoc + "&certify=1&rules=1&assertion=1&points=10");
+
         String cookie = login(assureeM, TEST_PASSWORD);
         URLConnection url = get(cookie, MyPoints.PATH);
         String resp = IOUtils.readURL(url);
@@ -214,8 +211,7 @@ public class TestAssurance extends ManagedTest {
     @Test
     public void testAssurerListingValid() throws IOException {
         String uniqueLoc = createUniqueName();
-        String error = getError("date=2000-01-01&location=" + uniqueLoc + "&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
-        assertNull(error);
+        executeSuccess("date=2000-01-01&location=" + uniqueLoc + "&certify=1&rules=1&assertion=1&points=10");
         String cookie = login(assurerM, TEST_PASSWORD);
         URLConnection url = get(cookie, MyPoints.PATH);
         String resp = IOUtils.readURL(url);
@@ -223,12 +219,21 @@ public class TestAssurance extends ManagedTest {
         assertThat(resp, containsString(uniqueLoc));
     }
 
-    private String getError(String query) throws MalformedURLException, IOException {
+    private void executeFails(String query) throws MalformedURLException, IOException {
+        assertThat(execute(query), hasError());
+
+    }
+
+    private void executeSuccess(String query) throws MalformedURLException, IOException {
+        assertThat(execute(query), hasNoError());
+
+    }
+
+    private String execute(String query) throws MalformedURLException, IOException {
         URLConnection uc = buildupAssureFormConnection(true);
         uc.getOutputStream().write((query).getBytes("UTF-8"));
         uc.getOutputStream().flush();
-        String error = fetchStartErrorMessage(IOUtils.readURL(uc));
-        return error;
+        return IOUtils.readURL(uc);
     }
 
     private URLConnection buildupAssureFormConnection(boolean doCSRF) throws MalformedURLException, IOException {
@@ -249,4 +254,35 @@ public class TestAssurance extends ManagedTest {
         return uc;
     }
 
+    @Test
+    public void testMultipleAssurance() throws IOException {
+
+        User users[] = User.findByEmail(assurerM);
+        int agentID = users[0].getId();
+
+        users = User.findByEmail(assureeM);
+        int applicantID = users[0].getId();
+
+        // enter first entry 200 days in the past
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?, `when`=? ")) {
+            ps.setInt(1, agentID);
+            ps.setInt(2, applicantID);
+            ps.setInt(3, 10);
+            ps.setString(4, "test-location");
+            ps.setString(5, "2010-01-01");
+            ps.setTimestamp(6, new Timestamp(System.currentTimeMillis() - DayDate.MILLI_DAY * 200));
+            ps.execute();
+        }
+
+        // enter second entry
+        String uniqueLoc = createUniqueName();
+        executeSuccess("date=2000-01-01&location=" + uniqueLoc + "&certify=1&rules=1&assertion=1&points=10");
+
+        // enter third entry on the same day
+        URLConnection uc = get(cookie, AssurePage.PATH);
+        uc.setDoOutput(true);
+        uc.getOutputStream().write(("email=" + URLEncoder.encode(assureeM, "UTF-8") + "&day=1&month=1&year=1910&search").getBytes("UTF-8"));
+        assertThat(IOUtils.readURL(uc), hasError());
+
+    }
 }