diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-08-16 01:43:36 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-08-16 01:48:54 +0200 |
| commit | 4001335ed5105112c64c433a26272286ecf66196 (patch) | |
| tree | 0f38c7d974a165e557fa0e0bfedf56af664c8baa /base | |
| parent | 6bfee0e46aee93e1255ecb5652d46348557664d5 (diff) | |
| download | pki-4001335ed5105112c64c433a26272286ecf66196.tar.gz pki-4001335ed5105112c64c433a26272286ecf66196.tar.xz pki-4001335ed5105112c64c433a26272286ecf66196.zip | |
Fixed SelfTestService.findSelfTests().
The SelfTestService.findSelfTests() has been modified to return
all selftests defined in the CS.cfg.
https://fedorahosted.org/pki/ticket/2432
Diffstat (limited to 'base')
3 files changed, 9 insertions, 1 deletions
diff --git a/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java b/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java index c07b96acb..a55c65172 100644 --- a/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java +++ b/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java @@ -20,6 +20,8 @@ package com.netscape.certsrv.selftests; +import java.util.Collection; + /////////////////////// // import statements // /////////////////////// @@ -68,6 +70,8 @@ public interface ISelfTestSubsystem // ISelfTestSubsystem methods // //////////////////////////////// + public Collection<String> getSelfTestNames(); + // // methods associated with the list of on demand self tests // diff --git a/base/server/cms/src/org/dogtagpki/server/rest/SelfTestService.java b/base/server/cms/src/org/dogtagpki/server/rest/SelfTestService.java index e662ba9e7..9108a45fe 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/SelfTestService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/SelfTestService.java @@ -113,7 +113,7 @@ public class SelfTestService extends PKIService implements SelfTestResource { // filter self tests Collection<String> results = new ArrayList<String>(); - for (String name : subsystem.listSelfTestsEnabledOnDemand()) { + for (String name : subsystem.getSelfTestNames()) { if (filter != null && !name.contains(filter)) continue; results.add(name); } diff --git a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java index 8dc95cc5b..d7d7a3a89 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java @@ -243,6 +243,10 @@ public class SelfTestSubsystem // SelfTestSubsystem methods // /////////////////////////////// + public Collection<String> getSelfTestNames() { + return mSelfTestInstances.keySet(); + } + // // methods associated with the list of on demand self tests // |