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 index 221c0227c..db092a1fa 100644 --- 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 { @Override public Map toMap(Fails annotation) { Map 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 index 87e4370e6..514224fd9 100644 --- a/report-ng/app/src/components/method-details/method.html +++ b/report-ng/app/src/components/method-details/method.html @@ -59,8 +59,9 @@ > @Fails
-
${_methodDetails.failsAnnotation.description}
-
Ticket:
+
${_methodDetails.failsAnnotation.description}
+
Ticket:
+
Your conditions for Expected fails were not fulfilled:
${_methodDetails.failsAnnotation.validator}