Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-09-16 17:04:40 +02:00
Code Issues Projects Releases Wiki Activity

#337 Minor improvements in plugin.yml consistency test

Browse Source 
- Make static field immutable
- Use stricter constraint for checking children paths
- Improve error path logged upon error
This commit is contained in:
ljacqu 2016-08-05 21:27:57 +02:00
parent 69d8232cc8
commit 062e461357
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/fr/xephi/authme/permission/PermissionConsistencyTest.java
View File

@ -1,5 +1,6 @@
package fr.xephi.authme.permission;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import fr.xephi.authme.util.StringUtils;
import org.bukkit.configuration.MemorySection;
@ -126,7 +127,7 @@ public class PermissionConsistencyTest {
Map<String, PermissionDefinition> permissions = new HashMap<>();
addChildren(permsList, permissions);
return permissions;
return ImmutableMap.copyOf(permissions);
}
/**
@ -161,7 +162,8 @@ public class PermissionConsistencyTest {
*/
private static void validateChildren(PermissionDefinition definition, List<String> errorList) {
// Replace ending .* in path if present, e.g. authme.player.* -> authme.player
String root = definition.node.replaceAll("\\.\\*$", "");
// Add ending '.' since we want all children to be children, i.e. authme.playertest would not be OK
String root = definition.node.replaceAll("\\.\\*$", "") + ".";
List<String> badChildren = new ArrayList<>();
for (String child : definition.children) {
if (!child.startsWith(root)) {
@ -245,7 +247,7 @@ public class PermissionConsistencyTest {
children.add(parentSection.getCurrentPath() + "." + entry.getKey());
} else {
throw new IllegalStateException("Found child entry at '" + entry.getKey() + "' with value "
+ "of unexpected type: '" + entry.getValue() + "'");
+ "of unexpected type: '" + parentSection.getCurrentPath() + "." + entry.getValue() + "'");
}
}
}