From 8f19db917312590be3db9eabe91434d5750b5c15 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Thu, 12 May 2016 12:37:23 +0200 Subject: [PATCH] upd: use self-org name for CATS-API-test --- src/org/cacert/gigi/dbObjects/Organisation.java | 4 +++- tests/org/cacert/gigi/api/ImportCATSResult.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/org/cacert/gigi/dbObjects/Organisation.java b/src/org/cacert/gigi/dbObjects/Organisation.java index 66de62d9..5da25068 100644 --- a/src/org/cacert/gigi/dbObjects/Organisation.java +++ b/src/org/cacert/gigi/dbObjects/Organisation.java @@ -218,7 +218,9 @@ public class Organisation extends CertificateOwner { return isValidDomain(email.split("@", 2)[1]); } + public static final String SELF_ORG_NAME = "CAcert"; + public boolean isSelfOrganisation() { - return "CAcert".equals(getName()); + return SELF_ORG_NAME.equals(getName()); } } diff --git a/tests/org/cacert/gigi/api/ImportCATSResult.java b/tests/org/cacert/gigi/api/ImportCATSResult.java index f8adbff8..be02a7b6 100644 --- a/tests/org/cacert/gigi/api/ImportCATSResult.java +++ b/tests/org/cacert/gigi/api/ImportCATSResult.java @@ -40,7 +40,8 @@ public class ImportCATSResult extends ClientTest { grant(u.getEmail(), Group.ORGASSURER); clearCaches(); u = User.getById(u.getId()); - Organisation o = new Organisation("CAcert", "NA", "NA", "NA", "contact@cacert.org", u); + Organisation o = new Organisation(Organisation.SELF_ORG_NAME, "NA", "NA", "NA", "contact@cacert.org", u); + assertTrue(o.isSelfOrganisation()); KeyPair kp = generateKeypair(); String key1 = generatePEMCSR(kp, "EMAIL=cats@cacert.org"); Certificate c = new Certificate(o, u, Certificate.buildDN("EMAIL", "cats@cacert.org"), Digest.SHA256, key1, CSRType.CSR, CertificateProfile.getByName("client-orga"), new Certificate.SubjectAlternateName(SANType.EMAIL, "cats@cacert.org")); -- 2.39.2