From cf8769d4b047b72ab94e5ef7782192334c36fe96 Mon Sep 17 00:00:00 2001 From: Alekseeva Yana Date: Thu, 30 Nov 2023 17:46:37 +0300 Subject: [PATCH 1/4] fix(#2406): added todo + test --- .../org/eolang/maven/AssembleMojoTest.java | 21 +++++++++++++++++++ .../test/java/org/eolang/maven/FakeMaven.java | 7 +++++++ 2 files changed, 28 insertions(+) diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoTest.java index e518906022..b2157407ad 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoTest.java @@ -261,6 +261,27 @@ void assemblesSuccessfullyInOfflineMode(final Logs out, @TempDir final Path temp ); } + @Test + void configuresChildParameters(@TempDir final Path temp) throws IOException { + final Map res = new FakeMaven(temp) + .withHelloWorld() + .with("trackOptimizationSteps", true) + .execute(AssembleMojo.class) + .result(); + MatcherAssert.assertThat( + res, + Matchers.hasKey( + String.format("target/%s/foo/x/main/01-not-empty-atoms.xml", OptimizeMojo.STEPS) + ) + ); + MatcherAssert.assertThat( + res, + Matchers.hasKey( + String.format("target/%s/foo/x/main.%s", OptimizeMojo.DIR, TranspileMojo.EXT) + ) + ); + } + private static String joinedWithUnderscore(final String first, final String second) { return String.join("_", first, second); } diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java b/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java index 6a4ccf8350..ee374642e6 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java @@ -70,6 +70,13 @@ * their behaviour and results. * NOT thread-safe. * @since 0.28.12 + * @todo #2406:30min Fix {@link FakeMaven#allowedParams(Class)} + * This function + * parameters of executed Mojo in {@link FakeMaven#execute(Class)} + * and parameters those Mojos which are inside this executed Mojo. + * If executed Mojo doesn't have parameters that are inside other Mojos, + * other Mojos parameters will not be configured. + * We need to make sure that custom parameters can be configured too. */ @SuppressWarnings({ "PMD.TooManyMethods", From f72379e17f7cfdeed6e7ad9523b9e43216e25bb2 Mon Sep 17 00:00:00 2001 From: Alekseeva Yana Date: Thu, 30 Nov 2023 18:25:44 +0300 Subject: [PATCH 2/4] fix(#2406): added todo + test --- .../src/main/java/org/eolang/maven/AssembleMojo.java | 9 --------- .../src/test/java/org/eolang/maven/AssembleMojoTest.java | 1 + .../src/test/java/org/eolang/maven/FakeMaven.java | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/AssembleMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/AssembleMojo.java index 9120e938e4..6c89add7cc 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/AssembleMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/AssembleMojo.java @@ -105,15 +105,6 @@ public final class AssembleMojo extends SafeMojo { @Parameter(property = "eo.discoverSelf", required = true, defaultValue = "false") private boolean discoverSelf; - /** - * Track optimization steps into intermediate XML files? - * @checkstyle MemberNameCheck (7 lines) - * @since 0.24.0 - */ - @SuppressWarnings("PMD.LongVariable") - @Parameter(property = "eo.trackOptimizationSteps", required = true, defaultValue = "false") - private boolean trackOptimizationSteps; - /** * Whether we should fail on error. * @checkstyle MemberNameCheck (7 lines) diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoTest.java index b2157407ad..379aaded7d 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoTest.java @@ -262,6 +262,7 @@ void assemblesSuccessfullyInOfflineMode(final Logs out, @TempDir final Path temp } @Test + @Disabled void configuresChildParameters(@TempDir final Path temp) throws IOException { final Map res = new FakeMaven(temp) .withHelloWorld() diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java b/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java index ee374642e6..65392a7180 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java @@ -77,6 +77,7 @@ * If executed Mojo doesn't have parameters that are inside other Mojos, * other Mojos parameters will not be configured. * We need to make sure that custom parameters can be configured too. + * Test {@link AssembleMojoTest#configuresChildParameters(Path)} need enable. */ @SuppressWarnings({ "PMD.TooManyMethods", From e4641c8dae82827d56013b8c77d725e4713bb07d Mon Sep 17 00:00:00 2001 From: Alekseeva Yana Date: Thu, 30 Nov 2023 18:26:34 +0300 Subject: [PATCH 3/4] fix(#2406): added todo + test --- eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java b/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java index 65392a7180..507db7d4ef 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java @@ -71,8 +71,7 @@ * NOT thread-safe. * @since 0.28.12 * @todo #2406:30min Fix {@link FakeMaven#allowedParams(Class)} - * This function - * parameters of executed Mojo in {@link FakeMaven#execute(Class)} + * This function parameters of executed Mojo in {@link FakeMaven#execute(Class)} * and parameters those Mojos which are inside this executed Mojo. * If executed Mojo doesn't have parameters that are inside other Mojos, * other Mojos parameters will not be configured. From f96ab07fe5937baa057cd316538192e86790aff5 Mon Sep 17 00:00:00 2001 From: Alekseeva Yana Date: Fri, 1 Dec 2023 12:01:09 +0300 Subject: [PATCH 4/4] fix(#2406): added todo + test --- .../src/test/java/org/eolang/maven/AssembleMojoTest.java | 2 ++ eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoTest.java index 379aaded7d..db3330bce3 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoTest.java @@ -270,12 +270,14 @@ void configuresChildParameters(@TempDir final Path temp) throws IOException { .execute(AssembleMojo.class) .result(); MatcherAssert.assertThat( + "AssembleMojo should have configured parameters within the Mojos that it uses, but it didn't", res, Matchers.hasKey( String.format("target/%s/foo/x/main/01-not-empty-atoms.xml", OptimizeMojo.STEPS) ) ); MatcherAssert.assertThat( + "AssembleMojo should have configured parameters within the Mojos that it uses, but it didn't", res, Matchers.hasKey( String.format("target/%s/foo/x/main.%s", OptimizeMojo.DIR, TranspileMojo.EXT) diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java b/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java index 507db7d4ef..261c5ff084 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java @@ -71,12 +71,12 @@ * NOT thread-safe. * @since 0.28.12 * @todo #2406:30min Fix {@link FakeMaven#allowedParams(Class)} - * This function parameters of executed Mojo in {@link FakeMaven#execute(Class)} + * This function configures parameters of executed Mojo in {@link FakeMaven#execute(Class)} * and parameters those Mojos which are inside this executed Mojo. * If executed Mojo doesn't have parameters that are inside other Mojos, * other Mojos parameters will not be configured. * We need to make sure that custom parameters can be configured too. - * Test {@link AssembleMojoTest#configuresChildParameters(Path)} need enable. + * We need to enable the test {@link AssembleMojoTest#configuresChildParameters(Path)}. */ @SuppressWarnings({ "PMD.TooManyMethods",