Skip to content

Commit c2fd1ce

Browse files
author
Yevhen Zavhorodnii
committed
Fix test
1 parent b52ba31 commit c2fd1ce

File tree

2 files changed

+35
-2
lines changed

2 files changed

+35
-2
lines changed

lib/src/test/java/com/ticketmaster/structurizr/threagile/ThreagileWorkspaceExporterTest.java

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55

66
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
77
import static org.junit.jupiter.api.Assertions.assertEquals;
8+
import static org.junit.jupiter.api.Assertions.assertTrue;
89

910
import java.io.File;
1011
import java.nio.file.Files;
1112
import java.nio.file.Paths;
13+
import java.util.ArrayList;
1214
import java.util.Map;
1315

1416
import com.structurizr.Workspace;
@@ -41,6 +43,13 @@ void exportEmptyWorkspaceReturnValidYaml() {
4143
});
4244
}
4345

46+
// TODO: move to a helper class
47+
// those methods are required to check the yaml output is the same and decision to make custom check was made because standard assertEquals does not work with yaml
48+
// issues with standard assertEquals:
49+
// yaml may have different order of elements
50+
// the same value may be represented in different ways (e.g. true/false vs yes/no)
51+
// order of elements in lists may be different
52+
// some fields are not important for the comparison
4453
void assertYamlEquals(String expectedYaml, String actualYaml, String message, String[] ignoreFields) {
4554
Yaml yaml = new Yaml();
4655
Map<String, Object> expected = yaml.load(expectedYaml);
@@ -49,7 +58,31 @@ void assertYamlEquals(String expectedYaml, String actualYaml, String message, St
4958
Map<String, Object> actual = yaml.load(actualYaml);
5059
excludeFields(actual, ignoreFields);
5160

52-
assertEquals(expected, actual, message);
61+
assertMapEquals(expected, actual, message);
62+
}
63+
64+
@SuppressWarnings("unchecked")
65+
void assertMapEquals(Map<String, Object> expected, Map<String, Object> actual, String message) {
66+
assertEquals(expected.size(), actual.size(), message + ": different size");
67+
68+
expected.forEach((key, value) -> {
69+
if (value instanceof Map) {
70+
assertMapEquals((Map<String, Object>) value, (Map<String, Object>) actual.get(key), message);
71+
} else if (value instanceof ArrayList) {
72+
ArrayList<Object> expectedList = (ArrayList<Object>) value;
73+
ArrayList<Object> actualList = (ArrayList<Object>) actual.get(key);
74+
assertEquals(expectedList.size(), actualList.size(), message + ": different list size");
75+
for (int i = 0; i < expectedList.size(); i++) {
76+
if (expectedList.get(i) instanceof Map) {
77+
assertMapEquals((Map<String, Object>) expectedList.get(i), (Map<String, Object>) actualList.get(i), message);
78+
} else {
79+
assertTrue(actualList.contains(expectedList.get(i)), message);
80+
}
81+
}
82+
} else {
83+
assertEquals(value, actual.get(key), message);
84+
}
85+
});
5386
}
5487

5588
@SuppressWarnings("unchecked")

lib/src/test/resources/amazon_threagile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ trust_boundaries:
255255
tags: null
256256
type: execution-environment
257257
technical_assets_inside:
258+
- ta-2
258259
- ta-3
259260
- ta-18
260-
- ta-2
261261
- ta-1
262262
trust_boundaries_nested: null

0 commit comments

Comments
 (0)