Merge changes I46ae11f8,I6d71e70e,Ie19e3229

[gigi.git] / tests / club / wpia / gigi / api / ImportCATSResult.java

diff --git a/tests/club/wpia/gigi/api/ImportCATSResult.java b/tests/club/wpia/gigi/api/ImportCATSResult.java
index 1d392500ee756f759ef2d0261f47248d998bd91b..c345257a67ea15155d6e05df169da64af9e21d5c 100644 (file)
--- a/tests/club/wpia/gigi/api/ImportCATSResult.java
+++ b/tests/club/wpia/gigi/api/ImportCATSResult.java
@@ -14,15 +14,13 @@ import java.security.NoSuchAlgorithmException;
 import org.junit.Test;
 
 import club.wpia.gigi.GigiApiException;
-import club.wpia.gigi.api.CATSImport;
-import club.wpia.gigi.api.CATSResolve;
+import club.wpia.gigi.dbObjects.CATS.CATSType;
 import club.wpia.gigi.dbObjects.Certificate;
+import club.wpia.gigi.dbObjects.Certificate.CSRType;
+import club.wpia.gigi.dbObjects.Certificate.SANType;
 import club.wpia.gigi.dbObjects.CertificateProfile;
 import club.wpia.gigi.dbObjects.Digest;
 import club.wpia.gigi.dbObjects.User;
-import club.wpia.gigi.dbObjects.CATS.CATSType;
-import club.wpia.gigi.dbObjects.Certificate.CSRType;
-import club.wpia.gigi.dbObjects.Certificate.SANType;
 import club.wpia.gigi.testUtils.IOUtils;
 import club.wpia.gigi.testUtils.RestrictedApiTest;
 import club.wpia.gigi.util.ServerConstants;
@@ -57,7 +55,7 @@ public class ImportCATSResult extends RestrictedApiTest {
         apiImport(u2, "Test Training");
         assertEquals(1, u2.getTrainings().length);
         assertFalse(u2.hasPassedCATS());
-        apiImport(u2, CATSType.ASSURER_CHALLENGE.getDisplayName());
+        apiImport(u2, CATSType.AGENT_CHALLENGE.getDisplayName());
         assertEquals(2, u2.getTrainings().length);
         assertTrue(u2.hasPassedCATS());
 
@@ -89,7 +87,7 @@ public class ImportCATSResult extends RestrictedApiTest {
         return doApi(CATSImport.PATH, query);
     }
 
-    private String apiLookup(Certificate target) throws IOException, GeneralSecurityException {
+    private String apiLookup(Certificate target) throws IOException, GeneralSecurityException, GigiApiException {
         HttpURLConnection connection = doApi(CATSResolve.PATH, "serial=" + target.cert().getSerialNumber().toString(16).toLowerCase());
         if (connection.getResponseCode() != 200) {
             throw new Error(connection.getResponseMessage());