Merge branch '__rultor'

objectionary · Sep 8, 2023 · 835e861 · 835e861 · 0pdd · Sep 8, 2023
2 parents 1f4614e + 4b8af29
commit 835e861
Show file tree

Hide file tree

Showing 35 changed files with 1,450 additions and 653 deletions.
diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/BinarizeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/BinarizeMojo.java
@@ -98,7 +98,7 @@ public void exec() throws IOException {
                         return 1;
                     },
                     new Filtered<>(
-                        project -> BinarizeMojo.valid(project),
+                        BinarizeMojo::valid,
                         targetDir.toPath().resolve("Lib").toFile().listFiles()
                     )
                 )
@@ -110,7 +110,7 @@ public void exec() throws IOException {
     /**
      * Is the project valid?
      * @param project File to check.
-     * @return True if valid. Otherwise false.
+     * @return True if valid. Otherwise, false.
      */
     private static boolean valid(final File project) {
         return project.isDirectory()

diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/ParseMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/ParseMojoTest.java
@@ -121,7 +121,7 @@ void crashesOnInvalidSyntax(@TempDir final Path temp) {
             Assertions.assertThrows(
                 IllegalStateException.class,
                 () -> new FakeMaven(temp)
-                    .withProgram("something < is wrong here")
+                    .withProgram("something > is wrong here")
                     .with("failOnError", true)
                     .execute(ParseMojo.class)
             ).getCause().getCause().getMessage(),

diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/ProbeMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/ProbeMojoTest.java
@@ -217,11 +217,11 @@ void findsProbesWithVersionsInDifferentObjectionaries(@TempDir final Path temp)
 
     private static String[] program() {
         return new String[]{
-            "+package org.eolang.custom",
-            "",
+            "+package org.eolang.custom\n",
             "[] > main",
             "  QQ.io.stdout > @",
-            "    QQ.txt.sprintf \"I am %d years old\"",
+            "    QQ.txt.sprintf",
+            "      \"I am %d years old\"",
             "      plus.",
             "        1337",
             "        228",

diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/PullMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/PullMojoTest.java
@@ -88,11 +88,11 @@ void pullsSuccessfully(@TempDir final Path temp) throws IOException {
     void pullsFromProbes(@TempDir final Path temp) throws IOException {
         new FakeMaven(temp)
             .withProgram(
-                "+package org.eolang.custom",
-                "",
+                "+package org.eolang.custom\n",
                 "[] > main",
                 "  QQ.io.stdout > @",
-                "    QQ.txt.sprintf \"I am %d years old\"",
+                "    QQ.txt.sprintf",
+                "      \"I am %d years old\"",
                 "      plus.",
                 "        1337",
                 "        228"

diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/SafeMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/SafeMojoTest.java
@@ -45,14 +45,14 @@ void logsStackTrace(final Logs out, @TempDir final Path temp) {
         Assertions.assertThrows(
             IllegalStateException.class,
             () -> new FakeMaven(temp)
-                .withProgram("something < is definitely wrong here")
+                .withProgram("something > is definitely wrong here")
                 .with("failOnError", true)
                 .execute(ParseMojo.class)
         );
         MatcherAssert.assertThat(
             String.join("\n", out.captured()),
             Matchers.allOf(
-                Matchers.containsString("no viable alternative at input"),
+                Matchers.containsString("mismatched input ' ' expecting {'!', EOL, EOP}"),
                 Matchers.containsString("Failed to parse")
             )
         );

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/mess.eo b/eo-maven-plugin/src/test/resources/org/eolang/maven/mess.eo
@@ -10,7 +10,9 @@
 
 [n] > alpha
   [] > x
-    a pi 666 > pp
+    a > pi
+      pi
+      666
       two.f1.f2 x
   stdout > z
     sprintf > f!

diff --git a/eo-parser/pom.xml b/eo-parser/pom.xml
@@ -188,6 +188,15 @@ SOFTWARE.
       <id>qulice</id>
       <build>
         <plugins>
+          <plugin>
+            <groupId>com.qulice</groupId>
+            <artifactId>qulice-maven-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>checkstyle:/src/main/java/org/eolang/parser/XeListener.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
           <plugin>
             <groupId>com.github.volodya-lombrozo</groupId>
             <artifactId>jtcop-maven-plugin</artifactId>