Merge branch '__rultor'

objectionary · May 29, 2023 · 2f3e204 · 2f3e204
2 parents 9007e9e + 6c339ae
commit 2f3e204
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 18 deletions.
diff --git a/eo-maven-plugin/pom.xml b/eo-maven-plugin/pom.xml
@@ -264,6 +264,13 @@ SOFTWARE.
             <runtime.jar>${org.eolang:eo-runtime:jar}</runtime.jar>
             <runtime.path>${project.basedir}/../eo-runtime</runtime.path>
           </systemPropertyVariables>
+          <properties>
+            <configurationParameters>
+              junit.jupiter.execution.parallel.enabled = true
+              junit.jupiter.execution.parallel.mode.default = concurrent
+              junit.jupiter.execution.parallel.mode.classes.default = concurrent
+            </configurationParameters>
+          </properties>
         </configuration>
       </plugin>
       <plugin>

diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/LogFormatTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/LogFormatTest.java
@@ -24,17 +24,19 @@
 package org.eolang.maven;
 
 import com.jcabi.log.Logger;
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junitpioneer.jupiter.StdIo;
 import org.junitpioneer.jupiter.StdOut;
-import org.junitpioneer.jupiter.WritesStdIo;
 
 /**
  * Tests of the log4j logger messages format.
@@ -57,28 +59,23 @@ class LogFormatTest {
     private static final String FORMAT =
         "^\\d{2}:\\d{2}:\\d{2} \\[INFO] org.eolang.maven.LogFormatTest: Wake up, Neo...";
 
-    @Test
+    /**
+     * Message to log.
+     */
+    private static final String MESSAGE = "Wake up, Neo...";
+
     @StdIo
-    @WritesStdIo
-    void printsFormattedMessage(final StdOut out) throws IOException {
-        final String message = "Wake up, Neo...";
-        Logger.info(this, message);
-        out.flush();
-        final Optional<String> log = Arrays.stream(out.capturedLines())
-            .filter(s -> s.contains(message))
-            .findFirst();
-        MatcherAssert.assertThat(
-            String.format("Log message '%s' not found", message),
-            log.isPresent(),
-            Matchers.is(true)
-        );
+    @Test
+    void printsFormattedMessage(final StdOut out) {
+        Logger.info(this, LogFormatTest.MESSAGE);
+        final String actual = LogFormatTest.waitForMessage(out);
         MatcherAssert.assertThat(
             String.format(
                 "Expected message '%s', but log was:\n '%s'",
-                log.get(),
+                actual,
                 LogFormatTest.FORMAT
             ),
-            log.get(),
+            actual,
             Matchers.matchesPattern(LogFormatTest.FORMAT)
         );
     }
@@ -90,4 +87,46 @@ void matchesCorrectly() {
             Matchers.matchesPattern(LogFormatTest.FORMAT)
         );
     }
+
+    /**
+     * Since logging is usually asynchronous, we need to wait for the message to appear in the
+     * output. Moreover, logging system can take extra time to initialize.
+     * @param out Standard output
+     * @return Logged message
+     */
+    private static String waitForMessage(final StdOut out) {
+        try {
+            return Executors.newSingleThreadExecutor().submit(
+                () -> {
+                    while (true) {
+                        final Optional<String> message = Arrays.stream(out.capturedLines())
+                            .filter(s -> s.contains(LogFormatTest.MESSAGE))
+                            .findFirst();
+                        if (message.isPresent()) {
+                            return message.get();
+                        }
+                    }
+                }
+            ).get(10, TimeUnit.SECONDS);
+        } catch (final InterruptedException exception) {
+            Thread.currentThread().interrupt();
+            throw new IllegalStateException(
+                String.format(
+                    "Waiting thread was interrupted, can't read '%s' msg",
+                    LogFormatTest.MESSAGE
+                ),
+                exception
+            );
+        } catch (final ExecutionException exception) {
+            throw new IllegalStateException(
+                String.format("Some problem happened, can't read '%s' msg", LogFormatTest.MESSAGE),
+                exception
+            );
+        } catch (final TimeoutException exception) {
+            throw new IllegalStateException(
+                String.format("Timeout limit exceed to read msg %s", LogFormatTest.MESSAGE),
+                exception
+            );
+        }
+    }
 }