fix tests

Author: nidi3

code-assert/src/main/java/guru/nidi/codeassert/dependency/DependencyRuler.java

@@ -95,6 +95,7 @@ public DependencyRule rule() {
      * Create a rule for a package allowing everything.
      * Shortcut for DependencyRule.allowAll(name);
      *
+     * @param name the package name
      * @return the rule.
      */
     public DependencyRule allowRule(String name) {
@@ -105,6 +106,7 @@ public DependencyRule allowRule(String name) {
      * Create a rule for a package denying everything.
      * Shortcut for DependencyRule.denyAll(name);
      *
+     * @param name the package name
      * @return the rule.
      */
     public DependencyRule denyRule(String name) {

code-assert/src/main/java/guru/nidi/codeassert/dependency/DependencyRules.java

@@ -185,11 +185,11 @@ private List<DependencyRule> initFields(String basePackage, DependencyRuler rule
     }
 
     private DependencyRule initField(String basePackage, DependencyRuler ruler, Field f) throws IllegalAccessException {
-        final String name = f.getName();
         final CodeElement value = (CodeElement) f.get(ruler);
         if (value instanceof DependencyRule && !"*".equals(value.pattern.getPattern())) {
             return (DependencyRule) value;
         }
+        final String name = f.getName();
         deprecationWarnings(name);
         final String pack = addPackages(basePackage, "$self".equals(name) ? "" : camelCaseToDotCase(name));
         final DependencyRule rule = rule(pack);

code-assert/src/main/java/guru/nidi/codeassert/pmd/CpdMatcher.java

@@ -20,9 +20,16 @@
 import net.sourceforge.pmd.cpd.Match;
 import org.hamcrest.Description;
 
-import java.util.Iterator;
+import java.util.*;
 
 public class CpdMatcher extends ResultMatcher<CpdResult, Match> {
+    private static final Comparator<Mark> MARK_COMPARATOR = new Comparator<Mark>() {
+        @Override
+        public int compare(Mark m1, Mark m2) {
+            return m1.getFilename().compareTo(m2.getFilename());
+        }
+    };
+
     public void describeTo(Description description) {
         description.appendText("Has no code duplications");
     }
@@ -37,13 +44,21 @@ protected void describeMismatchSafely(CpdResult item, Description description) {
     private String printMatch(Match match) {
         final StringBuilder s = new StringBuilder();
         boolean first = true;
-        final Iterator<Mark> marks = match.iterator();
-        while (marks.hasNext()) {
-            final Mark mark = marks.next();
+        for (final Mark mark : getMarks(match)) {
             s.append(first ? String.format("%-4d ", match.getTokenCount()) : "     ");
             first = false;
             s.append(String.format("%s:%d-%d%n", mark.getFilename(), mark.getBeginLine(), mark.getEndLine()));
         }
         return s.substring(0, s.length() - 1);
     }
+
+    private List<Mark> getMarks(Match match) {
+        final List<Mark> marks = new ArrayList<>();
+        final Iterator<Mark> iter = match.iterator();
+        while (iter.hasNext()) {
+            marks.add(iter.next());
+        }
+        Collections.sort(marks, MARK_COMPARATOR);
+        return marks;
+    }
 }