feat(webUI): using tests header and new style for failures report

Refs: #58

Author: nergal-perm

pom.xml

@@ -113,7 +113,7 @@
     <dependency>
       <groupId>io.github.nergal-perm</groupId>
       <artifactId>java-decita</artifactId>
-      <version>0.8.0-SNAPSHOT</version>
+      <version>0.8.0</version>
     </dependency>
     <dependency>
       <groupId>com.renomad</groupId>
@@ -125,11 +125,6 @@
       <artifactId>jcabi-matchers</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>3.24.2</version>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>

src/main/java/ru/ewc/checklogic/ServerInstance.java

@@ -26,7 +26,6 @@
 
 import java.net.URI;
 import java.nio.file.Paths;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import ru.ewc.decisions.api.ComputationContext;
@@ -107,14 +106,6 @@ public void perform(final String command, final Map<String, String> args) {
         }
     }
 
-    public Map<String, String> stateFor(final String table, final Map<String, String> entities) {
-        final Map<String, String> actual = HashMap.newHashMap(entities.size());
-        for (final String fragment : entities.keySet()) {
-            actual.put(fragment, this.context.valueFor(table, fragment));
-        }
-        return actual;
-    }
-
     public Map<String, Map<String, Object>> storedState() {
         return this.context.storedState();
     }

src/main/java/ru/ewc/checklogic/TestResult.java

@@ -23,7 +23,11 @@
  */
 package ru.ewc.checklogic;
 
-public record TestResult(String file, boolean successful, String error) {
+public record TestResult(
+    String file,
+    boolean successful,
+    String error
+) implements Comparable<TestResult> {
 
     public String result() {
         final String result;
@@ -64,4 +68,14 @@ private String classBasedOnSuccess() {
         }
         return result;
     }
+
+    @Override
+    public int compareTo(TestResult o) {
+        final int success = Boolean.compare(this.successful, o.successful);
+        if (success == 0) {
+            return this.file.compareTo(o.file);
+        } else {
+            return success;
+        }
+    }
 }

src/main/java/ru/ewc/checklogic/server/WebPages.java

@@ -32,6 +32,7 @@
 import ru.ewc.checklogic.ServerContextFactory;
 import ru.ewc.checklogic.ServerInstance;
 import ru.ewc.checklogic.TestResult;
+import ru.ewc.decisions.api.CheckFailure;
 import ru.ewc.decisions.api.CheckSuite;
 import ru.ewc.decisions.api.ComputationContext;
 import ru.ewc.decisions.api.OutputTracker;
@@ -96,7 +97,7 @@ public Response testPage() {
                     )
                 ).toList();
         final String rows = results.stream()
-            .sorted(Comparator.comparing(TestResult::result))
+            .sorted(Comparator.naturalOrder())
             .map(TestResult::asHtmlTableRow)
             .collect(Collectors.joining());
         final double elapsed = (System.currentTimeMillis() - start) / 1000.0;
@@ -135,7 +136,13 @@ private String renderInLayout(final String template, final Map<String, String> v
         return this.processors.renderInLayout(template, values);
     }
 
-    private static String resultAsUnorderedList(final Map.Entry<String, List<String>> entry) {
-        return "<ul><li>%s</li></ul>".formatted(String.join("</li></li>", entry.getValue()));
+    private static String resultAsUnorderedList(final Map.Entry<String, List<CheckFailure>> entry) {
+        return "<ul>%s</ul>".formatted(String.join("", checkFailureAsHtml(entry.getValue())));
+    }
+
+    private static String checkFailureAsHtml(final List<CheckFailure> failure) {
+        return failure.stream()
+            .map(f -> "<li>Expected: <kbd>%s</kbd>, but got: <kbd>%s</kbd></li>".formatted(f.expectation(), f.actual()))
+            .collect(Collectors.joining());
     }
 }

src/test/resources/tic-tac-toe/tests/00-initialize.csv

@@ -1,6 +1,7 @@
 OUT;execute;initialize
 CND;table::currentPlayer;X
-CND;cells::A1;X
+CND;table::nextPlayer;O
+CND;cells::A1;empty
 CND;cells::A2;empty
 CND;cells::A3;empty
 CND;cells::B1;empty

src/test/resources/tic-tac-toe/tests/01-first-move.csv

@@ -1,3 +1,4 @@
+HDR;first move;non current player;current player;
 ASG;request::player;O;X
 ASG;request::move;A1;A1
 ASG;table::currentPlayer;X;X