From d1c50e3fb4e09f4b9dbab5fbb3c85cfa71cea338 Mon Sep 17 00:00:00 2001
From: AirQuick <AirQuick@users.noreply.github.com>
Date: Thu, 30 Nov 2023 20:04:47 +0900
Subject: [PATCH 1/3] feat(ant): xspec.force.focus=#none (#1814)

---
 .commitlintrc.json                            |   3 +-
 CONTRIBUTING.md                               |   1 +
 .../expected/query/force-focus_none-junit.xml |  17 +++
 .../query/force-focus_none-result.html        | 139 ++++++++++++++++++
 .../query/force-focus_none-result.xml         |  59 ++++++++
 .../schematron/force-focus_none-junit.xml     |  17 +++
 .../schematron/force-focus_none-result.html   | 138 +++++++++++++++++
 .../schematron/force-focus_none-result.xml    |  59 ++++++++
 .../stylesheet/force-focus_none-junit.xml     |  17 +++
 .../stylesheet/force-focus_none-result.html   | 138 +++++++++++++++++
 .../stylesheet/force-focus_none-result.xml    |  58 ++++++++
 .../cases/focus-without-pending.xspec         |   2 +-
 test/end-to-end/cases/force-focus_none.xspec  |  11 ++
 13 files changed, 657 insertions(+), 2 deletions(-)
 create mode 100644 test/end-to-end/cases/expected/query/force-focus_none-junit.xml
 create mode 100644 test/end-to-end/cases/expected/query/force-focus_none-result.html
 create mode 100644 test/end-to-end/cases/expected/query/force-focus_none-result.xml
 create mode 100644 test/end-to-end/cases/expected/schematron/force-focus_none-junit.xml
 create mode 100644 test/end-to-end/cases/expected/schematron/force-focus_none-result.html
 create mode 100644 test/end-to-end/cases/expected/schematron/force-focus_none-result.xml
 create mode 100644 test/end-to-end/cases/expected/stylesheet/force-focus_none-junit.xml
 create mode 100644 test/end-to-end/cases/expected/stylesheet/force-focus_none-result.html
 create mode 100644 test/end-to-end/cases/expected/stylesheet/force-focus_none-result.xml
 create mode 100644 test/end-to-end/cases/force-focus_none.xspec

diff --git a/.commitlintrc.json b/.commitlintrc.json
index 8472ff91b..eafa09b13 100644
--- a/.commitlintrc.json
+++ b/.commitlintrc.json
@@ -16,7 +16,8 @@
         "xproc",
         "schema",
         "maven",
-        "cli"
+        "cli",
+        "ant"
       ]
     ]
   }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3374f7967..459b4b8e0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -65,6 +65,7 @@ You are also encouraged to use a scope to highlight which functionality is affec
 | `schema`     | Schema for .xspec files  |
 | `maven`      | Maven                    |
 | `cli`        | `bin/xspec.*`            |
+| `ant`        | Ant                      |
 
 Note that type is mandatory and scope is optional and both values should be written in lower case.
 
diff --git a/test/end-to-end/cases/expected/query/force-focus_none-junit.xml b/test/end-to-end/cases/expected/query/force-focus_none-junit.xml
new file mode 100644
index 000000000..366c77564
--- /dev/null
+++ b/test/end-to-end/cases/expected/query/force-focus_none-junit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites name="force-focus_none.xspec">
+   <testsuite name="Test @focus" tests="4" failures="2">
+      <testcase name="an unfocused Success scenario must be Pending it would return Success if it were not Pending"
+                status="passed"/>
+      <testcase name="an unfocused Failure scenario must be Pending it would return Failure if it were not Pending"
+                status="failed">
+         <failure message="expect assertion failed">Expecting: $t:result instance of xs:string</failure>
+      </testcase>
+      <testcase name="a focused Success scenario must execute the test and return Success"
+                status="passed"/>
+      <testcase name="a focused Failure scenario must execute the test and return Failure"
+                status="failed">
+         <failure message="expect assertion failed">Expecting: $t:result instance of xs:string</failure>
+      </testcase>
+   </testsuite>
+</testsuites>
diff --git a/test/end-to-end/cases/expected/query/force-focus_none-result.html b/test/end-to-end/cases/expected/query/force-focus_none-result.html
new file mode 100644
index 000000000..0339c65e4
--- /dev/null
+++ b/test/end-to-end/cases/expected/query/force-focus_none-result.html
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml">
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+      <title>Test Report for x-urn:test:do-nothing (passed: 2 / pending: 0 / failed: 2 / total: 4)</title>
+      <link rel="stylesheet" type="text/css" href="../../../../../src/reporter/test-report.css" />
+   </head>
+   <body>
+      <h1>Test Report</h1>
+      <p>Query: x-urn:test:do-nothing</p>
+      <p>Query-at: <a href="../../../../do-nothing.xqm">do-nothing.xqm</a></p>
+      <p>XSpec: <a href="../../force-focus_none.xspec">force-focus_none.xspec</a></p>
+      <p>Tested: 1 January 2000 at 00:00</p>
+      <h2>Contents</h2>
+      <table class="xspec">
+         <colgroup>
+            <col style="width:75%" />
+            <col style="width:6.25%" />
+            <col style="width:6.25%" />
+            <col style="width:6.25%" />
+            <col style="width:6.25%" />
+         </colgroup>
+         <thead>
+            <tr>
+               <th></th>
+               <th class="totals">passed: 2</th>
+               <th class="totals">pending: 0</th>
+               <th class="totals">failed: 2</th>
+               <th class="totals">total: 4</th>
+            </tr>
+         </thead>
+         <tbody>
+            <tr class="failed">
+               <th><a href="#top_scenario1">Test @focus</a></th>
+               <th class="totals">2</th>
+               <th class="totals">0</th>
+               <th class="totals">2</th>
+               <th class="totals">4</th>
+            </tr>
+         </tbody>
+      </table>
+      <div id="top_scenario1">
+         <h2 class="successful">Test @focus<span class="scenario-totals">passed: 2 / pending: 0 / failed: 2 / total: 4</span></h2>
+         <table class="xspec" id="table_scenario1">
+            <colgroup>
+               <col style="width:75%" />
+               <col style="width:25%" />
+            </colgroup>
+            <tbody>
+               <tr class="successful">
+                  <th>Test @focus</th>
+                  <th>passed: 2 / pending: 0 / failed: 2 / total: 4</th>
+               </tr>
+               <tr class="successful">
+                  <th>an unfocused Success scenario must be Pending</th>
+                  <th>passed: 1 / pending: 0 / failed: 0 / total: 1</th>
+               </tr>
+               <tr class="successful">
+                  <td>it would return Success if it were not Pending</td>
+                  <td>Success</td>
+               </tr>
+               <tr class="failed">
+                  <th><a href="#scenario1-scenario2">an unfocused Failure scenario must be Pending</a></th>
+                  <th>passed: 0 / pending: 0 / failed: 1 / total: 1</th>
+               </tr>
+               <tr class="failed">
+                  <td><a href="#scenario1-scenario2-expect1">it would return Failure if it were not Pending</a></td>
+                  <td>Failure</td>
+               </tr>
+               <tr class="successful">
+                  <th>a focused Success scenario</th>
+                  <th>passed: 1 / pending: 0 / failed: 0 / total: 1</th>
+               </tr>
+               <tr class="successful">
+                  <td>must execute the test and return Success</td>
+                  <td>Success</td>
+               </tr>
+               <tr class="failed">
+                  <th><a href="#scenario1-scenario4">a focused Failure scenario</a></th>
+                  <th>passed: 0 / pending: 0 / failed: 1 / total: 1</th>
+               </tr>
+               <tr class="failed">
+                  <td><a href="#scenario1-scenario4-expect1">must execute the test and return Failure</a></td>
+                  <td>Failure</td>
+               </tr>
+            </tbody>
+         </table>
+         <div id="scenario1-scenario2">
+            <h3>Test @focus an unfocused Failure scenario must be Pending</h3>
+            <div id="scenario1-scenario2-expect1" class="xTestReport">
+               <h4 class="xTestReportTitle">it would return Failure if it were not Pending</h4>
+               <div class="xTestReportHint"><a href="https://github.com/xspec/xspec/wiki/Understanding-Test-Results" target="_blank" title="What does this report mean?">[?]</a></div>
+               <table class="xspecResult">
+                  <thead>
+                     <tr>
+                        <th>Result</th>
+                        <th>Expecting</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td>
+                           <pre>9</pre>
+                        </td>
+                        <td>
+                           <pre>$t:result instance of xs:string</pre>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div>
+         <div id="scenario1-scenario4">
+            <h3>Test @focus a focused Failure scenario</h3>
+            <div id="scenario1-scenario4-expect1" class="xTestReport">
+               <h4 class="xTestReportTitle">must execute the test and return Failure</h4>
+               <div class="xTestReportHint"><a href="https://github.com/xspec/xspec/wiki/Understanding-Test-Results" target="_blank" title="What does this report mean?">[?]</a></div>
+               <table class="xspecResult">
+                  <thead>
+                     <tr>
+                        <th>Result</th>
+                        <th>Expecting</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td>
+                           <pre>9</pre>
+                        </td>
+                        <td>
+                           <pre>$t:result instance of xs:string</pre>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/test/end-to-end/cases/expected/query/force-focus_none-result.xml b/test/end-to-end/cases/expected/query/force-focus_none-result.xml
new file mode 100644
index 000000000..c4121624b
--- /dev/null
+++ b/test/end-to-end/cases/expected/query/force-focus_none-result.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<report xmlns="http://www.jenitennison.com/xslt/xspec"
+        xspec="../../force-focus_none.xspec"
+        query="x-urn:test:do-nothing"
+        query-at="../../../../do-nothing.xqm"
+        date="2000-01-01T00:00:00Z">
+   <scenario id="scenario1" xspec="../../focus-without-pending.xspec">
+      <label>Test @focus</label>
+      <input-wrap xmlns="">
+         <t:call xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:t="http://www.jenitennison.com/xslt/xspec"
+                 function="exactly-one">
+            <t:param select="9"/>
+         </t:call>
+      </input-wrap>
+      <scenario id="scenario1-scenario1" xspec="../../focus-without-pending.xspec">
+         <label>an unfocused Success scenario must be Pending</label>
+         <result select="9"/>
+         <test id="scenario1-scenario1-expect1" successful="true">
+            <label>it would return Success if it were not Pending</label>
+            <expect select="9"/>
+         </test>
+      </scenario>
+      <scenario id="scenario1-scenario2" xspec="../../focus-without-pending.xspec">
+         <label>an unfocused Failure scenario must be Pending</label>
+         <result select="9"/>
+         <test id="scenario1-scenario2-expect1" successful="false">
+            <label>it would return Failure if it were not Pending</label>
+            <expect-test-wrap xmlns="">
+               <t:expect xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                         xmlns:t="http://www.jenitennison.com/xslt/xspec"
+                         test="$t:result instance of xs:string"/>
+            </expect-test-wrap>
+            <expect select="()"/>
+         </test>
+      </scenario>
+      <scenario id="scenario1-scenario3" xspec="../../focus-without-pending.xspec">
+         <label>a focused Success scenario</label>
+         <result select="9"/>
+         <test id="scenario1-scenario3-expect1" successful="true">
+            <label>must execute the test and return Success</label>
+            <expect select="9"/>
+         </test>
+      </scenario>
+      <scenario id="scenario1-scenario4" xspec="../../focus-without-pending.xspec">
+         <label>a focused Failure scenario</label>
+         <result select="9"/>
+         <test id="scenario1-scenario4-expect1" successful="false">
+            <label>must execute the test and return Failure</label>
+            <expect-test-wrap xmlns="">
+               <t:expect xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                         xmlns:t="http://www.jenitennison.com/xslt/xspec"
+                         test="$t:result instance of xs:string"/>
+            </expect-test-wrap>
+            <expect select="()"/>
+         </test>
+      </scenario>
+   </scenario>
+</report>
diff --git a/test/end-to-end/cases/expected/schematron/force-focus_none-junit.xml b/test/end-to-end/cases/expected/schematron/force-focus_none-junit.xml
new file mode 100644
index 000000000..366c77564
--- /dev/null
+++ b/test/end-to-end/cases/expected/schematron/force-focus_none-junit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites name="force-focus_none.xspec">
+   <testsuite name="Test @focus" tests="4" failures="2">
+      <testcase name="an unfocused Success scenario must be Pending it would return Success if it were not Pending"
+                status="passed"/>
+      <testcase name="an unfocused Failure scenario must be Pending it would return Failure if it were not Pending"
+                status="failed">
+         <failure message="expect assertion failed">Expecting: $t:result instance of xs:string</failure>
+      </testcase>
+      <testcase name="a focused Success scenario must execute the test and return Success"
+                status="passed"/>
+      <testcase name="a focused Failure scenario must execute the test and return Failure"
+                status="failed">
+         <failure message="expect assertion failed">Expecting: $t:result instance of xs:string</failure>
+      </testcase>
+   </testsuite>
+</testsuites>
diff --git a/test/end-to-end/cases/expected/schematron/force-focus_none-result.html b/test/end-to-end/cases/expected/schematron/force-focus_none-result.html
new file mode 100644
index 000000000..81958d978
--- /dev/null
+++ b/test/end-to-end/cases/expected/schematron/force-focus_none-result.html
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml">
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+      <title>Test Report for do-nothing.sch (passed: 2 / pending: 0 / failed: 2 / total: 4)</title>
+      <link rel="stylesheet" type="text/css" href="../../../../../src/reporter/test-report.css" />
+   </head>
+   <body>
+      <h1>Test Report</h1>
+      <p>Schematron: <a href="../../../../do-nothing.sch">do-nothing.sch</a></p>
+      <p>XSpec: <a href="../../force-focus_none.xspec">force-focus_none.xspec</a></p>
+      <p>Tested: 1 January 2000 at 00:00</p>
+      <h2>Contents</h2>
+      <table class="xspec">
+         <colgroup>
+            <col style="width:75%" />
+            <col style="width:6.25%" />
+            <col style="width:6.25%" />
+            <col style="width:6.25%" />
+            <col style="width:6.25%" />
+         </colgroup>
+         <thead>
+            <tr>
+               <th></th>
+               <th class="totals">passed: 2</th>
+               <th class="totals">pending: 0</th>
+               <th class="totals">failed: 2</th>
+               <th class="totals">total: 4</th>
+            </tr>
+         </thead>
+         <tbody>
+            <tr class="failed">
+               <th><a href="#top_scenario1">Test @focus</a></th>
+               <th class="totals">2</th>
+               <th class="totals">0</th>
+               <th class="totals">2</th>
+               <th class="totals">4</th>
+            </tr>
+         </tbody>
+      </table>
+      <div id="top_scenario1">
+         <h2 class="successful">Test @focus<span class="scenario-totals">passed: 2 / pending: 0 / failed: 2 / total: 4</span></h2>
+         <table class="xspec" id="table_scenario1">
+            <colgroup>
+               <col style="width:75%" />
+               <col style="width:25%" />
+            </colgroup>
+            <tbody>
+               <tr class="successful">
+                  <th>Test @focus</th>
+                  <th>passed: 2 / pending: 0 / failed: 2 / total: 4</th>
+               </tr>
+               <tr class="successful">
+                  <th>an unfocused Success scenario must be Pending</th>
+                  <th>passed: 1 / pending: 0 / failed: 0 / total: 1</th>
+               </tr>
+               <tr class="successful">
+                  <td>it would return Success if it were not Pending</td>
+                  <td>Success</td>
+               </tr>
+               <tr class="failed">
+                  <th><a href="#scenario1-scenario2">an unfocused Failure scenario must be Pending</a></th>
+                  <th>passed: 0 / pending: 0 / failed: 1 / total: 1</th>
+               </tr>
+               <tr class="failed">
+                  <td><a href="#scenario1-scenario2-expect1">it would return Failure if it were not Pending</a></td>
+                  <td>Failure</td>
+               </tr>
+               <tr class="successful">
+                  <th>a focused Success scenario</th>
+                  <th>passed: 1 / pending: 0 / failed: 0 / total: 1</th>
+               </tr>
+               <tr class="successful">
+                  <td>must execute the test and return Success</td>
+                  <td>Success</td>
+               </tr>
+               <tr class="failed">
+                  <th><a href="#scenario1-scenario4">a focused Failure scenario</a></th>
+                  <th>passed: 0 / pending: 0 / failed: 1 / total: 1</th>
+               </tr>
+               <tr class="failed">
+                  <td><a href="#scenario1-scenario4-expect1">must execute the test and return Failure</a></td>
+                  <td>Failure</td>
+               </tr>
+            </tbody>
+         </table>
+         <div id="scenario1-scenario2">
+            <h3>Test @focus an unfocused Failure scenario must be Pending</h3>
+            <div id="scenario1-scenario2-expect1" class="xTestReport">
+               <h4 class="xTestReportTitle">it would return Failure if it were not Pending</h4>
+               <div class="xTestReportHint"><a href="https://github.com/xspec/xspec/wiki/Understanding-Test-Results" target="_blank" title="What does this report mean?">[?]</a></div>
+               <table class="xspecResult">
+                  <thead>
+                     <tr>
+                        <th>Result</th>
+                        <th>Expecting</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td>
+                           <pre>9</pre>
+                        </td>
+                        <td>
+                           <pre>$t:result instance of xs:string</pre>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div>
+         <div id="scenario1-scenario4">
+            <h3>Test @focus a focused Failure scenario</h3>
+            <div id="scenario1-scenario4-expect1" class="xTestReport">
+               <h4 class="xTestReportTitle">must execute the test and return Failure</h4>
+               <div class="xTestReportHint"><a href="https://github.com/xspec/xspec/wiki/Understanding-Test-Results" target="_blank" title="What does this report mean?">[?]</a></div>
+               <table class="xspecResult">
+                  <thead>
+                     <tr>
+                        <th>Result</th>
+                        <th>Expecting</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td>
+                           <pre>9</pre>
+                        </td>
+                        <td>
+                           <pre>$t:result instance of xs:string</pre>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/test/end-to-end/cases/expected/schematron/force-focus_none-result.xml b/test/end-to-end/cases/expected/schematron/force-focus_none-result.xml
new file mode 100644
index 000000000..1f02a71fb
--- /dev/null
+++ b/test/end-to-end/cases/expected/schematron/force-focus_none-result.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<report xmlns="http://www.jenitennison.com/xslt/xspec"
+        xspec="../../force-focus_none.xspec"
+        stylesheet="force-focus_none-sch-preprocessed.xsl"
+        schematron="../../../../do-nothing.sch"
+        date="2000-01-01T00:00:00Z">
+   <scenario id="scenario1" xspec="../../focus-without-pending.xspec">
+      <label>Test @focus</label>
+      <input-wrap xmlns="">
+         <t:call xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:t="http://www.jenitennison.com/xslt/xspec"
+                 function="exactly-one">
+            <t:param select="9"/>
+         </t:call>
+      </input-wrap>
+      <scenario id="scenario1-scenario1" xspec="../../focus-without-pending.xspec">
+         <label>an unfocused Success scenario must be Pending</label>
+         <result select="9"/>
+         <test id="scenario1-scenario1-expect1" successful="true">
+            <label>it would return Success if it were not Pending</label>
+            <expect select="9"/>
+         </test>
+      </scenario>
+      <scenario id="scenario1-scenario2" xspec="../../focus-without-pending.xspec">
+         <label>an unfocused Failure scenario must be Pending</label>
+         <result select="9"/>
+         <test id="scenario1-scenario2-expect1" successful="false">
+            <label>it would return Failure if it were not Pending</label>
+            <expect-test-wrap xmlns="">
+               <t:expect xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                         xmlns:t="http://www.jenitennison.com/xslt/xspec"
+                         test="$t:result instance of xs:string"/>
+            </expect-test-wrap>
+            <expect select="()"/>
+         </test>
+      </scenario>
+      <scenario id="scenario1-scenario3" xspec="../../focus-without-pending.xspec">
+         <label>a focused Success scenario</label>
+         <result select="9"/>
+         <test id="scenario1-scenario3-expect1" successful="true">
+            <label>must execute the test and return Success</label>
+            <expect select="9"/>
+         </test>
+      </scenario>
+      <scenario id="scenario1-scenario4" xspec="../../focus-without-pending.xspec">
+         <label>a focused Failure scenario</label>
+         <result select="9"/>
+         <test id="scenario1-scenario4-expect1" successful="false">
+            <label>must execute the test and return Failure</label>
+            <expect-test-wrap xmlns="">
+               <t:expect xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                         xmlns:t="http://www.jenitennison.com/xslt/xspec"
+                         test="$t:result instance of xs:string"/>
+            </expect-test-wrap>
+            <expect select="()"/>
+         </test>
+      </scenario>
+   </scenario>
+</report>
diff --git a/test/end-to-end/cases/expected/stylesheet/force-focus_none-junit.xml b/test/end-to-end/cases/expected/stylesheet/force-focus_none-junit.xml
new file mode 100644
index 000000000..366c77564
--- /dev/null
+++ b/test/end-to-end/cases/expected/stylesheet/force-focus_none-junit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites name="force-focus_none.xspec">
+   <testsuite name="Test @focus" tests="4" failures="2">
+      <testcase name="an unfocused Success scenario must be Pending it would return Success if it were not Pending"
+                status="passed"/>
+      <testcase name="an unfocused Failure scenario must be Pending it would return Failure if it were not Pending"
+                status="failed">
+         <failure message="expect assertion failed">Expecting: $t:result instance of xs:string</failure>
+      </testcase>
+      <testcase name="a focused Success scenario must execute the test and return Success"
+                status="passed"/>
+      <testcase name="a focused Failure scenario must execute the test and return Failure"
+                status="failed">
+         <failure message="expect assertion failed">Expecting: $t:result instance of xs:string</failure>
+      </testcase>
+   </testsuite>
+</testsuites>
diff --git a/test/end-to-end/cases/expected/stylesheet/force-focus_none-result.html b/test/end-to-end/cases/expected/stylesheet/force-focus_none-result.html
new file mode 100644
index 000000000..262cd998c
--- /dev/null
+++ b/test/end-to-end/cases/expected/stylesheet/force-focus_none-result.html
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml">
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+      <title>Test Report for do-nothing.xsl (passed: 2 / pending: 0 / failed: 2 / total: 4)</title>
+      <link rel="stylesheet" type="text/css" href="../../../../../src/reporter/test-report.css" />
+   </head>
+   <body>
+      <h1>Test Report</h1>
+      <p>Stylesheet: <a href="../../../../do-nothing.xsl">do-nothing.xsl</a></p>
+      <p>XSpec: <a href="../../force-focus_none.xspec">force-focus_none.xspec</a></p>
+      <p>Tested: 1 January 2000 at 00:00</p>
+      <h2>Contents</h2>
+      <table class="xspec">
+         <colgroup>
+            <col style="width:75%" />
+            <col style="width:6.25%" />
+            <col style="width:6.25%" />
+            <col style="width:6.25%" />
+            <col style="width:6.25%" />
+         </colgroup>
+         <thead>
+            <tr>
+               <th></th>
+               <th class="totals">passed: 2</th>
+               <th class="totals">pending: 0</th>
+               <th class="totals">failed: 2</th>
+               <th class="totals">total: 4</th>
+            </tr>
+         </thead>
+         <tbody>
+            <tr class="failed">
+               <th><a href="#top_scenario1">Test @focus</a></th>
+               <th class="totals">2</th>
+               <th class="totals">0</th>
+               <th class="totals">2</th>
+               <th class="totals">4</th>
+            </tr>
+         </tbody>
+      </table>
+      <div id="top_scenario1">
+         <h2 class="successful">Test @focus<span class="scenario-totals">passed: 2 / pending: 0 / failed: 2 / total: 4</span></h2>
+         <table class="xspec" id="table_scenario1">
+            <colgroup>
+               <col style="width:75%" />
+               <col style="width:25%" />
+            </colgroup>
+            <tbody>
+               <tr class="successful">
+                  <th>Test @focus</th>
+                  <th>passed: 2 / pending: 0 / failed: 2 / total: 4</th>
+               </tr>
+               <tr class="successful">
+                  <th>an unfocused Success scenario must be Pending</th>
+                  <th>passed: 1 / pending: 0 / failed: 0 / total: 1</th>
+               </tr>
+               <tr class="successful">
+                  <td>it would return Success if it were not Pending</td>
+                  <td>Success</td>
+               </tr>
+               <tr class="failed">
+                  <th><a href="#scenario1-scenario2">an unfocused Failure scenario must be Pending</a></th>
+                  <th>passed: 0 / pending: 0 / failed: 1 / total: 1</th>
+               </tr>
+               <tr class="failed">
+                  <td><a href="#scenario1-scenario2-expect1">it would return Failure if it were not Pending</a></td>
+                  <td>Failure</td>
+               </tr>
+               <tr class="successful">
+                  <th>a focused Success scenario</th>
+                  <th>passed: 1 / pending: 0 / failed: 0 / total: 1</th>
+               </tr>
+               <tr class="successful">
+                  <td>must execute the test and return Success</td>
+                  <td>Success</td>
+               </tr>
+               <tr class="failed">
+                  <th><a href="#scenario1-scenario4">a focused Failure scenario</a></th>
+                  <th>passed: 0 / pending: 0 / failed: 1 / total: 1</th>
+               </tr>
+               <tr class="failed">
+                  <td><a href="#scenario1-scenario4-expect1">must execute the test and return Failure</a></td>
+                  <td>Failure</td>
+               </tr>
+            </tbody>
+         </table>
+         <div id="scenario1-scenario2">
+            <h3>Test @focus an unfocused Failure scenario must be Pending</h3>
+            <div id="scenario1-scenario2-expect1" class="xTestReport">
+               <h4 class="xTestReportTitle">it would return Failure if it were not Pending</h4>
+               <div class="xTestReportHint"><a href="https://github.com/xspec/xspec/wiki/Understanding-Test-Results" target="_blank" title="What does this report mean?">[?]</a></div>
+               <table class="xspecResult">
+                  <thead>
+                     <tr>
+                        <th>Result</th>
+                        <th>Expecting</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td>
+                           <pre>9</pre>
+                        </td>
+                        <td>
+                           <pre>$t:result instance of xs:string</pre>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div>
+         <div id="scenario1-scenario4">
+            <h3>Test @focus a focused Failure scenario</h3>
+            <div id="scenario1-scenario4-expect1" class="xTestReport">
+               <h4 class="xTestReportTitle">must execute the test and return Failure</h4>
+               <div class="xTestReportHint"><a href="https://github.com/xspec/xspec/wiki/Understanding-Test-Results" target="_blank" title="What does this report mean?">[?]</a></div>
+               <table class="xspecResult">
+                  <thead>
+                     <tr>
+                        <th>Result</th>
+                        <th>Expecting</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td>
+                           <pre>9</pre>
+                        </td>
+                        <td>
+                           <pre>$t:result instance of xs:string</pre>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/test/end-to-end/cases/expected/stylesheet/force-focus_none-result.xml b/test/end-to-end/cases/expected/stylesheet/force-focus_none-result.xml
new file mode 100644
index 000000000..556cc8903
--- /dev/null
+++ b/test/end-to-end/cases/expected/stylesheet/force-focus_none-result.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<report xmlns="http://www.jenitennison.com/xslt/xspec"
+        xspec="../../force-focus_none.xspec"
+        stylesheet="../../../../do-nothing.xsl"
+        date="2000-01-01T00:00:00Z">
+   <scenario id="scenario1" xspec="../../focus-without-pending.xspec">
+      <label>Test @focus</label>
+      <input-wrap xmlns="">
+         <t:call xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:t="http://www.jenitennison.com/xslt/xspec"
+                 function="exactly-one">
+            <t:param select="9"/>
+         </t:call>
+      </input-wrap>
+      <scenario id="scenario1-scenario1" xspec="../../focus-without-pending.xspec">
+         <label>an unfocused Success scenario must be Pending</label>
+         <result select="9"/>
+         <test id="scenario1-scenario1-expect1" successful="true">
+            <label>it would return Success if it were not Pending</label>
+            <expect select="9"/>
+         </test>
+      </scenario>
+      <scenario id="scenario1-scenario2" xspec="../../focus-without-pending.xspec">
+         <label>an unfocused Failure scenario must be Pending</label>
+         <result select="9"/>
+         <test id="scenario1-scenario2-expect1" successful="false">
+            <label>it would return Failure if it were not Pending</label>
+            <expect-test-wrap xmlns="">
+               <t:expect xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                         xmlns:t="http://www.jenitennison.com/xslt/xspec"
+                         test="$t:result instance of xs:string"/>
+            </expect-test-wrap>
+            <expect select="()"/>
+         </test>
+      </scenario>
+      <scenario id="scenario1-scenario3" xspec="../../focus-without-pending.xspec">
+         <label>a focused Success scenario</label>
+         <result select="9"/>
+         <test id="scenario1-scenario3-expect1" successful="true">
+            <label>must execute the test and return Success</label>
+            <expect select="9"/>
+         </test>
+      </scenario>
+      <scenario id="scenario1-scenario4" xspec="../../focus-without-pending.xspec">
+         <label>a focused Failure scenario</label>
+         <result select="9"/>
+         <test id="scenario1-scenario4-expect1" successful="false">
+            <label>must execute the test and return Failure</label>
+            <expect-test-wrap xmlns="">
+               <t:expect xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                         xmlns:t="http://www.jenitennison.com/xslt/xspec"
+                         test="$t:result instance of xs:string"/>
+            </expect-test-wrap>
+            <expect select="()"/>
+         </test>
+      </scenario>
+   </scenario>
+</report>
diff --git a/test/end-to-end/cases/focus-without-pending.xspec b/test/end-to-end/cases/focus-without-pending.xspec
index c2e513f00..9c3aa7cbe 100644
--- a/test/end-to-end/cases/focus-without-pending.xspec
+++ b/test/end-to-end/cases/focus-without-pending.xspec
@@ -38,7 +38,7 @@
 
       <!--
          Focused scenarios
-         - force-focus_focus-without-pending.xspec removes focus from these scenarios
+         - force-focus_focus-without-pending.xspec and force-focus_none.xspec remove focus from these scenarios
       -->
       <t:scenario label="a focused Success scenario"
                   focus="testing @focus of a Success scenario">
diff --git a/test/end-to-end/cases/force-focus_none.xspec b/test/end-to-end/cases/force-focus_none.xspec
new file mode 100644
index 000000000..2c1621ef9
--- /dev/null
+++ b/test/end-to-end/cases/force-focus_none.xspec
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Remove focus from all the scenarios -->
+<?xspec-test force-focus=#none?>
+
+<x:description query="x-urn:test:do-nothing" query-at="../../do-nothing.xqm"
+	schematron="../../do-nothing.sch" stylesheet="../../do-nothing.xsl"
+	xmlns:t="http://www.jenitennison.com/xslt/xspec"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec">
+	<x:import href="focus-without-pending.xspec" />
+</x:description>

From 86386169eb733c8ccdca733295e946708d616881 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Nov 2023 13:18:17 +0000
Subject: [PATCH 2/3] ci(deps): bump actions/setup-java from 3 to 4 (#1817)

---
 .github/workflows/maven-deploy.yml | 2 +-
 .github/workflows/test.yml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
index 8a3724346..114aa2d20 100644
--- a/.github/workflows/maven-deploy.yml
+++ b/.github/workflows/maven-deploy.yml
@@ -17,7 +17,7 @@ jobs:
 
       - run: gpg --version
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 8
           distribution: temurin
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e35f23af2..85e88a86b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,7 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: temurin

From e09c69686c1f4069bb98986b9d4f03941c6cb188 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 16:24:10 -0500
Subject: [PATCH 3/3] build(deps): bump
 org.apache.maven.plugins:maven-javadoc-plugin (#1820)

Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.2 to 3.6.3.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.2...maven-javadoc-plugin-3.6.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0cb9fc68d..0cfe6caf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,7 +214,7 @@
           </plugin>
           <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.6.2</version>
+            <version>3.6.3</version>
             <configuration>
               <notimestamp>true</notimestamp>
             </configuration>