ceedling 1.1.10 → 1.2.0

data/plugins/report_tests_log_factory/lib/html_tests_reporter.rb

@@ -8,165 +8,243 @@
 require 'tests_reporter'
 require 'ceedling/reportinator'
 
-class HtmlTestsReporter < TestsReporter
+# The report's stylesheet, kept apart from the reporter so the class holds only behavior
+HTML_TESTS_REPORT_STYLE = <<~CSS.freeze
 
-  def setup()
-    super( default_filename: 'tests_report.html' )
+  /* Global baseline: sans-serif font, border-box sizing, and a slight
+     letter-spacing throughout for improved legibility. */
+  * { font-family: sans-serif; box-sizing: border-box; letter-spacing: 0.03em; }
+
+  /* Base table layout shared by all four tables (summary, failed,
+     ignored, success). border-radius + overflow:hidden clips the corners
+     of the colored header row. */
+  table {
+    border-collapse: collapse;
+    width: 99%;
+    margin: 0 0 25px 7px;
+    font-size: 0.9em;
+    min-width: 400px;
+    border-radius: 5px 5px 0 0;
+    overflow: hidden;
+    box-shadow: 0 0 22px rgba(0, 0, 0, 0.2);
+  }
+
+  /* --- Summary table ------------------------------------------------- */
+
+  /* Override the full-width default; summary is a compact info block. */
+  table.summary { width: auto; min-width: 200px; }
+
+  /* Right-align and bold the numeric count values (second column). */
+  table.summary td:nth-child(2) { text-align: right; font-weight: bold; }
+
+  /* Tighter vertical padding for summary body rows than the global default. */
+  table.summary tbody td { padding: 4px 15px; }
+
+  /* Extra top padding on the first body row to separate it from the header bar. */
+  table.summary tbody tr:first-child td { padding-top: 10px; }
+
+  /* Ring chart cell: vertically centered, horizontally centered SVG. */
+  table.summary td.chart-cell { vertical-align: middle; text-align: center; }
+
+  /* Pass-percentage cell to the right of the ring chart. */
+  table.summary td.pct-cell { vertical-align: middle; text-align: center; padding: 8px 20px; }
+
+  /* "Passing" label above the large percentage number. */
+  table.summary .pct-label { font-size: 1.0em; color: #777777; }
+
+  /* Large, bold pass percentage. */
+  table.summary .pct-value { font-size: 2.4em; font-weight: bold; color: #333333; line-height: 1.1; }
+
+  /* Timestamp footer row: small, muted, centered across all columns. */
+  table.summary td.datetime-row { font-size: 0.9em; color: #777777; text-align: center; padding: 8px 15px; }
+
+  /* --- Table title rows ---------------------------------------------- */
+
+  /* All <thead> rows: white text, left-aligned, bold. Individual table
+     classes below apply traffic-light background colors. */
+  thead tr { color: #ffffff; text-align: left; font-weight: bold; }
+
+  /* Traffic-light title colors. :first-child targets only the title row
+     so that any secondary header rows are not colored. */
+  table.summary thead tr:first-child { background-color: #555555; }
+  table.failed  thead tr:first-child { background-color: #c0392b; }
+  table.success thead tr:first-child { background-color: #27ae60; }
+  table.ignored thead tr:first-child { background-color: #e67e22; }
+
+  /* Bottom accent line matching each table's header color. border-bottom is
+     defeated by border-collapse:collapse, so box-shadow is used instead. */
+  table.summary { box-shadow: 0 0 22px rgba(0,0,0,0.2), 0 2px 0 0 #555555; }
+  table.failed  { box-shadow: 0 0 22px rgba(0,0,0,0.2), 0 2px 0 0 #c0392b; }
+  table.success { box-shadow: 0 0 22px rgba(0,0,0,0.2), 0 2px 0 0 #27ae60; }
+  table.ignored { box-shadow: 0 0 22px rgba(0,0,0,0.2), 0 2px 0 0 #e67e22; }
+
+  /* --- Cell padding defaults ----------------------------------------- */
+
+  /* Default padding for all th and td cells. */
+  table th, td { padding: 12px 15px; }
+
+  /* The count <th> in each category table title row is intentionally empty.
+     Zeroing its padding collapses it so the title text starts flush with
+     the table's left edge rather than indented by the count column. */
+  thead tr th.col-count { padding: 0; }
+
+  /* --- File-group tbody rows ----------------------------------------- */
+
+  /* Zebra-stripe alternating rows within each per-file <tbody> group.
+     nth-child resets per <tbody>, so striping restarts for each file. */
+  tbody.file-group tr:nth-child(odd)  { background-color: #ffffff; }
+  tbody.file-group tr:nth-child(even) { background-color: #f3f3f3; }
+
+  /* Filepath header row for each file group: medium gray, darker than the
+     zebra stripe, visually separating one file's tests from the next. */
+  table.failed  tbody.file-group tr.filepath-row { background-color: #d8d8d8; color: #333333; }
+  table.success tbody.file-group tr.filepath-row { background-color: #d8d8d8; color: #333333; }
+  table.ignored tbody.file-group tr.filepath-row { background-color: #d8d8d8; color: #333333; }
+
+  /* Extra tracking on the italic filepath text. Targeting <i> directly
+     is required because the global * rule sets letter-spacing on every
+     element, which would otherwise override an inherited value from <td>. */
+  tbody.file-group tr.filepath-row i { letter-spacing: 0.07em; }
+
+  /* Left-align all data cells (overrides browser default center for <td>
+     in some contexts). */
+  tbody.file-group td { text-align: left; }
+
+  /* --- Column utility classes ---------------------------------------- */
+
+  /* Shrink a column to fit its content width with no line-wrapping.
+     Used for the test case name column so the message column gets the
+     remaining table width. */
+  .col-shrink { width: 1%; white-space: nowrap; }
+
+  /* Fixed-width count column sized for up to 4 digits. A more specific
+     descendant rule below enforces right-alignment for data cells only,
+     since tbody.file-group td overrides class-level text-align. */
+  .col-count  { width: 4em; white-space: nowrap; }
+  tbody.file-group td.col-count { text-align: right; }
+
+  /* Line-number column: shrinks to content, right-aligned. Same
+     specificity pattern as col-count to override the global td rule. */
+  .col-line   { width: 1%; white-space: nowrap; }
+  tbody.file-group td.col-line { text-align: right; }
+  thead tr th.col-line { text-align: right; }
+
+  /* Message column: allow long assertion strings to break anywhere so
+     they do not widen the table. */
+  .col-message { word-break: break-all; }
+
+  /* Monospace font for test case identifiers. overflow-wrap handles
+     identifiers that are longer than the available column width. */
+  code { font-family: monospace; font-size: 1.2em; overflow-wrap: break-word; }
+
+  details summary { cursor: pointer; }
+CSS
+
+# The report document up to its body, filled by name with its title and stylesheet
+HTML_TESTS_REPORT_HEAD = <<~HTML.freeze
+  <!DOCTYPE html>
+  <html lang="en">
+  <head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <title>%{title}</title>
+  <style>
+  %{style}
+  </style>
+  </head>
+  <body>
+HTML
+
+# The report's summary table, filled by name from the run's counts and timing. The chart
+# and percentage cells span all four count rows, and the timing row spans every column.
+HTML_TESTS_REPORT_SUMMARY = <<~HTML.freeze
+  <table class="summary">
+    <thead><tr><th colspan="4">%{name}</th></tr></thead>
+    <tbody>
+      <tr>
+        <td>Total</td><td>%{total}</td>
+        <td rowspan="4" class="chart-cell">%{chart}</td>
+        <td rowspan="4" class="pct-cell">
+          <div class="pct-label">Passing</div>
+          <div class="pct-value">%{percentage}</div>
+        </td>
+      </tr>
+      <tr><td>Passed</td><td>%{passed}</td></tr>
+      <tr><td>Failed</td><td>%{failed}</td></tr>
+      <tr><td>Ignored</td><td>%{ignored}</td></tr>
+      <tr><td colspan="4" class="datetime-row">%{timing}</td></tr>
+    </tbody>
+  </table>
+HTML
+
+# An inline SVG ring chart of the proportions of passed, failed, and ignored tests.
+#
+# Each colored arc is a <circle> whose visible portion is set by stroke-dasharray (segment
+# length, then gap) and stroke-dashoffset (where along the circumference the dash starts).
+# A positive offset shifts the start counterclockwise, so a quarter circumference moves
+# the first segment from 3 o'clock to 12 o'clock. Each later segment's offset is reduced
+# by the arcs already drawn.
+module HtmlRingChart
+
+  RADIUS        = 36
+  CIRCUMFERENCE = 2 * Math::PI * RADIUS
+
+  # Segment colors in clockwise order from 12 o'clock
+  COLORS = [ '#27ae60', '#c0392b', '#e67e22' ].freeze
+
+  # Empty when there are no tests. A zero count draws no segment, since an invisible
+  # zero-length arc leaves rendering artifacts between its neighbors.
+  def self.svg(passed, failed, ignored)
+    total = passed + failed + ignored
+    return '' if total == 0
+
+    drawn   = 0.0
+    circles = [ passed, failed, ignored ].zip( COLORS ).reject { |count, _| count == 0 }.map do |count, color|
+      length = (count.to_f / total) * CIRCUMFERENCE
+      arc = circle( length, (CIRCUMFERENCE / 4.0) - drawn, color )
+      drawn += length
+      arc
+    end
+
+    return %(<svg viewBox="0 0 100 100" width="90" height="90" xmlns="http://www.w3.org/2000/svg">\n#{circles.join}</svg>)
   end
 
-  def header(stream:, name:, results:, duration_s:)
-    stream.puts <<~HTML
-      <!DOCTYPE html>
-      <html lang="en">
-      <head>
-      <meta charset="UTF-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <meta http-equiv="X-UA-Compatible" content="ie=edge">
-      <title>#{name == 'Ceedling Test Suite' ? 'Ceedling Test Suite Report' : "Ceedling Test Suite: #{name}"}</title>
-      <style>
-
-      /* Global baseline: sans-serif font, border-box sizing, and a slight
-         letter-spacing throughout for improved legibility. */
-      * { font-family: sans-serif; box-sizing: border-box; letter-spacing: 0.03em; }
-
-      /* Base table layout shared by all four tables (summary, failed,
-         ignored, success). border-radius + overflow:hidden clips the corners
-         of the colored header row. */
-      table {
-        border-collapse: collapse;
-        width: 99%;
-        margin: 0 0 25px 7px;
-        font-size: 0.9em;
-        min-width: 400px;
-        border-radius: 5px 5px 0 0;
-        overflow: hidden;
-        box-shadow: 0 0 22px rgba(0, 0, 0, 0.2);
-      }
-
-      /* --- Summary table ------------------------------------------------- */
-
-      /* Override the full-width default; summary is a compact info block. */
-      table.summary { width: auto; min-width: 200px; }
-
-      /* Right-align and bold the numeric count values (second column). */
-      table.summary td:nth-child(2) { text-align: right; font-weight: bold; }
-
-      /* Tighter vertical padding for summary body rows than the global default. */
-      table.summary tbody td { padding: 4px 15px; }
-
-      /* Extra top padding on the first body row to separate it from the header bar. */
-      table.summary tbody tr:first-child td { padding-top: 10px; }
-
-      /* Ring chart cell: vertically centered, horizontally centered SVG. */
-      table.summary td.chart-cell { vertical-align: middle; text-align: center; }
-
-      /* Pass-percentage cell to the right of the ring chart. */
-      table.summary td.pct-cell { vertical-align: middle; text-align: center; padding: 8px 20px; }
-
-      /* "Passing" label above the large percentage number. */
-      table.summary .pct-label { font-size: 1.0em; color: #777777; }
-
-      /* Large, bold pass percentage. */
-      table.summary .pct-value { font-size: 2.4em; font-weight: bold; color: #333333; line-height: 1.1; }
-
-      /* Timestamp footer row: small, muted, centered across all columns. */
-      table.summary td.datetime-row { font-size: 0.9em; color: #777777; text-align: center; padding: 8px 15px; }
-
-      /* --- Table title rows ---------------------------------------------- */
-
-      /* All <thead> rows: white text, left-aligned, bold. Individual table
-         classes below apply traffic-light background colors. */
-      thead tr { color: #ffffff; text-align: left; font-weight: bold; }
-
-      /* Traffic-light title colors. :first-child targets only the title row
-         so that any secondary header rows are not colored. */
-      table.summary thead tr:first-child { background-color: #555555; }
-      table.failed  thead tr:first-child { background-color: #c0392b; }
-      table.success thead tr:first-child { background-color: #27ae60; }
-      table.ignored thead tr:first-child { background-color: #e67e22; }
-
-      /* Bottom accent line matching each table's header color. border-bottom is
-         defeated by border-collapse:collapse, so box-shadow is used instead. */
-      table.summary { box-shadow: 0 0 22px rgba(0,0,0,0.2), 0 2px 0 0 #555555; }
-      table.failed  { box-shadow: 0 0 22px rgba(0,0,0,0.2), 0 2px 0 0 #c0392b; }
-      table.success { box-shadow: 0 0 22px rgba(0,0,0,0.2), 0 2px 0 0 #27ae60; }
-      table.ignored { box-shadow: 0 0 22px rgba(0,0,0,0.2), 0 2px 0 0 #e67e22; }
-
-      /* --- Cell padding defaults ----------------------------------------- */
-
-      /* Default padding for all th and td cells. */
-      table th, td { padding: 12px 15px; }
-
-      /* The count <th> in each category table title row is intentionally empty.
-         Zeroing its padding collapses it so the title text starts flush with
-         the table's left edge rather than indented by the count column. */
-      thead tr th.col-count { padding: 0; }
-
-      /* --- File-group tbody rows ----------------------------------------- */
-
-      /* Zebra-stripe alternating rows within each per-file <tbody> group.
-         nth-child resets per <tbody>, so striping restarts for each file. */
-      tbody.file-group tr:nth-child(odd)  { background-color: #ffffff; }
-      tbody.file-group tr:nth-child(even) { background-color: #f3f3f3; }
-
-      /* Filepath header row for each file group: medium gray, darker than the
-         zebra stripe, visually separating one file's tests from the next. */
-      table.failed  tbody.file-group tr.filepath-row { background-color: #d8d8d8; color: #333333; }
-      table.success tbody.file-group tr.filepath-row { background-color: #d8d8d8; color: #333333; }
-      table.ignored tbody.file-group tr.filepath-row { background-color: #d8d8d8; color: #333333; }
-
-      /* Extra tracking on the italic filepath text. Targeting <i> directly
-         is required because the global * rule sets letter-spacing on every
-         element, which would otherwise override an inherited value from <td>. */
-      tbody.file-group tr.filepath-row i { letter-spacing: 0.07em; }
-
-      /* Left-align all data cells (overrides browser default center for <td>
-         in some contexts). */
-      tbody.file-group td { text-align: left; }
-
-      /* --- Column utility classes ---------------------------------------- */
-
-      /* Shrink a column to fit its content width with no line-wrapping.
-         Used for the test case name column so the message column gets the
-         remaining table width. */
-      .col-shrink { width: 1%; white-space: nowrap; }
-
-      /* Fixed-width count column sized for up to 4 digits. A more specific
-         descendant rule below enforces right-alignment for data cells only,
-         since tbody.file-group td overrides class-level text-align. */
-      .col-count  { width: 4em; white-space: nowrap; }
-      tbody.file-group td.col-count { text-align: right; }
+  private_class_method def self.circle(length, offset, color)
+    return %(<circle cx="50" cy="50" r="#{RADIUS}" fill="none" stroke="#{color}" stroke-width="20" ) +
+           %(stroke-dasharray="#{length.round(3)} #{(CIRCUMFERENCE - length).round(3)}" ) +
+           %(stroke-dashoffset="#{offset.round(3)}"/>\n)
+  end
 
-      /* Line-number column: shrinks to content, right-aligned. Same
-         specificity pattern as col-count to override the global td rule. */
-      .col-line   { width: 1%; white-space: nowrap; }
-      tbody.file-group td.col-line { text-align: right; }
-      thead tr th.col-line { text-align: right; }
+end
 
-      /* Message column: allow long assertion strings to break anywhere so
-         they do not widen the table. */
-      .col-message { word-break: break-all; }
+class HtmlTestsReporter < TestsReporter
 
-      /* Monospace font for test case identifiers. overflow-wrap handles
-         identifiers that are longer than the available column width. */
-      code { font-family: monospace; font-size: 1.2em; overflow-wrap: break-word; }
+  # Each results table, in report order: its CSS class, its title, and whether its rows
+  # carry a line number and a message. Passing results carry neither.
+  TABLES = {
+    failures:  { css: 'failed',  title: 'Failing test cases', line: true,  message: true  },
+    ignores:   { css: 'ignored', title: 'Ignored test cases', line: false, message: true  },
+    successes: { css: 'success', title: 'Passing test cases', line: false, message: false }
+  }.freeze
 
-      details summary { cursor: pointer; }
+  # A message longer than this many characters is collapsed behind a disclosure widget
+  MESSAGE_DISCLOSURE_LENGTH = 150
 
-      </style>
-      </head>
-      <body>
-    HTML
+  def setup()
+    super( default_filename: 'tests_report.html' )
+  end
+
+  def header(stream:, name:, **)
+    stream.puts( format( HTML_TESTS_REPORT_HEAD, title: title( name ), style: HTML_TESTS_REPORT_STYLE ) )
   end
 
   def body(stream:, name:, results:, duration_s:)
-    write_summary(name, results[:counts], duration_s, stream)
-    write_failures(results[:failures], stream)
-    write_ignores(results[:ignores], stream)
-    write_successes(results[:successes], stream)
+    write_summary( name, results[:counts], duration_s, stream )
+    TABLES.each { |category, table| write_table( results[category], table, stream ) }
   end
 
-  def footer(stream:, name:, results:, duration_s:)
+  def footer(stream:, **)
     stream.puts <<~HTML
       </body>
       </html>
@@ -177,174 +255,87 @@ class HtmlTestsReporter < TestsReporter
 
   private
 
-  # Returns a <td> HTML string for an assertion message.
-  # Empty messages render an em-dash placeholder. Messages over 150 characters
-  # are hidden behind a <details> disclosure widget to avoid overwhelming the
-  # table layout.
-  def message_cell(message)
-    msg = message.to_s
-    return '<td class="col-message">—</td>' if msg.empty?
-    return "<td class=\"col-message\"><details><summary>Message hidden due to long length.</summary>#{msg}</details></td>" if msg.length > 150
-    "<td class=\"col-message\">#{msg}</td>"
+  # The default report name gets a plain title. A project's own name follows the suite.
+  def title(name)
+    return 'Ceedling Test Suite Report' if name == DEFAULT_REPORT_NAME
+    return "Ceedling Test Suite: #{html_escape( name )}"
   end
 
-  # Generates an inline SVG donut/ring chart showing the proportion of passed,
-  # failed, and ignored tests. Returns an empty string when there are no tests.
-  #
-  # Each colored arc is a <circle> element whose visible portion is controlled
-  # by stroke-dasharray (segment length vs. gap) and stroke-dashoffset (where
-  # along the circumference the dash pattern starts). A positive dashoffset
-  # shifts the start counterclockwise, so circumference/4 moves the first
-  # segment's start from the default 3 o'clock position to 12 o'clock.
-  # Each subsequent segment's offset is reduced by the arc lengths already drawn.
-  # Segments with a zero count are omitted so no invisible zero-length arcs
-  # create rendering artifacts between adjacent colored segments.
-  def ring_chart_svg(passed, failed, ignored)
-    total = passed + failed + ignored
-    return '' if total == 0
-
-    r             = 36
-    stroke_width  = 20
-    circumference = 2 * Math::PI * r
-
-    # Order determines visual sequence going clockwise from 12 o'clock.
-    segments = [
-      { count: passed,  color: '#27ae60' },
-      { count: failed,  color: '#c0392b' },
-      { count: ignored, color: '#e67e22' },
-    ].reject { |s| s[:count] == 0 }
-
-    circles    = ''
-    cumulative = 0.0
-
-    segments.each do |seg|
-      len    = (seg[:count].to_f / total) * circumference
-      offset = circumference / 4.0 - cumulative
-      circles += %(<circle cx="50" cy="50" r="#{r}" fill="none" ) +
-                 %(stroke="#{seg[:color]}" stroke-width="#{stroke_width}" ) +
-                 %(stroke-dasharray="#{len.round(3)} #{(circumference - len).round(3)}" ) +
-                 %(stroke-dashoffset="#{offset.round(3)}"/>\n)
-      cumulative += len
-    end
+  def write_summary(name, counts, duration_s, stream)
+    stream.puts( format( HTML_TESTS_REPORT_SUMMARY, **counts,
+      name:       html_escape( name ),
+      chart:      HtmlRingChart.svg( counts[:passed], counts[:failed], counts[:ignored] ),
+      percentage: pass_percentage( counts ),
+      timing:     timing( duration_s )
+    ) )
+  end
 
-    %(<svg viewBox="0 0 100 100" width="90" height="90" xmlns="http://www.w3.org/2000/svg">\n) +
-    circles +
-    %(</svg>)
+  def pass_percentage(counts)
+    return '—' if counts[:total] == 0
+    return '%.1f%%' % (counts[:passed].to_f / counts[:total] * 100)
   end
 
-  # Emits the compact summary table: count rows (Total/Passed/Failed/Ignored),
-  # a ring chart, a pass percentage, and a UTC timestamp.
-  # The chart and percentage cells use rowspan="4" to span all four count rows,
-  # and the timestamp row uses colspan="4" to span all columns.
-  def write_summary(name, counts, duration_s, stream)
-    passed    = counts[:total] - counts[:ignored] - counts[:failed]
-    chart     = ring_chart_svg( passed, counts[:failed], counts[:ignored] )
-    pct       = counts[:total] > 0 ? ("%.1f%%" % (passed.to_f / counts[:total] * 100)) : "—"
-    timestamp = Time.now.utc.strftime( "%B %d, %Y %H:%M:%S UTC" )
-    duration  = duration_s.nil? ? nil : Reportinator.generate_duration_string( duration_s, precision: 0, abbreviate: true )
-    stream.puts <<~HTML
-      <table class="summary">
-        <thead><tr><th colspan="4">#{name}</th></tr></thead>
-        <tbody>
-          <tr>
-            <td>Total</td><td>#{counts[:total]}</td>
-            <td rowspan="4" class="chart-cell">#{chart}</td>
-            <td rowspan="4" class="pct-cell">
-              <div class="pct-label">Passing</div>
-              <div class="pct-value">#{pct}</div>
-            </td>
-          </tr>
-          <tr><td>Passed</td><td>#{passed}</td></tr>
-          <tr><td>Failed</td><td>#{counts[:failed]}</td></tr>
-          <tr><td>Ignored</td><td>#{counts[:ignored]}</td></tr>
-          <tr><td colspan="4" class="datetime-row">#{[duration, timestamp].compact.join(' ⏱️ ')}</td></tr>
-        </tbody>
-      </table>
-    HTML
+  # When the report was written, after the build's duration when that is known
+  def timing(duration_s)
+    timestamp = Time.now.utc.strftime( '%B %d, %Y %H:%M:%S UTC' )
+    return timestamp if duration_s.nil?
+    return Reportinator.generate_duration_string( duration_s, precision: 0, abbreviate: true ) + ' ⏱️ ' + timestamp
   end
 
-  # Emits the Failed Tests table. Each test file becomes a separate <tbody>
-  # so that nth-child zebra striping resets per file. The row count increments
-  # continuously across all file groups within this table. The empty col-count
-  # <td> in filepath rows aligns the filepath with the test case name column.
-  def write_failures(results, stream)
+  # Emits one results table, or nothing for an empty category. Each test file is its own
+  # <tbody>, so zebra striping restarts per file, while the row count runs on across the
+  # whole table.
+  def write_table(results, table, stream)
     return if results.empty?
 
-    stream.puts <<~HTML
-      <table class="failed">
-        <thead>
-          <tr><th class="col-count"></th><th>Failing test cases</th><th class="col-line">Line</th><th>Message</th></tr>
-        </thead>
-    HTML
+    stream.puts( %(<table class="#{table[:css]}">) )
+    stream.puts( "  <thead>\n    <tr>#{header_cells( table )}</tr>\n  </thead>" )
 
-    count = 0
-    results.each do |result|
-      filepath = result[:source][:file]
-      stream.puts "  <tbody class=\"file-group\">"
-      stream.puts "    <tr class=\"filepath-row\"><td class=\"col-count\"></td><td colspan=\"3\"><i>#{filepath}</i></td></tr>"
-      result[:collection].each do |item|
-        count += 1
-        stream.puts "    <tr><td class=\"col-count\">#{count}</td><td class=\"col-shrink\"><code>#{item[:test]}</code></td><td class=\"col-line\">#{item[:line]}</td>#{message_cell(item[:message])}</tr>"
-      end
-      stream.puts "  </tbody>"
-    end
+    counter = (1..).each
+    results.each { |result| write_file_group( result, table, counter, stream ) }
 
-    stream.puts "</table>"
+    stream.puts( '</table>' )
   end
 
-  # Emits the Ignored Tests table. Structure mirrors write_failures except
-  # there is no Line column (ignored test items do not carry a line number).
-  def write_ignores(results, stream)
-    return if results.empty?
-
-    stream.puts <<~HTML
-      <table class="ignored">
-        <thead>
-          <tr><th class="col-count"></th><th>Ignored test cases</th><th>Message</th></tr>
-        </thead>
-    HTML
-
-    count = 0
-    results.each do |result|
-      filepath = result[:source][:file]
-      stream.puts "  <tbody class=\"file-group\">"
-      stream.puts "    <tr class=\"filepath-row\"><td class=\"col-count\"></td><td colspan=\"2\"><i>#{filepath}</i></td></tr>"
-      result[:collection].each do |item|
-        count += 1
-        stream.puts "    <tr><td class=\"col-count\">#{count}</td><td class=\"col-shrink\"><code>#{item[:test]}</code></td>#{message_cell(item[:message])}</tr>"
-      end
-      stream.puts "  </tbody>"
-    end
+  def write_file_group(result, table, counter, stream)
+    stream.puts( '  <tbody class="file-group">' )
+    stream.puts( "    #{filepath_row( result[:source][:file], table )}" )
+    result[:collection].each { |item| stream.puts( "    <tr>#{row_cells( item, counter.next, table )}</tr>" ) }
+    stream.puts( '  </tbody>' )
+  end
 
-    stream.puts "</table>"
+  # A filepath row spans every column after the count
+  def filepath_row(filepath, table)
+    columns = 1 + [ table[:line], table[:message] ].count( true )
+    span    = columns > 1 ? %( colspan="#{columns}") : ''
+    return %(<tr class="filepath-row"><td class="col-count"></td><td#{span}><i>#{html_escape( filepath )}</i></td></tr>)
   end
 
-  # Emits the Passed Tests table. Only test case names are shown; no line
-  # number or message columns (passing results carry neither). The test case
-  # column is full-width because it is the only data column.
-  def write_successes(results, stream)
-    return if results.empty?
+  def header_cells(table)
+    cells = %(<th class="col-count"></th><th>#{table[:title]}</th>)
+    cells += %(<th class="col-line">Line</th>) if table[:line]
+    cells += %(<th>Message</th>) if table[:message]
+    return cells
+  end
 
-    stream.puts <<~HTML
-      <table class="success">
-        <thead>
-          <tr><th class="col-count"></th><th>Passing test cases</th></tr>
-        </thead>
-    HTML
+  # A name shrinks to fit only beside a message column, which takes the remaining width
+  def row_cells(item, count, table)
+    name  = table[:message] ? %(<td class="col-shrink">) : '<td>'
+    cells = %(<td class="col-count">#{count}</td>#{name}<code>#{html_escape( item[:test] )}</code></td>)
+    cells += %(<td class="col-line">#{item[:line]}</td>) if table[:line]
+    cells += message_cell( item[:message] ) if table[:message]
+    return cells
+  end
 
-    count = 0
-    results.each do |result|
-      filepath = result[:source][:file]
-      stream.puts "  <tbody class=\"file-group\">"
-      stream.puts "    <tr class=\"filepath-row\"><td class=\"col-count\"></td><td><i>#{filepath}</i></td></tr>"
-      result[:collection].each do |item|
-        count += 1
-        stream.puts "    <tr><td class=\"col-count\">#{count}</td><td><code>#{item[:test]}</code></td></tr>"
-      end
-      stream.puts "  </tbody>"
-    end
+  # An empty message shows a placeholder. A long one is collapsed so it cannot swamp the
+  # table. Its length counts the message's own characters, before escaping lengthens it.
+  def message_cell(message)
+    message = message.to_s
+    return '<td class="col-message">—</td>' if message.empty?
 
-    stream.puts "</table>"
+    escaped = html_escape( message )
+    return %(<td class="col-message">#{escaped}</td>) if message.length <= MESSAGE_DISCLOSURE_LENGTH
+    return %(<td class="col-message"><details><summary>Message hidden due to long length.</summary>#{escaped}</details></td>)
   end
 
 end