Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve XsdDocumentedTests Error Message 

This makes it easier to compare the expected and actual values.

Closes gh-9829
This commit is contained in:
Rob Winch 2021-05-27 16:16:24 -05:00
parent 65ecaa0c28
commit 8400b841e9
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java
View File

@ -22,10 +22,10 @@ import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -185,8 +185,8 @@ public class XsdDocumentedTests {
*/
@Test
public void countLinksWhenReviewingDocumentationThenParentsAndChildrenAreCorrectlyLinked() throws IOException {
Map<String, List<String>> docAttrNameToChildren = new HashMap<>();
Map<String, List<String>> docAttrNameToParents = new HashMap<>();
Map<String, List<String>> docAttrNameToChildren = new TreeMap<>();
Map<String, List<String>> docAttrNameToParents = new TreeMap<>();
String docAttrName = null;
Map<String, List<String>> currentDocAttrNameToElmt = null;
List<String> lines = Files.readAllLines(Paths.get(this.referenceLocation));
@ -215,8 +215,8 @@ public class XsdDocumentedTests {
}
}
Map<String, Element> elementNameToElement = this.xml.elementsByElementName(this.schemaDocumentLocation);
Map<String, List<String>> schemaAttrNameToChildren = new HashMap<>();
Map<String, List<String>> schemaAttrNameToParents = new HashMap<>();
Map<String, List<String>> schemaAttrNameToChildren = new TreeMap<>();
Map<String, List<String>> schemaAttrNameToParents = new TreeMap<>();
elementNameToElement.entrySet().stream().forEach((entry) -> {
String key = "nsa-" + entry.getKey();
if (this.ignoredIds.contains(key)) {
@ -248,8 +248,23 @@ public class XsdDocumentedTests {
schemaAttrNameToChildren.put(key, childIds);
}
});
assertThat(docAttrNameToChildren).isEqualTo(schemaAttrNameToChildren);
assertThat(docAttrNameToParents).isEqualTo(schemaAttrNameToParents);
assertThat(docAttrNameToChildren)
.describedAs(toString(docAttrNameToChildren) + "\n!=\n\n" + toString(schemaAttrNameToChildren))
.containsExactlyInAnyOrderEntriesOf(schemaAttrNameToChildren);
assertThat(docAttrNameToParents)
.describedAs(toString(docAttrNameToParents) + "\n!=\n\n" + toString(schemaAttrNameToParents))
.containsExactlyInAnyOrderEntriesOf(schemaAttrNameToParents);
}
private String toString(Map<?, ?> map) {
StringBuffer buffer = new StringBuffer();
map.forEach((k, v) -> {
buffer.append(k);
buffer.append("=");
buffer.append(v);
buffer.append("\n");
});
return buffer.toString();
}
/**