Skip to content

Commit ce793d2

Browse files
committed
ci: fix test flow reporter test on windows
1 parent f700fbc commit ce793d2

File tree

1 file changed

+29
-16
lines changed

1 file changed

+29
-16
lines changed

core/citrus-base/src/test/java/org/citrusframework/report/TestFlowReporterTest.java

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616

1717
package org.citrusframework.report;
1818

19-
import java.time.Duration;
20-
import java.util.HashMap;
21-
import java.util.List;
22-
import java.util.Map;
23-
import java.util.Optional;
24-
2519
import org.citrusframework.TestCase;
2620
import org.citrusframework.TestCaseMetaInfo;
2721
import org.citrusframework.TestResult;
@@ -36,13 +30,22 @@
3630
import org.citrusframework.message.MessageHeaders;
3731
import org.mockito.Mock;
3832
import org.mockito.Mockito;
39-
import org.mockito.MockitoAnnotations;
4033
import org.testng.Assert;
34+
import org.testng.annotations.AfterClass;
4135
import org.testng.annotations.BeforeClass;
4236
import org.testng.annotations.Test;
4337

38+
import java.time.Duration;
39+
import java.util.HashMap;
40+
import java.util.List;
41+
import java.util.Map;
42+
import java.util.Optional;
43+
44+
import static java.util.Objects.nonNull;
45+
import static org.assertj.core.api.Assertions.assertThat;
4446
import static org.mockito.Mockito.reset;
4547
import static org.mockito.Mockito.when;
48+
import static org.mockito.MockitoAnnotations.openMocks;
4649

4750
public class TestFlowReporterTest {
4851

@@ -55,12 +58,22 @@ public class TestFlowReporterTest {
5558

5659
@Mock
5760
private Iterate iteration;
61+
5862
@Mock
5963
private Sequence sequence;
6064

65+
private AutoCloseable mocks;
66+
6167
@BeforeClass
62-
public void setup() {
63-
MockitoAnnotations.openMocks(this);
68+
public void setupMocks() {
69+
mocks = openMocks(this);
70+
}
71+
72+
@AfterClass
73+
public void teardownMocks() throws Exception {
74+
if (nonNull(mocks)) {
75+
mocks.close();
76+
}
6477
}
6578

6679
@Test
@@ -97,7 +110,7 @@ public void shouldGetJsonReport() {
97110
reporter.onTestSuccess(test);
98111

99112
reporter.generate(results);
100-
Assert.assertEquals(reporter.getJsonReport(), """
113+
assertThat(reporter.getJsonReport()).isEqualToNormalizingNewlines("""
101114
[
102115
{
103116
"name": "fooTest",
@@ -162,7 +175,7 @@ public void shouldGetJsonReportWithContainers() {
162175
reporter.onTestSuccess(test);
163176

164177
reporter.generate(results);
165-
Assert.assertEquals(reporter.getJsonReport(), """
178+
assertThat(reporter.getJsonReport()).isEqualToNormalizingNewlines("""
166179
[
167180
{
168181
"name": "fooTest",
@@ -233,7 +246,7 @@ public void shouldGetJsonReportWithFailedContainer() {
233246
reporter.onTestSuccess(test);
234247

235248
reporter.generate(results);
236-
Assert.assertEquals(reporter.getJsonReport(), """
249+
assertThat(reporter.getJsonReport()).isEqualToNormalizingNewlines("""
237250
[
238251
{
239252
"name": "fooTest",
@@ -310,7 +323,7 @@ public void shouldGetJsonReportWithIterations() {
310323
reporter.onTestSuccess(test);
311324

312325
reporter.generate(results);
313-
Assert.assertEquals(reporter.getJsonReport(), """
326+
assertThat(reporter.getJsonReport()).isEqualToNormalizingNewlines("""
314327
[
315328
{
316329
"name": "fooTest",
@@ -394,7 +407,7 @@ public void shouldGetJsonReportWithParameters() {
394407
reporter.onTestSuccess(test);
395408

396409
reporter.generate(results);
397-
Assert.assertEquals(reporter.getJsonReport(), """
410+
assertThat(reporter.getJsonReport()).isEqualToNormalizingNewlines("""
398411
[
399412
{
400413
"name": "fooTest",
@@ -458,7 +471,7 @@ public void shouldGetJsonReportForFailedTest() {
458471
reporter.onTestSuccess(test);
459472

460473
reporter.generate(results);
461-
Assert.assertEquals(reporter.getJsonReport(), """
474+
assertThat(reporter.getJsonReport()).isEqualToNormalizingNewlines("""
462475
[
463476
{
464477
"name": "fooTest",
@@ -534,7 +547,7 @@ public void shouldGetJsonReportWithMessages() {
534547
reporter.onTestSuccess(test);
535548

536549
reporter.generate(results);
537-
Assert.assertEquals(reporter.getJsonReport(), """
550+
assertThat(reporter.getJsonReport()).isEqualToNormalizingNewlines("""
538551
[
539552
{
540553
"name": "fooTest",

0 commit comments

Comments
 (0)