Merge pull request #246 from telekom/feature/expected_failed_validato…

…r_message show message for failed validation in expected fails
telekom · Jun 28, 2022 · 74cbe23 · 74cbe23
2 parents f826899 + 1e45dc1
commit 74cbe23
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/FailsAnnotationConverter.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/FailsAnnotationConverter.java
@@ -32,14 +32,17 @@ public class FailsAnnotationConverter implements AnnotationConverter<Fails> {
     @Override
     public Map<String, Object> toMap(Fails annotation) {
         Map<String, Object> map = new HashMap<>();
-        if (!StringUtils.isBlank(annotation.description())) {
+        if (StringUtils.isNotBlank(annotation.description())) {
             map.put("description", annotation.description());
         }
-        if (!StringUtils.isBlank(annotation.ticketString())) {
+        if (StringUtils.isNotBlank(annotation.ticketString())) {
             map.put("ticketString", annotation.ticketString());
         } else if (annotation.ticketId() > 0) {
             map.put("ticketString", Integer.toString(annotation.ticketId()));
         }
+        if (StringUtils.isNotBlank(annotation.validator())) {
+            map.put("validator", annotation.validatorClass().getCanonicalName() + "." + annotation.validator());
+        }
         return map;
     }
 }
diff --git a/report-ng/app/src/components/method-details/method.html b/report-ng/app/src/components/method-details/method.html
@@ -59,8 +59,9 @@
                     >
                         <span class="badge status-failed-expected sr1">@Fails</span>
                         <div>
-                            <div if.bind="_methodDetails.failsAnnotation.description">${_methodDetails.failsAnnotation.description}</div>
-                            <div if.bind="_methodDetails.failsAnnotation.ticketString">Ticket: <span innerhtml.bind="_methodDetails.failsAnnotation.ticketString|html"></span></div>
+                            <div if.bind="_methodDetails.failsAnnotation.description&&7!= _methodDetails.methodContext.resultStatus">${_methodDetails.failsAnnotation.description}</div>
+                            <div if.bind="_methodDetails.failsAnnotation.ticketString&&7!= _methodDetails.methodContext.resultStatus">Ticket: <span innerhtml.bind="_methodDetails.failsAnnotation.ticketString|html"></span></div>
+                            <div if.bind="_methodDetails.failsAnnotation.validator&&7== _methodDetails.methodContext.resultStatus">Your conditions for Expected fails were not fulfilled: <br> ${_methodDetails.failsAnnotation.validator}</div>
                         </div>
                     </div>
                     <mdc-list-divider if.bind="_methodDetails.failsAnnotation"></mdc-list-divider>