Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ RUN ant -lib /usr/share/java
FROM stadlerpeter/existdb:6
LABEL org.opencontainers.image.authors="Peter Stadler"

ADD --chown=wegajetty https://weber-gesamtausgabe.de/downloads/WeGA-data-testing-31471.xar ${EXIST_HOME}/autodeploy/
ADD --chown=wegajetty https://weber-gesamtausgabe.de/downloads/WeGA-data-testing-44157.xar ${EXIST_HOME}/autodeploy/
COPY --from=builder /opt/wega-lib/build/*.xar ${EXIST_HOME}/autodeploy/
COPY --from=builder /opt/wega/build/*.xar ${EXIST_HOME}/autodeploy/
3 changes: 2 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<mkdir dir="${dist.dir}"/>
</target>

<target name="test">
<target name="test" depends="xqsuite">
<description>Run the regression test, i.e. diffing HTML pages against expected results</description>
<parallel threadCount="5" failonany="yes">
<regressiontest doctype="addenda"/>
Expand Down Expand Up @@ -101,6 +101,7 @@
<include name="indices/**"/>
<include name="templates/**"/>
<include name="xsl/**"/>
<include name="testing/xqsuite/**"/>
<exclude name="build.xml"/>
<exclude name="*build.properties"/>
<exclude name=".git*"/>
Expand Down
39 changes: 39 additions & 0 deletions testing/ant-testing.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,23 @@
</target>

<target name="create-result-URLs" depends="init">
<description>
Helper target for `get-results`.
Simply copy the text files with the URLs to cURL
from the testing/urls directory to the ${tmp.dir} directory.
Eventually string replacements (e.g. weber-gesamtausgabe.de -> localhost)
could be injected here if necessary.
</description>
<copy file="testing/urls/${docType}.txt" tofile="${tmp.dir}/${docType}.txt" overwrite="true"/>
<!--<replace file="${tmp.dir}/letters.txt" token="http://www.weber-gesamtausgabe.de" value="http://localhost:8080/exist/apps/WeGA-WebApp"/>-->
</target>

<target name="get-results" depends="create-result-URLs">
<description>
cURL the web pages to test.
This target will be called by the macro `regressiontest`,
passing the ${docType} parameter.
</description>
<delete dir="${tmp.dir}/results.raw/${docType}"/>
<mkdir dir="${tmp.dir}/results.raw/${docType}"/>
<!--<get dest="${tmp.dir}/results.raw/${docType}">
Expand Down Expand Up @@ -129,6 +141,33 @@
<arg value="docker rm -f ${docker.container.name}"/>
</exec>
</target>

<target name="xqsuite" depends="init">
<description>Run the XQSuite unit tests</description>
<get src="http://localhost:8080/exist/rest/db/apps/WeGA-WebApp/testing/xqsuite/run-unit-tests.xql"
dest="${tmp.dir}/xqsuite-results.xml"/>
<loadfile property="xqsuite.results"
srcFile="${tmp.dir}/xqsuite-results.xml"/>
<exec executable="${bash.command}" outputproperty="grep.out">
<arg value="-c"/>
<arg value="
(! grep 'failures=&quot;[1-9]' ${tmp.dir}/xqsuite-results.xml)
&amp;&amp; (! grep 'errors=&quot;[1-9]' ${tmp.dir}/xqsuite-results.xml)
"/>
</exec>
<fail>
Some XQSuite tests failed.
${xqsuite.results}
<condition>
<or>
<length string="${grep.out}" when="greater" length="0" trim="true"/>
<not>
<contains string="${xqsuite.results}" substring="testsuite" />
</not>
</or>
</condition>
</fail>
</target>

<macrodef name="regressiontest">
<attribute name="doctype"/>
Expand Down
15 changes: 11 additions & 4 deletions testing/expected-results/addenda/A120001.html
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,13 @@ <h3 id="d12e10">Anmerkungen und Ergänzungen zum Notentext (Bd. 5a)</h3>
<td></td>
<td></td>
</tr>
<tr>
<td>48</td>
<td><span class="tei_hi_bold">Nr. 1</span></td>
<td>8<span class="tei_hi_superscript">1</span></td>
<td>Fl 1</td>
<td>Die erste Viertel muss <span class="tei_hi_italic">a</span><span class="tei_hi_superscript">2</span>“ sein, nicht <span class="tei_hi_italic">cis</span><span class="tei_hi_superscript">3</span>.</td>
</tr>
<tr>
<td>80f.</td>
<td><span class="tei_hi_bold">Nr. 2</span></td>
Expand Down Expand Up @@ -1113,8 +1120,8 @@ <h3 id="d12e10">Anmerkungen und Ergänzungen zum Notentext (Bd. 5a)</h3>
</div>
<p>Für die Mitteilung von in der Partitur vorkommenden Druckfehlern, Inkonsequenzen und Unschönheiten im Satz sowie sonstigen Hinweisen sei Herrn Dr. Isaac Selya von der Queen City Opera in Cincinnati (USA) und vor allem Herrn Tim Hüttemeister (Detmold) sehr herzlich gedankt!</p>
</div>
<div id="d12e1738">
<h3 id="d12e1739">Anmerkungen und Ergänzungen zum Kritischen Bericht (Bd. 5b)</h3>
<div id="d12e1762">
<h3 id="d12e1763">Anmerkungen und Ergänzungen zum Kritischen Bericht (Bd. 5b)</h3>
<div class="table-wrapper">
<table id="Tabelle1" class="table">
<tbody>
Expand Down Expand Up @@ -1257,7 +1264,7 @@ <h2>XML</h2>
<div class="row permaLink">
<div class="col-md-9">
<h4>Empfohlene Zitierweise</h4>
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span>https://weber-gesamtausgabe.de/exist/apps/WeGA-WebApp/A120001</span> (<a href="">Version 4.14.0-alpha vom 17. November 2025</a>)
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span>https://weber-gesamtausgabe.de/exist/apps/WeGA-WebApp/A120001</span> (<a href="">Version 4.14.0-alpha vom 12. Dezember 2025</a>)
<br />
<span>Letzte Änderung dieses Dokuments am %1 durch %2</span></p>
</div>
Expand Down Expand Up @@ -1379,7 +1386,7 @@ <h3 class="item-title">
<script type="text/javascript" src="/exist/apps/WeGA-WebApp/resources/lib/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="/exist/apps/WeGA-WebApp/resources/lib/ion-rangeslider/js/ion.rangeSlider.min.js"></script>
<script type="text/javascript" src="/exist/apps/WeGA-WebApp/resources/lib/flip/dist/jquery.flip.min.js"></script>
<script type="module" src="/resources/lib/wega-mirador/dist/WeGA-WebApp-Mirador.7284d721.js"></script>
<script type="module" src="/exist/apps/WeGA-WebApp/resources/lib/wega-mirador/dist/WeGA-WebApp-Mirador.7284d721.js"></script>
<script type="text/javascript" src="/exist/apps/WeGA-WebApp/resources/js/greedynav.js"></script>

<script type="text/javascript" src="/exist/apps/WeGA-WebApp/resources/lib/jszip/dist/jszip.min.js"></script>
Expand Down
Loading
Loading