[plugin-accessibility] Ensure attachment published when fail-fast ena…

…bled
vividus-framework · May 4, 2021 · a5ca01b · a5ca01b
1 parent 18589b2
commit a5ca01b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/vividus-plugin-accessibility/src/main/java/org/vividus/accessibility/AccessibilitySteps.java b/vividus-plugin-accessibility/src/main/java/org/vividus/accessibility/AccessibilitySteps.java
@@ -90,9 +90,9 @@ public void checkAccessibility(List<AccessibilityCheckOptions> checkOptions)
  .forEach(options -> {
  List<AccessibilityViolation> violations = accessibilityTestEngine.analyze(options);
  ViolationLevel level = options.getLevel();
+ publishAttachment(currentUrl, violations);
  softAssert.assertThat(String.format(MESSAGE, level, currentUrl),
  violations.stream().filter(v -> v.getTypeCode() <= level.getCode()).count(), equalTo(0L));
- publishAttachment(currentUrl, violations);
  });
  }
 

diff --git a/...plugin-accessibility/src/test/java/org/vividus/accessibility/AccessibilityStepsTests.java b/...plugin-accessibility/src/test/java/org/vividus/accessibility/AccessibilityStepsTests.java
@@ -88,22 +88,22 @@ void shouldExecuteAccessibilityTest()
  when(accessibilityTestEngine.analyze(second)).thenReturn(List.of());
  accessibilitySteps.checkAccessibility(checkOptions);
  InOrder ordered = Mockito.inOrder(softAssert, attachmentPublisher);
- ordered.verify(softAssert).assertThat(
- eq(ASSERTION_MESSAGE),
- eq(2L),
- argThat(m -> MATCHER.equals(m.toString())));
  ordered.verify(attachmentPublisher).publishAttachment(TEMPLATE_NAME,
  Map.of(WARNING2, Map.of(CODE, List.of(warning)),
  NOTICE2, Map.of(CODE, List.of(notice)),
  ERROR2, Map.of(CODE, List.of(error))), TITLE);
  ordered.verify(softAssert).assertThat(
  eq(ASSERTION_MESSAGE),
- eq(0L),
+ eq(2L),
  argThat(m -> MATCHER.equals(m.toString())));
  ordered.verify(attachmentPublisher).publishAttachment(TEMPLATE_NAME,
  Map.of(WARNING2, Map.of(),
  ERROR2, Map.of(),
  NOTICE2, Map.of()), TITLE);
+ ordered.verify(softAssert).assertThat(
+ eq(ASSERTION_MESSAGE),
+ eq(0L),
+ argThat(m -> MATCHER.equals(m.toString())));
  }
 
  private AccessibilityCheckOptions createOptions(AccessibilityStandard standard, ViolationLevel level,