Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public boolean acceptedGroupId(String groupId) {
}
if (currentNode.isStop() && groupElements.equals(current)) {
accepted = currentNode.isAllow();
} else if (!currentNode.isStop()) {
} else if (!currentNode.isStop() && currentNode.isAllow() != null) {
accepted = currentNode.isAllow();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,37 @@ void implicitAndExplicitDefaultIsSame() {

assertEquals(implicitResults, explicitResults);
}

@Test
void gh1703One() {
GroupTree groupTree;

// REPRODUCER as given
groupTree = new GroupTree("root");
// this is redundant, as 'org.apache' IMPLIES 'org.apache.maven.plugins'
groupTree.loadNodes(Stream.of("# comment", "", "org.apache", "org.apache.maven.plugins"));

assertTrue(groupTree.acceptedGroupId("org.apache")); // this is given
assertTrue(groupTree.acceptedGroupId("org.apache.maven")); // implied by first
assertTrue(groupTree.acceptedGroupId("org.apache.maven.plugins")); // implied by first (line is redundant)
assertTrue(groupTree.acceptedGroupId("org.apache.maven.plugins.foo")); // implied by first

// FIXED
groupTree = new GroupTree("root");
groupTree.loadNodes(Stream.of("# comment", "", "=org.apache", "org.apache.maven.plugins"));

assertTrue(groupTree.acceptedGroupId("org.apache")); // this is given (=)
assertFalse(groupTree.acceptedGroupId("org.apache.maven")); // not allowed
assertTrue(groupTree.acceptedGroupId("org.apache.maven.plugins")); // this is given (and below)
assertTrue(groupTree.acceptedGroupId("org.apache.maven.plugins.foo")); // implied by above

// MIXED
groupTree = new GroupTree("root");
groupTree.loadNodes(Stream.of("# comment", "", "org.apache", "!=org.apache.maven.plugins"));

assertTrue(groupTree.acceptedGroupId("org.apache")); // this is given
assertTrue(groupTree.acceptedGroupId("org.apache.maven")); // implied by first
assertFalse(groupTree.acceptedGroupId("org.apache.maven.plugins")); // this is given (!=)
assertTrue(groupTree.acceptedGroupId("org.apache.maven.plugins.foo")); // implied by first
}
}