X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Fclub%2Fwpia%2Fgigi%2FTestCertificate.java;h=fb5ca6f6667ee2de8f818ca4afd3c795f3491e19;hb=920888c880dd2bd3f477167931318d0060314592;hp=53b6509d38e0cecbe66524f5410c0f451d198e43;hpb=19dfeb8cc6ffa3f469e2b27fcedccc56b776c693;p=gigi.git diff --git a/tests/club/wpia/gigi/TestCertificate.java b/tests/club/wpia/gigi/TestCertificate.java index 53b6509d..fb5ca6f6 100644 --- a/tests/club/wpia/gigi/TestCertificate.java +++ b/tests/club/wpia/gigi/TestCertificate.java @@ -3,6 +3,7 @@ package club.wpia.gigi; import static org.junit.Assert.*; import java.io.IOException; +import java.math.BigInteger; import java.security.GeneralSecurityException; import java.security.KeyPair; import java.security.PrivateKey; @@ -17,6 +18,7 @@ import org.junit.Test; import club.wpia.gigi.dbObjects.Certificate; import club.wpia.gigi.dbObjects.Certificate.CSRType; import club.wpia.gigi.dbObjects.Certificate.CertificateStatus; +import club.wpia.gigi.dbObjects.Certificate.RevocationType; import club.wpia.gigi.dbObjects.Certificate.SANType; import club.wpia.gigi.dbObjects.Certificate.SubjectAlternateName; import club.wpia.gigi.dbObjects.Digest; @@ -24,6 +26,7 @@ import club.wpia.gigi.dbObjects.User; import club.wpia.gigi.pages.account.certs.Certificates; import club.wpia.gigi.testUtils.IOUtils; import club.wpia.gigi.testUtils.ManagedTest; +import club.wpia.gigi.util.RandomToken; import sun.security.x509.GeneralNameInterface; public class TestCertificate extends ManagedTest { @@ -78,7 +81,7 @@ public class TestCertificate extends ManagedTest { testFails(CertificateStatus.ISSUED, c); - Certificate c2 = Certificate.getBySerial(c.getSerial()); + Certificate c2 = Certificate.getBySerial(new BigInteger(c.getSerial(), 16)); assertNotNull(c2); assertEquals(2, c2.getSANs().size()); assertEquals(c.getSANs().get(0).getName(), c2.getSANs().get(0).getName()); @@ -120,7 +123,7 @@ public class TestCertificate extends ManagedTest { assertNotNull(login(pk, cert)); assertEquals(1, countRegex(IOUtils.readURL(get(cookie, Certificates.PATH)), "