Fix setup

Author: astubbs

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -67,16 +68,17 @@
             <version>1.18.12</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>5.7.0-RC1</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <version>3.16.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.7.0-RC1</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -95,6 +97,12 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
+            </plugin>
+        </plugins>
     </build>
 
     <distributionManagement>

src/main/java/io/whelk/asciidoc/TemplateMojo.java

@@ -1,13 +1,6 @@
 package io.whelk.asciidoc;
 
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
+import lombok.SneakyThrows;
 import lombok.Value;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -17,8 +10,16 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 
-import lombok.SneakyThrows;
-import org.assertj.core.util.VisibleForTesting;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 @Mojo(name = "build", defaultPhase = LifecyclePhase.PACKAGE)
 public class TemplateMojo extends AbstractMojo {
@@ -42,8 +43,8 @@ public class TemplateMojo extends AbstractMojo {
     @Parameter(defaultValue = "${project}", required = true, readonly = true)
     MavenProject project;
 
-    @VisibleForTesting
-    Map<String, String> vars;
+    // @VisibleForTesting
+    Map<String, String> vars = Map.of();
 
     @SneakyThrows
     public void execute() throws MojoExecutionException, MojoFailureException {
@@ -63,7 +64,7 @@ private List<String> readLines(String first, String... more) {
         return strings;
     }
 
-    @VisibleForTesting
+    // @VisibleForTesting
     Map<String, String> loadVars(List<String> strings) {
         String varRegex = "^:[\\w\\-]+:"; //includes dashes
         Pattern compile = Pattern.compile(varRegex);
@@ -105,7 +106,7 @@ private boolean matchesIncludeLine(final String line) {
                 line.endsWith("]");
     }
 
-    @VisibleForTesting
+    // @VisibleForTesting
     List<String> updateIncludeLine(final String line) {
         var pathAndOptions = extractPathAndOptions(line);
         if (pathAndOptions.optionMap.containsKey(TAG)) {
@@ -145,7 +146,7 @@ class PathAndOptions {
         Map<String, String> optionMap;
     }
 
-    @VisibleForTesting
+    // @VisibleForTesting
     PathAndOptions extractPathAndOptions(String line) {
         int pathStart = 9;
         Pattern pattern = Pattern.compile("\\[.*\\]$");

src/test/java/io/whelk/asciidoc/TemplateMojoTest.java

@@ -1,11 +1,8 @@
 package io.whelk.asciidoc;
 
 import io.whelk.asciidoc.TemplateMojo.PathAndOptions;
-
 import org.junit.jupiter.api.Test;
 
-import java.util.AbstractMap;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -29,7 +26,7 @@ void testFilePathExtraction() {
     }
 
     @Test
-    void includeJavaCode() {
+    void testIncludeJavaCode() {
         TemplateMojo templateMojo = new TemplateMojo();
         templateMojo.templateDirectory = "./";