phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-release-notes-7

Browse Source
This commit is contained in:
Juan Martín Sotuyo Dodero
2024-03-15 13:45:08 -03:00
committed by GitHub
parent 274497bbf4 b79518191d
commit 4ce5cc824a
9 changed files with 1263 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pmd-core/src/main/java/net/sourceforge/pmd/util/GraphUtil.java
View File

@ -43,7 +43,9 @@ public final class GraphUtil {
StringBuilder sb = new StringBuilder("strict digraph {\n");
Map<V, String> ids = new HashMap<>();
int i = 0;
for (V node : vertices) {
List<V> vertexList = new ArrayList<>(vertices);
vertexList.sort(Comparator.comparing(Object::toString)); // for reproducibility in tests
for (V node : vertexList) {
String id = "n" + i++;
ids.put(node, id);
sb.append(id)
@ -56,7 +58,7 @@ public final class GraphUtil {
List<String> edges = new ArrayList<>();
for (V node : vertices) {
for (V node : vertexList) {
// edges
String id = ids.get(node);
for (V succ : successorFun.apply(node)) {

14
pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/internal/LatticeRelationTest.java
View File

@ -279,15 +279,15 @@ class LatticeRelationTest {
// all {1}, {2}, and { } are query nodes, not {1,2}
assertEquals("strict digraph {\n"
+ "n0 [ shape=box, color=green, label=\"[]\" ];\n"
+ "n0 [ shape=box, color=black, label=\"[1, 2]\" ];\n"
+ "n1 [ shape=box, color=green, label=\"[1]\" ];\n"
+ "n2 [ shape=box, color=green, label=\"[2]\" ];\n"
+ "n3 [ shape=box, color=black, label=\"[1, 2]\" ];\n"
+ "n1 -> n0;\n" // {1} -> { }
+ "n2 -> n0;\n" // {2} -> { }
+ "n3 -> n0;\n" // {1,2} -> { }
+ "n3 -> n1;\n" // {1,2} -> {1}
+ "n3 -> n2;\n" // {1,2} -> {2}
+ "n3 [ shape=box, color=green, label=\"[]\" ];\n"
+ "n0 -> n1;\n" // {1} -> { }
+ "n0 -> n2;\n" // {2} -> { }
+ "n0 -> n3;\n" // {1,2} -> { }
+ "n1 -> n3;\n" // {1,2} -> {1}
+ "n2 -> n3;\n" // {1,2} -> {2}
+ "}", lattice.toString());
}