diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index e14f59b6..f0fc5ba0 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -64,6 +64,8 @@ Build / Infrastructure:: * Use latest Maven and remove Dependabot exclusion (CI test ensure backward compatibility) (#722) * Test artifact's signature with Maven in CI (#736) * Automate release using GH Actions (#141) + * Ensure Mojos use correct default values in unit tests (#609) + Maintenance:: * Replace use of reflection by direct JavaExtensionRegistry calls to register extensions (#596) diff --git a/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorHttpMojo.java b/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorHttpMojo.java index cb95b5fd..c5d31303 100644 --- a/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorHttpMojo.java +++ b/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorHttpMojo.java @@ -11,8 +11,8 @@ public class AsciidoctorHttpMojo extends AsciidoctorRefreshMojo { public static final String PREFIX = AsciidoctorMaven.PREFIX + "http."; - @Parameter(property = PREFIX + "port") - protected int port = 2000; + @Parameter(property = PREFIX + "port", defaultValue = "2000") + protected int port; @Parameter(property = PREFIX + "home", defaultValue = "index") protected String home; diff --git a/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorRefreshMojo.java b/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorRefreshMojo.java index 854a4f22..88ba4626 100644 --- a/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorRefreshMojo.java +++ b/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorRefreshMojo.java @@ -11,22 +11,32 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; -import org.asciidoctor.maven.refresh.*; +import org.asciidoctor.maven.refresh.AdditionalSourceFileAlterationListenerAdaptor; +import org.asciidoctor.maven.refresh.AsciidoctorConverterFileAlterationListenerAdaptor; +import org.asciidoctor.maven.refresh.ResourceCopyFileAlterationListenerAdaptor; +import org.asciidoctor.maven.refresh.ResourcesPatternBuilder; +import org.asciidoctor.maven.refresh.TimeCounter; import java.io.File; import java.io.FileFilter; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Optional; +import java.util.Scanner; +import java.util.StringJoiner; import static org.asciidoctor.maven.commons.StringUtils.isNotBlank; -import static org.asciidoctor.maven.process.SourceDocumentFinder.*; +import static org.asciidoctor.maven.process.SourceDocumentFinder.CUSTOM_FILE_EXTENSIONS_PATTERN_PREFIX; +import static org.asciidoctor.maven.process.SourceDocumentFinder.CUSTOM_FILE_EXTENSIONS_PATTERN_SUFFIX; +import static org.asciidoctor.maven.process.SourceDocumentFinder.STANDARD_FILE_EXTENSIONS_PATTERN; @Mojo(name = "auto-refresh") public class AsciidoctorRefreshMojo extends AsciidoctorMojo { public static final String PREFIX = AsciidoctorMaven.PREFIX + "refresher."; - @Parameter(property = PREFIX + "interval") - protected int interval = 2000; // 2s + @Parameter(property = PREFIX + "interval", defaultValue = "2000") + protected int interval; @Parameter(property = PREFIX + "refreshOn") protected String refreshOn; diff --git a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorAsserter.java b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorAsserter.java index b713688a..cb6ce454 100644 --- a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorAsserter.java +++ b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorAsserter.java @@ -1,19 +1,22 @@ package org.asciidoctor.maven; +import lombok.SneakyThrows; import org.assertj.core.api.AbstractFileAssert; import org.assertj.core.api.AbstractStringAssert; import org.assertj.core.api.Assertions; import java.io.File; +import java.nio.file.Files; public class AsciidoctorAsserter { private final AbstractFileAssert fileAssert; private final AbstractStringAssert contentAssert; + @SneakyThrows private AsciidoctorAsserter(File generatedFile) { this.fileAssert = Assertions.assertThat(generatedFile); - this.contentAssert = Assertions.assertThat(TestUtils.readAsString(generatedFile)); + this.contentAssert = Assertions.assertThat(Files.readString(generatedFile.toPath())); } public static AsciidoctorAsserter assertThat(File file) { diff --git a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorHttpMojoTest.java b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorHttpMojoTest.java index d5c21701..9fde57d5 100644 --- a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorHttpMojoTest.java +++ b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorHttpMojoTest.java @@ -18,7 +18,7 @@ import java.net.URL; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.asciidoctor.maven.TestUtils.mockAsciidoctorHttpMojo; +import static org.asciidoctor.maven.test.TestUtils.mockAsciidoctorHttpMojo; import static org.assertj.core.api.Assertions.assertThat; class AsciidoctorHttpMojoTest { diff --git a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java index d2cafad2..642b5ef8 100644 --- a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java +++ b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java @@ -10,8 +10,8 @@ import java.util.Map; import static org.asciidoctor.maven.AsciidoctorAsserter.assertThat; -import static org.asciidoctor.maven.TestUtils.ResourceBuilder.excludeAll; -import static org.asciidoctor.maven.TestUtils.mockAsciidoctorMojo; +import static org.asciidoctor.maven.test.TestUtils.ResourceBuilder.excludeAll; +import static org.asciidoctor.maven.test.TestUtils.mockAsciidoctorMojo; import static org.asciidoctor.maven.io.TestFilesHelper.newOutputTestDirectory; /** diff --git a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoExtensionsTest.java b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoExtensionsTest.java index 8f57f4be..b93763bf 100644 --- a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoExtensionsTest.java +++ b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoExtensionsTest.java @@ -15,7 +15,7 @@ import java.util.Map; import static java.util.Collections.singletonList; -import static org.asciidoctor.maven.TestUtils.mockAsciidoctorMojo; +import static org.asciidoctor.maven.test.TestUtils.mockAsciidoctorMojo; import static org.asciidoctor.maven.io.TestFilesHelper.newOutputTestDirectory; import static org.assertj.core.api.Assertions.assertThat; diff --git a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoLogHandlerTest.java b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoLogHandlerTest.java index f626319e..f684b62d 100644 --- a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoLogHandlerTest.java +++ b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoLogHandlerTest.java @@ -16,7 +16,7 @@ import static org.asciidoctor.log.Severity.ERROR; import static org.asciidoctor.log.Severity.WARN; -import static org.asciidoctor.maven.TestUtils.mockAsciidoctorMojo; +import static org.asciidoctor.maven.test.TestUtils.mockAsciidoctorMojo; import static org.asciidoctor.maven.io.TestFilesHelper.newOutputTestDirectory; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; diff --git a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoTest.java b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoTest.java index 64f72aac..784d4e90 100644 --- a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoTest.java +++ b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoTest.java @@ -10,17 +10,28 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; +import static java.nio.file.Files.writeString; import static java.util.Collections.singletonList; import static org.asciidoctor.maven.AsciidoctorAsserter.assertThat; -import static org.asciidoctor.maven.TestUtils.*; -import static org.asciidoctor.maven.TestUtils.ResourceBuilder.excludeAll; import static org.asciidoctor.maven.io.TestFilesHelper.newOutputTestDirectory; +import static org.asciidoctor.maven.test.TestUtils.ResourceBuilder; +import static org.asciidoctor.maven.test.TestUtils.ResourceBuilder.excludeAll; +import static org.asciidoctor.maven.test.TestUtils.assertEqualsStructure; +import static org.asciidoctor.maven.test.TestUtils.mockAsciidoctorMojo; class AsciidoctorMojoTest { @@ -156,7 +167,6 @@ void should_convert_to_html_with_attributes() throws MojoFailureException, MojoE mojo.sourceDocumentName = "sample.asciidoc"; mojo.resources = excludeAll(); mojo.outputDirectory = outputDir; - mojo.standalone = true; mojo.attributes = Map.of("toc", "", "linkcss!", "", "source-highlighter", "coderay"); @@ -283,15 +293,16 @@ void should_override_output_directory_with_output_file_with_absolute_path() thro } @Test - void should_set_file_extension() throws MojoFailureException, MojoExecutionException { + void should_set_file_extension() throws MojoFailureException, MojoExecutionException, IOException { // given File outputDir = newOutputTestDirectory(); Assertions.assertThat(outputDir).doesNotExist(); File srcDir = new File(DEFAULT_SOURCE_DIRECTORY); outputDir.mkdirs(); - writeToFile(srcDir, "sample1.foo", "= Document Title\n\nfoo"); - writeToFile(srcDir, "sample2.bar", "= Document Title\n\nbar"); + + writeString(Path.of(DEFAULT_SOURCE_DIRECTORY, "sample1.foo"), "= Document Title\n\nfoo"); + writeString(Path.of(DEFAULT_SOURCE_DIRECTORY, "sample2.bar"), "= Document Title\n\nbar"); // when AsciidoctorMojo mojo = mockAsciidoctorMojo(); @@ -795,7 +806,6 @@ void should_embed_resources() throws MojoFailureException, MojoExecutionExceptio .contains("i class=\"fa icon-tip\""); } - // issue-78 @Test void should_embed_image_in_included_adoc() throws MojoFailureException, MojoExecutionException { @@ -817,7 +827,7 @@ void should_embed_image_in_included_adoc() throws MojoFailureException, MojoExec assertThat(outputDir, "main.html") .contains("

Here’s an image:

") .contains(" T mock(Class clazz, Map mavenProperties, LogHandler logHandler) { + + final AsciidoctorMojo mojo = (AsciidoctorMojo) clazz.getConstructor(new Class[]{}).newInstance(); + + parametersInitializer.initialize(mojo); + setVariableValueInObject(mojo, "log", new SystemStreamLog()); + setVariableValueInObject(mojo, "project", mockMavenProject(mavenProperties)); + if (logHandler != null) + setVariableValueInObject(mojo, "logHandler", logHandler); + + return (T) mojo; + } + + private MavenProject mockMavenProject(Map mavenProperties) { + final MavenProject mavenProject = Mockito.mock(MavenProject.class); + when(mavenProject.getBasedir()).thenReturn(new File(".")); + if (mavenProperties != null) { + final Properties properties = new Properties(); + properties.putAll(mavenProperties); + when(mavenProject.getProperties()).thenReturn(properties); + } + return mavenProject; + } +} diff --git a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/test/MojoMockerTest.java b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/test/MojoMockerTest.java new file mode 100644 index 00000000..f18a6928 --- /dev/null +++ b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/test/MojoMockerTest.java @@ -0,0 +1,36 @@ +package org.asciidoctor.maven.test; + +import org.asciidoctor.maven.AsciidoctorMojo; +import org.asciidoctor.maven.log.LogHandler; +import org.junit.jupiter.api.Test; + +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; + +class MojoMockerTest { + + private final MojoMocker mojoMocker = new MojoMocker(); + + @Test + void should_mock_mojo() { + AsciidoctorMojo mock = mojoMocker.mock(AsciidoctorMojo.class, null, null); + + assertThat(mock).isNotNull(); + } + + @Test + void should_mock_mojo_with_properties() { + Map properties = Map.of("a-key", "a-value"); + AsciidoctorMojo mock = mojoMocker.mock(AsciidoctorMojo.class, properties, null); + + assertThat(mock).isNotNull(); + } + + @Test + void should_mock_mojo_with_logHandler() { + AsciidoctorMojo mock = mojoMocker.mock(AsciidoctorMojo.class, null, new LogHandler()); + + assertThat(mock).isNotNull(); + } +} diff --git a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/ParametersInitializer.java b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/test/ParametersInitializer.java similarity index 83% rename from asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/ParametersInitializer.java rename to asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/test/ParametersInitializer.java index b868a514..0707238a 100644 --- a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/ParametersInitializer.java +++ b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/test/ParametersInitializer.java @@ -1,4 +1,4 @@ -package org.asciidoctor.maven; +package org.asciidoctor.maven.test; import net.bytebuddy.description.annotation.AnnotationDescription; import net.bytebuddy.description.annotation.AnnotationValue; @@ -12,7 +12,7 @@ import static org.codehaus.plexus.util.ReflectionUtils.setVariableValueInObject; /** - * + * Initialize values for properties in class using {@link Parameter} annotation. */ class ParametersInitializer { @@ -22,7 +22,7 @@ class ParametersInitializer { * Returns instance of input class with fields initialized according to its * respective {@link org.apache.maven.plugins.annotations.Parameter}. */ - public T initialize(T instance) { + T initialize(T instance) { try { // Use ByteBuddy because annotations is Class retention, not Runtime TypePool typePool = TypePool.Default.of(CLASS_LOADER); @@ -42,19 +42,25 @@ private void initParameterFields(T instance, TypeDescription typeDescription for (FieldDescription field : declaredFields) { String value = getAnnotationByType(field); if (value != null) { - if (field.getType().getTypeName().equals(String.class.getName())) { + final String typeName = field.getType().getTypeName(); + if (typeName.equals(String.class.getName())) { if (value.length() > 0 && !value.startsWith("$")) { // TODO support Maven variable: pass Map ? setVariableValueInObject(instance, field.getName(), value); } } - if (field.getType().getTypeName().equals("boolean")) { - // false is already the default - // TODO for PR, the booleans default should appear in XML plugin descriptor now + if (typeName.equals("boolean")) { if (value.equals("true")) { setVariableValueInObject(instance, field.getName(), Boolean.TRUE); } else if (!value.equals("false")) { - throw new RuntimeException("Invalid boolean default: not-a-boolean"); + throw new RuntimeException("Invalid boolean default: " + value); + } + } + if (typeName.equals("int")) { + try { + setVariableValueInObject(instance, field.getName(), Integer.valueOf(value)); + } catch (Exception e) { + throw new RuntimeException("Invalid boolean default: " + value); } } // TODO diff --git a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/ParametersInitializerTest.java b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/test/ParametersInitializerTest.java similarity index 71% rename from asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/ParametersInitializerTest.java rename to asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/test/ParametersInitializerTest.java index 92ba43c1..8cd1b329 100644 --- a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/ParametersInitializerTest.java +++ b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/test/ParametersInitializerTest.java @@ -1,4 +1,4 @@ -package org.asciidoctor.maven; +package org.asciidoctor.maven.test; import org.apache.maven.plugins.annotations.Parameter; import org.junit.jupiter.api.Nested; @@ -35,6 +35,13 @@ void boolean_with_default_value() { assertThat(initialized.defaultValue).isTrue(); } + @Test + void int_with_default_value() { + final var instance = new IntExampleMojo(); + var initialized = initializer.initialize(instance); + assertThat(initialized.defaultValue).isEqualTo(1243); + } + @Test void properties_in_class_and_parent() { final var instance = new SubclassExampleMojo(); @@ -61,18 +68,35 @@ void boolean_without_default_value() { var initialized = initializer.initialize(instance); assertThat(initialized.nonDefaultValue).isFalse(); } + + @Test + void int_without_default_value() { + final var instance = new IntExampleMojo(); + var initialized = initializer.initialize(instance); + assertThat(initialized.nonDefaultValue).isEqualTo(0); + } } @Nested class ShouldFail { + @Test void boolean_with_invalid_value() { - final var instance = new FailingExampleMojo(); + final var instance = new FailingBooleanExampleMojo(); Throwable t = catchThrowable(() -> initializer.initialize(instance)); assertThat(t).isInstanceOf(RuntimeException.class) .hasMessage("Invalid boolean default: not-a-boolean"); } + + @Test + void int_with_invalid_value() { + final var instance = new FailingIntExampleMojo(); + Throwable t = catchThrowable(() -> initializer.initialize(instance)); + + assertThat(t).isInstanceOf(RuntimeException.class) + .hasMessage("Invalid boolean default: not-an-int"); + } } @@ -109,12 +133,27 @@ class BooleanExampleMojo { private boolean nonDefaultValue; } - class FailingExampleMojo { + class IntExampleMojo { + + @Parameter(defaultValue = "1243") + private int defaultValue; + + @Parameter + private int nonDefaultValue; + } + + class FailingBooleanExampleMojo { @Parameter(defaultValue = "not-a-boolean") private boolean invalidValue; } + class FailingIntExampleMojo { + + @Parameter(defaultValue = "not-an-int") + private int invalidValue; + } + class SubclassExampleMojo extends StringExampleMojo { @Parameter(defaultValue = "from-subclass") diff --git a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/TestUtils.java b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/test/TestUtils.java similarity index 56% rename from asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/TestUtils.java rename to asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/test/TestUtils.java index 05e6683d..08d148d1 100644 --- a/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/TestUtils.java +++ b/asciidoctor-maven-plugin/src/test/java/org/asciidoctor/maven/test/TestUtils.java @@ -1,105 +1,49 @@ -package org.asciidoctor.maven; - -import lombok.SneakyThrows; -import net.bytebuddy.ByteBuddy; -import net.bytebuddy.ClassFileVersion; -import net.bytebuddy.description.annotation.AnnotationDescription; -import net.bytebuddy.description.annotation.AnnotationValue; -import net.bytebuddy.description.field.FieldDescription; -import net.bytebuddy.description.type.TypeDescription; -import net.bytebuddy.pool.TypePool; -import org.apache.commons.io.IOUtils; -import org.apache.maven.plugin.logging.SystemStreamLog; -import org.apache.maven.plugins.annotations.Parameter; -import org.apache.maven.project.MavenProject; +package org.asciidoctor.maven.test; + +import org.asciidoctor.maven.AsciidoctorHttpMojo; +import org.asciidoctor.maven.AsciidoctorMojo; +import org.asciidoctor.maven.AsciidoctorRefreshMojo; +import org.asciidoctor.maven.AsciidoctorZipMojo; import org.asciidoctor.maven.log.LogHandler; import org.asciidoctor.maven.model.Resource; -import org.mockito.Mockito; import java.io.File; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.stream.Collectors; import static java.util.Collections.singletonList; import static org.asciidoctor.maven.process.SourceDocumentFinder.STANDARD_FILE_EXTENSIONS_PATTERN; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatPath; -import static org.codehaus.plexus.util.ReflectionUtils.setVariableValueInObject; -import static org.mockito.Mockito.when; public class TestUtils { - private static final ParametersInitializer parametersInitializer = new ParametersInitializer(); + private static final MojoMocker mojoMocker = new MojoMocker(); - @SneakyThrows public static AsciidoctorRefreshMojo newFakeRefreshMojo() { - return mockAsciidoctorMojo(AsciidoctorRefreshMojo.class, null, null); + return mojoMocker.mock(AsciidoctorRefreshMojo.class, null, null); } - @SneakyThrows public static AsciidoctorMojo mockAsciidoctorMojo() { - return mockAsciidoctorMojo(AsciidoctorMojo.class, null, null); + return mojoMocker.mock(AsciidoctorMojo.class, null, null); } - @SneakyThrows public static AsciidoctorHttpMojo mockAsciidoctorHttpMojo() { - return mockAsciidoctorMojo(AsciidoctorHttpMojo.class, null, null); + return mojoMocker.mock(AsciidoctorHttpMojo.class, null, null); } - @SneakyThrows public static AsciidoctorZipMojo mockAsciidoctorZipMojo() { - return mockAsciidoctorMojo(AsciidoctorZipMojo.class, null, null); + return mojoMocker.mock(AsciidoctorZipMojo.class, null, null); } - @SneakyThrows public static AsciidoctorMojo mockAsciidoctorMojo(Map mavenProperties) { - return mockAsciidoctorMojo(AsciidoctorMojo.class, mavenProperties, null); + return mojoMocker.mock(AsciidoctorMojo.class, mavenProperties, null); } - @SneakyThrows public static AsciidoctorMojo mockAsciidoctorMojo(LogHandler logHandler) { - return mockAsciidoctorMojo(AsciidoctorMojo.class, null, logHandler); - } - - @SneakyThrows - @SuppressWarnings("unchecked") - private static T mockAsciidoctorMojo(Class clazz, Map mavenProperties, LogHandler logHandler) { - final MavenProject mavenProject = Mockito.mock(MavenProject.class); - when(mavenProject.getBasedir()).thenReturn(new File(".")); - if (mavenProperties != null) { - final Properties properties = new Properties(); - properties.putAll(mavenProperties); - when(mavenProject.getProperties()).thenReturn(properties); - } - - final AsciidoctorMojo mojo = (AsciidoctorMojo) clazz.getConstructor(new Class[]{}).newInstance(); - parametersInitializer.initialize(mojo); - setVariableValueInObject(mojo, "log", new SystemStreamLog()); - mojo.project = mavenProject; - if (logHandler != null) - setVariableValueInObject(mojo, "logHandler", logHandler); - - return (T) mojo; - } - - @SneakyThrows - public static String readAsString(File file) { - return IOUtils.toString(new FileReader(file)); - } - - @SneakyThrows - public static void writeToFile(File parent, String filename, String... lines) { - FileOutputStream fileOutputStream = new FileOutputStream(new File(parent, filename)); - for (String line : lines) { - IOUtils.write(line, fileOutputStream, StandardCharsets.UTF_8); - } + return mojoMocker.mock(AsciidoctorMojo.class, null, logHandler); } public static class ResourceBuilder { @@ -152,7 +96,7 @@ public static List excludeAll() { public static void assertEqualsStructure(File[] expected, File[] actual) { List sanitizedExpected = Arrays.stream(expected) - .filter(TestUtils::isHidden) + .filter(TestUtils::isNotHidden) .collect(Collectors.toList()); List expectedNames = sanitizedExpected.stream().map(File::getName).collect(Collectors.toList()); @@ -180,8 +124,8 @@ public static void assertEqualsStructure(File[] expected, File[] actual) { } } - private static boolean isHidden(File file) { - char firstChar = file.getName().charAt(0); + private static boolean isNotHidden(File file) { + final char firstChar = file.getName().charAt(0); return firstChar != '_' && firstChar != '.'; } }