X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FDomainVerification.java;h=1ce02be5151bb81ce7df6db3e2fdb13328e7fc88;hp=cd31f8ef097b4e290b377b5887cf1259ab567826;hb=753aae17442cbcdfcbce2d720b7b5dfd13918294;hpb=4de35d0ba81eadeceb437dace9e06ef59caa2b39

diff --git a/tests/org/cacert/gigi/DomainVerification.java b/tests/org/cacert/gigi/DomainVerification.java
index cd31f8ef..1ce02be5 100644
--- a/tests/org/cacert/gigi/DomainVerification.java
+++ b/tests/org/cacert/gigi/DomainVerification.java
@@ -2,76 +2,82 @@ package org.cacert.gigi;
 
 import static org.junit.Assert.*;
 
-import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.testUtils.ConfiguredTest;
+import org.cacert.gigi.util.DomainAssessment;
 import org.junit.Test;
 
-public class DomainVerification {
+public class DomainVerification extends ConfiguredTest {
 
     @Test
     public void testDomainPart() {
-        assertTrue(Domain.isVaildDomainPart("cacert", false));
-        assertTrue(Domain.isVaildDomainPart("de", false));
-        assertTrue(Domain.isVaildDomainPart("ha2-a", false));
-        assertTrue(Domain.isVaildDomainPart("ha2--a", false));
-        assertTrue(Domain.isVaildDomainPart("h--a", false));
-        assertFalse(Domain.isVaildDomainPart("xn--bla", false));
-        assertFalse(Domain.isVaildDomainPart("-xnbla", false));
-        assertFalse(Domain.isVaildDomainPart("xnbla-", false));
-        assertFalse(Domain.isVaildDomainPart("", false));
-        assertTrue(Domain.isVaildDomainPart("2xnbla", false));
-        assertTrue(Domain.isVaildDomainPart("xnbla2", false));
-        assertTrue(Domain.isVaildDomainPart("123", false));
-        assertTrue(Domain.isVaildDomainPart("abcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxy1234567890123", false));
-        assertFalse(Domain.isVaildDomainPart("abcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxy12345678901234", false));
+        assertTrue(DomainAssessment.isValidDomainPart("cacert"));
+        assertTrue(DomainAssessment.isValidDomainPart("de"));
+        assertTrue(DomainAssessment.isValidDomainPart("ha2-a"));
+        assertTrue(DomainAssessment.isValidDomainPart("ha2--a"));
+        assertTrue(DomainAssessment.isValidDomainPart("h--a"));
+        assertFalse(DomainAssessment.isValidDomainPart("-xnbla"));
+        assertFalse(DomainAssessment.isValidDomainPart("xnbla-"));
+        assertFalse(DomainAssessment.isValidDomainPart(""));
+        assertTrue(DomainAssessment.isValidDomainPart("2xnbla"));
+        assertTrue(DomainAssessment.isValidDomainPart("xnbla2"));
+        assertTrue(DomainAssessment.isValidDomainPart("123"));
+        assertTrue(DomainAssessment.isValidDomainPart("abcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxy1234567890123"));
+        assertFalse(DomainAssessment.isValidDomainPart("abcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxy12345678901234"));
     }
 
     @Test
-    public void testDomainCertifyable() {
-        isCertifyableDomain(true, "cacert.org", false);
-        isCertifyableDomain(true, "cacert.de", false);
-        isCertifyableDomain(true, "cacert.org", false);
-        isCertifyableDomain(true, "cacert.org", false);
-        isCertifyableDomain(true, "1234.org", false);
-        isCertifyableDomain(false, "a.cacert.org", true);
-        isCertifyableDomain(false, "gigi.local", true);
-        isCertifyableDomain(false, "org", true);
-        isCertifyableDomain(false, "'a.org", true);
-        isCertifyableDomain(false, ".org", true);
-        isCertifyableDomain(false, ".org.", true);
+    public void testDomainCertifiable() {
+        isCertifiableDomain(true, "cacert.org", false);
+        isCertifiableDomain(true, "cacert.de", false);
+        isCertifiableDomain(true, "cacert.org", false);
+        isCertifiableDomain(true, "cacert.org", false);
+        isCertifiableDomain(true, "1234.org", false);
+        isCertifiableDomain(false, "a.cacert.org", true);
+        isCertifiableDomain(false, "gigi.local", true);
+        isCertifiableDomain(false, "org", true);
+        isCertifiableDomain(false, "'a.org", true);
+        isCertifiableDomain(false, ".org", true);
+        isCertifiableDomain(false, ".org.", true);
         // non-real-punycode
-        isCertifyableDomain(true, "xna-ae.de", false);
-        isCertifyableDomain(true, "xn-aae.de", false);
+        isCertifiableDomain(true, "xna-ae.de", false);
+        isCertifiableDomain(true, "xn-aae.de", false);
 
         // illegal punycode:
         // illegal ace prefix
-        isCertifyableDomain(false, "aa--b.com", true);
-        isCertifyableDomain(false, "xm--ae-a.de", true);
+        isCertifiableDomain(false, "aa--b.com", true);
+        isCertifiableDomain(false, "xm--ae-a.de", true);
 
         // illegal punycode content
-        isCertifyableDomain(false, "xn--ae-a.com", true);
-        isCertifyableDomain(false, "xn--ae.de", true);
-        isCertifyableDomain(false, "xn--ae-a.org", true);
-        isCertifyableDomain(false, "xn--ae-a.de", true);
+        isCertifiableDomain(false, "xn--ae-a.com", true);
+        isCertifiableDomain(false, "xn--ae.de", true);
+        isCertifiableDomain(false, "xn--ae-a.org", true);
+        isCertifiableDomain(false, "xn--ae-a.de", true);
         // valid punycode requires permission
-        isCertifyableDomain(true, "xn--4ca0bs.de", true);
-        isCertifyableDomain(false, "xn--4ca0bs.de", false);
-        isCertifyableDomain(true, "xn--a-zfa9cya.de", true);
-        isCertifyableDomain(false, "xn--a-zfa9cya.de", false);
+        isCertifiableDomain(true, "xn--4ca0bs.de", true);
+        isCertifiableDomain(false, "xn--4ca0bs.de", false);
+        isCertifiableDomain(true, "xn--a-zfa9cya.de", true);
+        isCertifiableDomain(false, "xn--a-zfa9cya.de", false);
 
         // valid punycode does not help under .com
-        isCertifyableDomain(false, "xn--a-zfa9cya.com", true);
-        isCertifyableDomain(true, "zfa9cya.com", true);
+        isCertifiableDomain(false, "xn--a-zfa9cya.com", true);
+        isCertifiableDomain(true, "zfa9cya.com", true);
 
-        isCertifyableDomain(false, "127.0.0.1", false);
-        isCertifyableDomain(false, "::1", false);
-        isCertifyableDomain(false, "127.0.0.1", true);
-        isCertifyableDomain(false, "::1", true);
+        isCertifiableDomain(false, "127.0.0.1", false);
+        isCertifiableDomain(false, "::1", false);
+        isCertifiableDomain(false, "127.0.0.1", true);
+        isCertifiableDomain(false, "::1", true);
 
     }
 
-    private void isCertifyableDomain(boolean b, String string, boolean puny) {
+    @Test
+    public void testFinancial() {
+        isCertifiableDomain(false, "google.com", true);
+        isCertifiableDomain(false, "twitter.com", true);
+    }
+
+    private void isCertifiableDomain(boolean b, String string, boolean puny) {
         try {
-            Domain.checkCertifyableDomain(string, puny);
+            DomainAssessment.checkCertifiableDomain(string, puny);
             assertTrue(b);
         } catch (GigiApiException e) {
             assertFalse(e.getMessage(), b);