X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FTestAssurance.java;h=3ae4ccd4afa204b61a93a514dc4cdb8f6ad4897c;hb=9efe305311c7e9f78a41093d2e2e9c57bfd10c7b;hp=2a68173d2d7356747084533ba4fda712271f4041;hpb=9def69bd08ea69eb27786d5b34f00e154e09e9f3;p=gigi.git diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/org/cacert/gigi/pages/wot/TestAssurance.java index 2a68173d..3ae4ccd4 100644 --- a/tests/org/cacert/gigi/pages/wot/TestAssurance.java +++ b/tests/org/cacert/gigi/pages/wot/TestAssurance.java @@ -16,12 +16,15 @@ import java.util.Calendar; import java.util.Date; import java.util.regex.Pattern; +import org.cacert.gigi.GigiApiException; import org.cacert.gigi.database.GigiPreparedStatement; +import org.cacert.gigi.dbObjects.Country; 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.cacert.gigi.util.Notary; import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; @@ -92,16 +95,25 @@ public class TestAssurance extends ManagedTest { @Test public void testAssureForm() throws IOException { - executeSuccess("date=2000-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10"); + executeSuccess("date=" + validVerificationDateString() + "&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); + } + + @Test + public void testAssureFormEmpty() throws IOException { + URLConnection uc = buildupAssureFormConnection(true); + uc.getOutputStream().write(("date=" + validVerificationDateString() + "&location=testcase&countryCode=DE&rules=1&assertion=1&points=10").getBytes("UTF-8")); + uc.getOutputStream().flush(); + String data = IOUtils.readURL(uc); + assertThat(data, hasError()); } @Test public void testAssureFormContanisData() throws IOException { URLConnection uc = buildupAssureFormConnection(true); - uc.getOutputStream().write(("assuredName=" + assureeName + "&date=2000-01-01&location=testcase&rules=1&assertion=1&points=10").getBytes("UTF-8")); + uc.getOutputStream().write(("assuredName=" + assureeName + "&date=" + validVerificationDateString() + "&location=testcase&countryCode=DE&rules=1&assertion=1&points=10").getBytes("UTF-8")); uc.getOutputStream().flush(); String data = IOUtils.readURL(uc); - assertThat(data, containsString("2000-01-01")); + assertThat(data, containsString(validVerificationDateString())); assertThat(data, containsString("testcase")); } @@ -109,7 +121,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&assertion=1&points=10").getBytes("UTF-8")); + uc.getOutputStream().write(("date=" + validVerificationDateString() + "&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10").getBytes("UTF-8")); uc.getOutputStream().flush(); assertEquals(500, uc.getResponseCode()); } @@ -118,7 +130,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&assertion=1&points=10&csrf=aragc").getBytes("UTF-8")); + uc.getOutputStream().write(("date=" + validVerificationDateString() + "&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10&csrf=aragc").getBytes("UTF-8")); uc.getOutputStream().flush(); assertEquals(500, uc.getResponseCode()); } @@ -141,7 +153,7 @@ public class TestAssurance extends ManagedTest { assertNull(executeBasicWebInteraction(assureeCookie, MyDetails.PATH, newDob + "&action=updateDoB", 0)); - uc.getOutputStream().write(("assuredName=" + assureeName + "&date=2000-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10").getBytes("UTF-8")); + uc.getOutputStream().write(("assuredName=" + assureeName + "&date=" + validVerificationDateString() + "&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10").getBytes("UTF-8")); uc.getOutputStream().flush(); String error = fetchStartErrorMessage(IOUtils.readURL(uc)); if (succeed) { @@ -156,7 +168,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; - executeFails("date=" + year + "-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10"); + executeFails("date=" + year + "-01-01&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); } @Test @@ -166,49 +178,77 @@ public class TestAssurance extends ManagedTest { c.setTimeInMillis(System.currentTimeMillis()); c.add(Calendar.HOUR_OF_DAY, 12); - executeSuccess("date=" + sdf.format(new Date(c.getTimeInMillis())) + "&location=testcase&certify=1&rules=1&assertion=1&points=10"); + executeSuccess("date=" + sdf.format(new Date(c.getTimeInMillis())) + "&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); + } + + @Test + public void testAssureFormPastInRange() throws IOException { + executeSuccess("date=" + validVerificationDateString() + "&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); + } + + @Test + public void testAssureFormPastOnLimit() throws IOException { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Calendar c = Calendar.getInstance(); + c.setTimeInMillis(System.currentTimeMillis()); + c.add(Calendar.MONTH, -Notary.LIMIT_MAX_MONTHS_VERIFICATION); + c.add(Calendar.DAY_OF_MONTH, 1); + + executeSuccess("date=" + sdf.format(new Date(c.getTimeInMillis())) + "&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); + } + + @Test + public void testAssureFormPastOutOfRange() throws IOException { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Calendar c = Calendar.getInstance(); + c.setTimeInMillis(System.currentTimeMillis()); + c.add(Calendar.MONTH, -Notary.LIMIT_MAX_MONTHS_VERIFICATION); + + executeFails("date=" + sdf.format(new Date(c.getTimeInMillis())) + "&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); } @Test public void testAssureFormNoLoc() throws IOException { - 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"); + executeFails("date=" + validVerificationDateString() + "&location=a&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); + executeFails("date=" + validVerificationDateString() + "&location=&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); } @Test public void testAssureFormInvalDate() throws IOException { - 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"); + executeFails("date=20000101&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); + executeFails("date=&location=testcase&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); } @Test public void testAssureFormBoxes() throws IOException { - 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"); + executeFails("date=" + validVerificationDateString() + "&location=testcase&countryCode=DE&certify=0&rules=1&assertion=1&points=10"); + executeFails("date=" + validVerificationDateString() + "&location=testcase&countryCode=DE&certify=1&rules=&assertion=1&points=10"); + executeFails("date=" + validVerificationDateString() + "&location=testcase&countryCode=DE&certify=1&rules=1&assertion=z&points=10"); } @Test - public void testAssureListingValid() throws IOException { + public void testAssureListingValid() throws IOException, GigiApiException { String uniqueLoc = createUniqueName(); - execute("date=2000-01-01&location=" + uniqueLoc + "&certify=1&rules=1&assertion=1&points=10"); + execute("date=" + validVerificationDateString() + "&location=" + uniqueLoc + "&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); String cookie = login(assureeM, TEST_PASSWORD); - URLConnection url = get(cookie, MyPoints.PATH); + URLConnection url = get(cookie, Points.PATH); String resp = IOUtils.readURL(url); - resp = resp.split(Pattern.quote(""))[0]; + resp = resp.split(Pattern.quote(""))[1]; assertThat(resp, containsString(uniqueLoc)); + assertThat(resp, containsString(Country.getCountryByCode("DE", Country.CountryCodeType.CODE_2_CHARS).getName())); } @Test - public void testAssurerListingValid() throws IOException { + public void testAssurerListingValid() throws IOException, GigiApiException { String uniqueLoc = createUniqueName(); - executeSuccess("date=2000-01-01&location=" + uniqueLoc + "&certify=1&rules=1&assertion=1&points=10"); + executeSuccess("date=" + validVerificationDateString() + "&location=" + uniqueLoc + "&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); String cookie = login(assurerM, TEST_PASSWORD); - URLConnection url = get(cookie, MyPoints.PATH); + URLConnection url = get(cookie, Points.PATH); String resp = IOUtils.readURL(url); - resp = resp.split(Pattern.quote(""))[1]; + resp = resp.split(Pattern.quote(""))[2]; assertThat(resp, containsString(uniqueLoc)); + assertThat(resp, containsString(Country.getCountryByCode("DE", Country.CountryCodeType.CODE_2_CHARS).getName())); } private void executeFails(String query) throws MalformedURLException, IOException { @@ -268,7 +308,7 @@ public class TestAssurance extends ManagedTest { // enter second entry String uniqueLoc = createUniqueName(); - executeSuccess("date=2000-01-01&location=" + uniqueLoc + "&certify=1&rules=1&assertion=1&points=10"); + executeSuccess("date=" + validVerificationDateString() + "&location=" + uniqueLoc + "&countryCode=DE&certify=1&rules=1&assertion=1&points=10"); // enter third entry on the same day URLConnection uc = get(cookie, AssurePage.PATH); @@ -277,4 +317,10 @@ public class TestAssurance extends ManagedTest { assertThat(IOUtils.readURL(uc), hasError()); } + + @Test + public void testAssureFormNoCountry() throws IOException { + executeFails("date=" + validVerificationDateString() + "&location=testcase&countryCode=&certify=1&rules=1&assertion=1&points=10"); + } + }