fix tests

Author: nidi3

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

@@ -33,7 +33,8 @@ public class DependencyAnalyzer implements Analyzer<Dependencies> {
     private final DependencyCollector collector;
 
     public DependencyAnalyzer(AnalyzerConfig config) {
-        this(Model.from(config.getClasses()).read(), DependencyRules.denyAll(), Scope.PACKAGES, new DependencyCollector());
+        this(Model.from(config.getClasses()).read(), DependencyRules.denyAll(),
+                Scope.PACKAGES, new DependencyCollector());
     }
 
     public DependencyAnalyzer(Model model) {

code-assert/src/main/java/guru/nidi/codeassert/model/CodeClassBuilder.java

@@ -115,7 +115,8 @@ public CodeClassBuilder addCodeSizes(int totalSize, List<MemberInfo> methods) {
         return this;
     }
 
-    public CodeClassBuilder addSourceSizes(int sourceSize, int codeLines, int commentLines, int emptyLines, int totalLines) {
+    public CodeClassBuilder addSourceSizes(int sourceSize,
+                                           int codeLines, int commentLines, int emptyLines, int totalLines) {
         clazz.sourceSize = sourceSize;
         clazz.codeLines = codeLines;
         clazz.commentLines = commentLines;

code-assert/src/main/java/guru/nidi/codeassert/model/ModelBuilder.java

@@ -26,12 +26,7 @@ public class ModelBuilder {
     private final List<String> ignorePackages = new ArrayList<>();
     private final List<String> mergePackages = new ArrayList<>();
 
-    public static ModelBuilder from(File... files) {
-        return from(asList(files));
-    }
-
-    public static ModelBuilder from(List<File> files) {
-        return new ModelBuilder().and(files);
+    ModelBuilder() {
     }
 
     public ModelBuilder and(File... files) {
@@ -62,6 +57,6 @@ public ModelBuilder mergingPackages(List<String> packages) {
     }
 
     public Model read() {
-        return new Model(ignorePackages,mergePackages).read(files);
+        return new Model(ignorePackages, mergePackages).read(files);
     }
 }

code-assert/src/main/java/guru/nidi/codeassert/model/SourceFileParser.java

@@ -71,8 +71,8 @@ static CodeClass parse(CodeClass clazz, Language language, Reader reader) throws
                 LOG.info("No parser for language {}. Ignoring it", language);
             } else {
                 parser.parse(in);
-                new CodeClassBuilder(clazz)
-                        .addSourceSizes(parser.sourceSize, parser.codeLines, parser.commentLines, parser.emptyLines, parser.totalLines);
+                new CodeClassBuilder(clazz).addSourceSizes(parser.sourceSize,
+                        parser.codeLines, parser.commentLines, parser.emptyLines, parser.totalLines);
             }
             return clazz;
         }

code-assert/src/test/java/guru/nidi/codeassert/EatYourOwnDogfoodTest.java

@@ -23,6 +23,7 @@
 import guru.nidi.codeassert.jacoco.Coverage;
 import guru.nidi.codeassert.junit.CodeAssertJunit5Test;
 import guru.nidi.codeassert.ktlint.KtlintAnalyzer;
+import guru.nidi.codeassert.model.CodeClass;
 import guru.nidi.codeassert.pmd.*;
 import net.sourceforge.pmd.RulePriority;
 import org.junit.jupiter.api.BeforeAll;
@@ -45,7 +46,8 @@ class GuruNidiCodeassert extends DependencyRuler {
             DependencyRule findBugsLib = denyRule("edu.umd.cs.findbugs").andAllSub();
             DependencyRule ktlintLib = denyRule("com.github.shyiko.ktlint").andAllSub();
             DependencyRule pmdLib = denyRule("net.sourceforge.pmd").andAllSub();
-            DependencyRule config, dependency, findbugs, checkstyle, detekt, model, pmd, ktlint, util, junit, junitKotlin, jacoco;
+            DependencyRule graphvizLib = denyRule("guru.nidi.graphviz").andAllSub();
+            DependencyRule config, dependency, findbugs, checkstyle, detekt, io, model, pmd, ktlint, util, junit, junitKotlin, jacoco;
 
             @Override
             public void defineRules() {
@@ -58,6 +60,7 @@ public void defineRules() {
                 checkstyle.mayUse(checkstyleLib);
                 detekt.mayUse(detektLib);
                 findbugs.mayUse(findBugsLib);
+                io.mayUse(jacoco, model, graphvizLib);
                 ktlint.mayUse(ktlintLib);
                 pmd.mayUse(pmdLib);
             }
@@ -100,6 +103,8 @@ protected PmdResult analyzePmd() {
                         In.classes("Reason").ignore("SingularField"),
                         In.clazz(Coverage.class).ignore("ExcessiveParameterList"),
                         In.clazz(LocationMatcher.class).ignore("GodClass"),
+                        In.classes("ClassFileParser").ignore("PrematureDeclaration"),
+                        In.clazz(CodeClass.class).ignore("TooManyFields"),
                         In.classes("SourceFileParser", "Location", "LocationMatcher")
                                 .ignore("CyclomaticComplexity", "ModifiedCyclomaticComplexity", "StdCyclomaticComplexity"),
                         In.classes("DependencyRules", "CodeClassBuilder").ignore("GodClass"),

code-assert/src/test/java/guru/nidi/codeassert/checkstyle/CheckstyleTest.java

@@ -75,7 +75,7 @@ void google() {
                         + line(WARNING, "one.top.level.class", TEST, "model/ExampleConcreteClass", 79, "Top-level class ExamplePackageClass has to reside in its own source file.")
                         + line(WARNING, "overload.methods.declaration", MAIN, "config/BaseCollector", 57, "Overload methods should not be split. Previous overloaded method located at line '51'.")
                         + line(WARNING, "overload.methods.declaration", MAIN, "config/BaseCollector", 68, "Overload methods should not be split. Previous overloaded method located at line '55'.")
-                        + line(WARNING, "overload.methods.declaration", MAIN, "model/SourceFileParser", 91, "Overload methods should not be split. Previous overloaded method located at line '66'.")
+                        + line(WARNING, "overload.methods.declaration", MAIN, "model/SourceFileParser", 92, "Overload methods should not be split. Previous overloaded method located at line '67'.")
                         + line(WARNING, "tag.continuation.indent", MAIN, "dependency/DependencyMap", 101, "Line continuation have incorrect indentation level, expected level should be 4."),
                 analyzer.analyze(), hasNoCheckstyleIssues());
     }

code-assert/src/test/java/guru/nidi/codeassert/dependency/DependencyRulesTest.java

@@ -404,7 +404,7 @@ public void defineRules() {
         assertEquals(new DependencyMap()
                         .with(0, dep("CycleTest"), set(), ca("junit.CodeAssertMatchers")),
                 result3.denied);
-        assertEquals(67, result.undefined.size());
+        assertEquals(68, result.undefined.size());
     }
 
     private static String ca(String s) {

code-assert/src/test/java/guru/nidi/codeassert/model/AnalyzerTest.java

@@ -25,11 +25,11 @@ class AnalyzerTest {
 
     @Test
     void packages() {
-        assertEquals(40, model.getPackages().size());
+        assertEquals(41, model.getPackages().size());
     }
 
     @Test
     void classes() {
-        assertEquals(130, model.getClasses().size());
+        assertEquals(133, model.getClasses().size());
     }
 }

code-assert/src/test/java/guru/nidi/codeassert/pmd/PmdTest.java

@@ -79,6 +79,8 @@ void pmdIgnore() {
                         + pmd(MEDIUM, "MissingStaticMethodInNonInstantiatableClass", TEST, "Bugs2", "Class cannot be instantiated and does not provide any static methods or fields")
                         + pmd(MEDIUM, "NoPackage", TEST, "/CodeCoverage", "All classes and interfaces must belong to a named package")
                         + pmd(MEDIUM, "NullAssignment", MAIN, "dependency/DependencyRules", "Assigning an Object to null is a code smell.  Consider refactoring.")
+                        + pmd(MEDIUM, "PrematureDeclaration", MAIN, "model/ClassFileParser", "Avoid declaring a variable if it is unreferenced before a possible exit point.")
+                        + pmd(MEDIUM, "TooManyFields", MAIN, "model/CodeClass", "Too many fields")
                         + pmd(MEDIUM, "TooManyStaticImports", MAIN, "config/AnalyzerConfig", "Too many static imports may lead to messy code")
                         + pmd(MEDIUM, "TooManyStaticImports", MAIN, "detekt/DetektAnalyzer", "Too many static imports may lead to messy code")
                         + pmd(MEDIUM, "TooManyStaticImports", MAIN, "ktlint/KtlintAnalyzer", "Too many static imports may lead to messy code")