Fix CLI and PR scored

Author: MDA2AV

.github/workflows/probe.yml

@@ -234,9 +234,9 @@ jobs:
 
         import re
         def short(tid):
-            return re.sub(r'^(RFC\d+-[\d.]+-|COMP-|SMUG-|MAL-)', '', tid)
+            return re.sub(r'^(RFC\d+-[\d.]+-|COMP-|SMUG-|MAL-|NORM-)', '', tid)
 
-        for cat_name, title in [('Compliance', 'Compliance'), ('Smuggling', 'Smuggling'), ('MalformedInput', 'Malformed Input')]:
+        for cat_name, title in [('Compliance', 'Compliance'), ('Smuggling', 'Smuggling'), ('MalformedInput', 'Malformed Input'), ('Normalization', 'Header Normalization')]:
             cat_tests = [tid for tid in test_ids if lookup[names[0]][tid]['category'] == cat_name]
             if not cat_tests:
                 continue

docs/content/servers/sisk.md

@@ -34,16 +34,16 @@ using var app = HttpServer.CreateBuilder()
     .UseListeningPort($"http://+:{port}/")
     .Build();
 
-app.Router.SetRoute(RouteMethod.Any, "/echo", request =>
-{
-    var sb = new System.Text.StringBuilder();
-    foreach (var h in request.Headers)
-        sb.AppendLine($"{h.Key}: {h.Value}");
-    return new HttpResponse(200).WithContent(sb.ToString());
-});
-
 app.Router.SetRoute(RouteMethod.Any, Route.AnyPath, request =>
 {
+    if (request.Path == "/echo")
+    {
+        var sb = new System.Text.StringBuilder();
+        foreach (var h in request.Headers)
+            foreach (var val in h.Value)
+                sb.AppendLine($"{h.Key}: {val}");
+        return new HttpResponse(200).WithContent(sb.ToString());
+    }
     if (request.Method == HttpMethod.Post && request.Body is not null)
     {
         var body = request.Body;

src/Http11Probe.Cli/Reporting/ConsoleReporter.cs

@@ -67,11 +67,10 @@ public static void PrintSummary(TestRunReport report)
         Console.WriteLine("  " + new string('─', 80));
         Console.WriteLine();
 
-        var scoredCount = report.PassCount + report.FailCount;
         var prev = Console.ForegroundColor;
         Console.Write("  Score: ");
-        Console.ForegroundColor = report.FailCount == 0 ? ConsoleColor.Green : ConsoleColor.Red;
-        Console.Write($"{report.PassCount}/{scoredCount}");
+        Console.ForegroundColor = report.FailCount == 0 && report.WarnCount == 0 ? ConsoleColor.Green : ConsoleColor.Red;
+        Console.Write($"{report.PassCount}/{report.ScoredCount}");
         Console.ForegroundColor = prev;
 
         if (report.FailCount > 0)

src/Http11Probe.Cli/Reporting/JsonReporter.cs

@@ -21,7 +21,7 @@ public static string Generate(TestRunReport report)
             summary = new
             {
                 total = report.Results.Count,
-                scored = report.PassCount + report.FailCount,
+                scored = report.ScoredCount,
                 passed = report.PassCount,
                 failed = report.FailCount,
                 warnings = report.WarnCount,

src/Http11Probe/Runner/TestRunReport.cs

@@ -9,7 +9,8 @@ public sealed class TestRunReport
 
     public int PassCount => Results.Count(r => r.TestCase.Scored && r.Verdict == TestVerdict.Pass);
     public int FailCount => Results.Count(r => r.TestCase.Scored && r.Verdict == TestVerdict.Fail);
-    public int WarnCount => Results.Count(r => r.Verdict == TestVerdict.Warn);
+    public int WarnCount => Results.Count(r => r.TestCase.Scored && r.Verdict == TestVerdict.Warn);
+    public int ScoredCount => PassCount + FailCount + WarnCount;
     public int SkipCount => Results.Count(r => r.Verdict == TestVerdict.Skip);
     public int ErrorCount => Results.Count(r => r.Verdict == TestVerdict.Error);
     public int UnscoredCount => Results.Count(r => !r.TestCase.Scored && r.Verdict != TestVerdict.Skip);

src/Servers/SiskServer/Program.cs

@@ -7,16 +7,16 @@
     .UseListeningPort($"http://+:{port}/")
     .Build();
 
-app.Router.SetRoute(RouteMethod.Any, "/echo", request =>
-{
-    var sb = new System.Text.StringBuilder();
-    foreach (var h in request.Headers)
-        sb.AppendLine($"{h.Key}: {h.Value}");
-    return new HttpResponse(200).WithContent(sb.ToString());
-});
-
 app.Router.SetRoute(RouteMethod.Any, Route.AnyPath, request =>
 {
+    if (request.Path == "/echo")
+    {
+        var sb = new System.Text.StringBuilder();
+        foreach (var h in request.Headers)
+            foreach (var val in h.Value)
+                sb.AppendLine($"{h.Key}: {val}");
+        return new HttpResponse(200).WithContent(sb.ToString());
+    }
     if (request.Method == HttpMethod.Post && request.Body is not null)
     {
         var body = request.Body;