[direct-certificate-discovery-tool] 2 new revisions pushed by michal.kotelba@esacinc.com on 2014-06-09 00:55 GMT

[direct-certifica...@googlecode.com]

2 new revisions:

Revision: 4cdaf3281877
Branch: default
Author: Michal Kotelba <michal....@esacinc.com>
Date: Sun Jun 8 19:53:36 2014 UTC
Log: - Supports DCDT-247....
http://code.google.com/p/direct-certificate-discovery-tool/source/detail?r=4cdaf3281877

Revision: 6f7c644f7715
Branch: default
Author: Michal Kotelba <michal....@esacinc.com>
Date: Sun Jun 8 20:24:35 2014 UTC
Log: - Further supports DCDT-247....
http://code.google.com/p/direct-certificate-discovery-tool/source/detail?r=6f7c644f7715

==============================================================================
Revision: 4cdaf3281877
Branch: default
Author: Michal Kotelba <michal....@esacinc.com>
Date: Sun Jun 8 19:53:36 2014 UTC
Log: - Supports DCDT-247.
- Fixed result success value for negative Discovery testcases.
http://code.google.com/p/direct-certificate-discovery-tool/source/detail?r=4cdaf3281877

Modified:

/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/discovery/impl/DiscoveryTestcaseProcessorImpl.java

/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/results/impl/AbstractToolTestcaseResult.java

/dcdt-core/src/main/resources/META-INF/core/velocity/mail-testcase-discovery-result.vm

=======================================
---
/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/discovery/impl/DiscoveryTestcaseProcessorImpl.java
Fri Apr 18 03:30:00 2014 UTC
+++
/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/discovery/impl/DiscoveryTestcaseProcessorImpl.java
Sun Jun 8 19:53:36 2014 UTC
@@ -57,6 +57,11 @@
if (testcase == null) {
throw new ToolSmimeException(String.format("Unable to find
a matching Discovery testcase for mail MIME message (id=%s, from=%s,
to=%s).",
msgId, msgFrom, msgTo));
+ } else if (testcase.isNegative()) {
+ procMsgs.add(String.format(
+ "Matching Discovery testcase (name=%s) is negative;
mail MIME message (id=%s, from=%s, to=%s) should not have been sent.",
+ testcase.getName(), msgId, msgFrom, msgTo));
+ procSuccess = false;
}

MimeBodyPart decryptedBodyPart = this.decrypt(msgHelper,
msgId, msgFrom, msgTo, testcase, result);
=======================================
---
/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/results/impl/AbstractToolTestcaseResult.java
Thu Apr 24 17:50:16 2014 UTC
+++
/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/results/impl/AbstractToolTestcaseResult.java
Sun Jun 8 19:53:36 2014 UTC
@@ -64,7 +64,7 @@
@Override
public boolean isSuccess() {
// noinspection ConstantConditions
- return (this.submission.hasTestcase() &&
(this.submission.getTestcase().isNegative() != (this.isProcessingSuccess()
&& this.isDiscoverySuccess())));
+ return (this.submission.hasTestcase() &&
this.isProcessingSuccess() && this.isDiscoverySuccess());
}

@Override
=======================================
---
/dcdt-core/src/main/resources/META-INF/core/velocity/mail-testcase-discovery-result.vm
Tue Apr 29 00:09:36 2014 UTC
+++
/dcdt-core/src/main/resources/META-INF/core/velocity/mail-testcase-discovery-result.vm
Sun Jun 8 19:53:36 2014 UTC
@@ -25,7 +25,9 @@
#if ($discoveryTestcaseResult.hasProcessingMessages())
<ul>
#foreach ($discoveryTestcaseResultProcMsg in
$discoveryTestcaseResult.processingMessages)
- <li>$discoveryTestcaseResultProcMsg</li>
+ #if ($discoveryTestcaseResultProcMsg)
+ <li>$discoveryTestcaseResultProcMsg</li>
+ #end
#end
</ul>
#else
@@ -47,7 +49,9 @@
#if
($discoveryTestcaseResultProcStep.hasMessages())
<ul>
#foreach
($discoveryTestcaseResultProcStepMsg in
$discoveryTestcaseResultProcStep.messages)
-
<li>$discoveryTestcaseResultProcStepMsg</li>
+ #if
($discoveryTestcaseResultProcStepMsg)
+
<li>$discoveryTestcaseResultProcStepMsg</li>
+ #end
#end
</ul>
#else

==============================================================================
Revision: 6f7c644f7715
Branch: default
Author: Michal Kotelba <michal....@esacinc.com>
Date: Sun Jun 8 20:24:35 2014 UTC
Log: - Further supports DCDT-247.
- Re-added Hosting testcase specific result success determination logic.
http://code.google.com/p/direct-certificate-discovery-tool/source/detail?r=6f7c644f7715

Modified:

/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/hosting/results/impl/HostingTestcaseResultImpl.java

=======================================
---
/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/hosting/results/impl/HostingTestcaseResultImpl.java
Fri Apr 18 03:30:00 2014 UTC
+++
/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/hosting/results/impl/HostingTestcaseResultImpl.java
Sun Jun 8 20:24:35 2014 UTC
@@ -14,4 +14,10 @@
public HostingTestcaseResultImpl(HostingTestcaseSubmission submission,
@Nullable List<CertificateDiscoveryStep> procSteps) {
super(submission, procSteps);
}
+
+ @Override
+ public boolean isSuccess() {
+ // noinspection ConstantConditions
+ return (this.submission.hasTestcase() &&
(this.submission.getTestcase().isNegative() != (this.isProcessingSuccess()
&& this.isDiscoverySuccess())));
+ }
}