Change-Id: Id8eb64dccac07b33b1f6e4e45f4e9a41fd89e9ad
import java.util.Date;
import java.util.regex.Pattern;
import java.util.Date;
import java.util.regex.Pattern;
+import org.cacert.gigi.GigiApiException;
import org.cacert.gigi.database.GigiPreparedStatement;
import org.cacert.gigi.database.GigiPreparedStatement;
+import org.cacert.gigi.dbObjects.CountryCode;
import org.cacert.gigi.dbObjects.User;
import org.cacert.gigi.pages.account.MyDetails;
import org.cacert.gigi.testUtils.IOUtils;
import org.cacert.gigi.dbObjects.User;
import org.cacert.gigi.pages.account.MyDetails;
import org.cacert.gigi.testUtils.IOUtils;
- public void testAssureListingValid() throws IOException {
+ public void testAssureListingValid() throws IOException, GigiApiException {
String uniqueLoc = createUniqueName();
execute("date=" + validVerificationDateString() + "&location=" + uniqueLoc + "&countryCode=DE&certify=1&rules=1&assertion=1&points=10");
String uniqueLoc = createUniqueName();
execute("date=" + validVerificationDateString() + "&location=" + uniqueLoc + "&countryCode=DE&certify=1&rules=1&assertion=1&points=10");
String resp = IOUtils.readURL(url);
resp = resp.split(Pattern.quote("</table>"))[1];
assertThat(resp, containsString(uniqueLoc));
String resp = IOUtils.readURL(url);
resp = resp.split(Pattern.quote("</table>"))[1];
assertThat(resp, containsString(uniqueLoc));
+ assertThat(resp, containsString(CountryCode.getCountryCode("DE", CountryCode.CountryCodeType.CODE_2_CHARS).getCountry()));
- public void testAssurerListingValid() throws IOException {
+ public void testAssurerListingValid() throws IOException, GigiApiException {
String uniqueLoc = createUniqueName();
executeSuccess("date=" + validVerificationDateString() + "&location=" + uniqueLoc + "&countryCode=DE&certify=1&rules=1&assertion=1&points=10");
String cookie = login(assurerM, TEST_PASSWORD);
String uniqueLoc = createUniqueName();
executeSuccess("date=" + validVerificationDateString() + "&location=" + uniqueLoc + "&countryCode=DE&certify=1&rules=1&assertion=1&points=10");
String cookie = login(assurerM, TEST_PASSWORD);
String resp = IOUtils.readURL(url);
resp = resp.split(Pattern.quote("</table>"))[2];
assertThat(resp, containsString(uniqueLoc));
String resp = IOUtils.readURL(url);
resp = resp.split(Pattern.quote("</table>"))[2];
assertThat(resp, containsString(uniqueLoc));
+ assertThat(resp, containsString(CountryCode.getCountryCode("DE", CountryCode.CountryCodeType.CODE_2_CHARS).getCountry()));
}
private void executeFails(String query) throws MalformedURLException, IOException {
}
private void executeFails(String query) throws MalformedURLException, IOException {
assertThat(IOUtils.readURL(uc), hasError());
}
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");
+ }
+