Skip to content

Commit

Permalink
Updated test suite after merge of PR#76
Browse files Browse the repository at this point in the history
  • Loading branch information
@ganelson
ganelson committed Jul 23, 2024
1 parent 3120746 commit 61ef78c
Show file tree
Hide file tree
Showing 15 changed files with 1,840 additions and 1,135 deletions.
2 changes: 1 addition & 1 deletion inform7/Tests/Test Basic/BIP-Gestalts-G--I.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Resource streams: true
Graphics window character input: false
Text formatting: false
Glulx version: 30103
Interpreter version: 600
Interpreter version: 601
Memory resizing: true
Undo: true
Glulx unicode: true
Expand Down
397 changes: 275 additions & 122 deletions inform7/Tests/Test Internals/Index-Chart--I.txt
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inform7/Tests/Test Internals/Index-Innards--I.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<p class="tightin2"><span class="indexgrey">Set from Basic Inform version 2 by Graham Nelson:</span></p>
<p class="tightin3">Use dynamic memory allocation</p>
<p>Whereas these are not in force:</p>
<p class="tightin2"><span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use ineffectual.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;ineffectual</span><span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use American dialect.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;American dialect</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use serial comma.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;serial comma</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use memory economy.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;memory economy</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use engineering notation.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;engineering notation</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use printed engineering notation.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;printed engineering notation</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use predictable randomisation.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;predictable randomisation</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use numbered rules.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;numbered rules</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use no deprecated features.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;no deprecated features</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use command line echoing.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;command line echoing</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use dictionary resolution.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;dictionary resolution</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use no automatic plural synonyms.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;no automatic plural synonyms</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use maximum text length.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;maximum text length</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use index figure thumbnails.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;index figure thumbnails</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use full-length room descriptions.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;full-length room descriptions</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use abbreviated room descriptions.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;abbreviated room descriptions</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use VERBOSE room descriptions.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;VERBOSE room descriptions</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use BRIEF room descriptions.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;BRIEF room descriptions</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use SUPERBRIEF room descriptions.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;SUPERBRIEF room descriptions</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use no scoring.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;no scoring</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use scoring.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;scoring</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use default route-finding.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;default route-finding</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use fast route-finding.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;fast route-finding</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use slow route-finding.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;slow route-finding</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use maximum things understood at once.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;maximum things understood at once</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use nameless room descriptions.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;nameless room descriptions</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use manual pronouns.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;manual pronouns</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use undo prevention.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;undo prevention</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use unabbreviated object names.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;unabbreviated object names</span>, </p>
<p class="tightin2"><span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use ineffectual.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;ineffectual</span><span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use American dialect.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;American dialect</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use serial comma.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;serial comma</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use memory economy.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;memory economy</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use engineering notation.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;engineering notation</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use printed engineering notation.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;printed engineering notation</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use predictable randomisation.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;predictable randomisation</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use numbered rules.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;numbered rules</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use no deprecated features.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;no deprecated features</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use command line echoing.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;command line echoing</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use dictionary resolution.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;dictionary resolution</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use no automatic plural synonyms.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;no automatic plural synonyms</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use no status window.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;no status window</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use manual line input echoing.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;manual line input echoing</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use maximum text length.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;maximum text length</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use index figure thumbnails.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;index figure thumbnails</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use full-length room descriptions.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;full-length room descriptions</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use abbreviated room descriptions.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;abbreviated room descriptions</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use VERBOSE room descriptions.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;VERBOSE room descriptions</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use BRIEF room descriptions.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;BRIEF room descriptions</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use SUPERBRIEF room descriptions.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;SUPERBRIEF room descriptions</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use no scoring.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;no scoring</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use scoring.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;scoring</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use default route-finding.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;default route-finding</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use fast route-finding.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;fast route-finding</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use slow route-finding.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;slow route-finding</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use maximum things understood at once.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;maximum things understood at once</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use nameless room descriptions.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;nameless room descriptions</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use manual pronouns.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;manual pronouns</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use undo prevention.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;undo prevention</span>, <span style="white-space:nowrap";><a class="actionlink" href="javascript:pasteCode('Use unabbreviated object names.')"><img border=0 src=inform:/doc_images/paste.png></a>&nbsp;unabbreviated object names</span>, </p>
<p><a href="#" onclick="showExtra('extra3', 'plus3'); return false;"><img border=0 id="plus3" src=inform:/doc_images/extra.png></a>&nbsp;See some technicalities for Inform maintainers only</p>
<div id="extra3" style="display: none;">
<p class="in2"><table width="100%" cellpadding="6" cellspacing="0" border="0" class="indexmorebox">
Expand Down
69 changes: 61 additions & 8 deletions inform7/Tests/Test Internals/Index-Map-Ahoy--I.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<table border="1" cellpadding="0" cellspacing="0" class="indexmaproom" width="27" height="27" title="Spirit Room">
<tr>
<td valign="middle" align="center" bgcolor="#D3D3D3">
<span class="indexblack"><a href=#wo_18 style="text-decoration: none"><span class="indexblack">SR</span></a></span>
<span class="indexblack"><a href=#wo_22 style="text-decoration: none"><span class="indexblack">SR</span></a></span>
</td>
</tr>
</table>
Expand Down Expand Up @@ -237,7 +237,7 @@
<table border="2" cellpadding="0" cellspacing="0" class="indexmaproom" width="27" height="27" title="Fish Room">
<tr>
<td valign="middle" align="center" bgcolor="#D3D3D3">
<span class="indexblack"><a href=#wo_17 style="text-decoration: none"><span class="indexblack"><b>FR</b></span></a></span>
<span class="indexblack"><a href=#wo_21 style="text-decoration: none"><span class="indexblack"><b>FR</b></span></a></span>
</td>
</tr>
</table>
Expand Down Expand Up @@ -292,7 +292,7 @@
<table border="1" cellpadding="0" cellspacing="0" class="indexmaproom" width="27" height="27" title="After Powder Magazine">
<tr>
<td valign="middle" align="center" bgcolor="#D3D3D3">
<span class="indexblack"><a href=#wo_19 style="text-decoration: none"><span class="indexblack">AP</span></a></span>
<span class="indexblack"><a href=#wo_23 style="text-decoration: none"><span class="indexblack">AP</span></a></span>
</td>
</tr>
</table>
Expand Down Expand Up @@ -452,7 +452,7 @@
<table border="1" cellpadding="0" cellspacing="0" class="indexmaproom" width="27" height="27" title="Bread Room">
<tr>
<td valign="middle" align="center" bgcolor="#D3D3D3">
<span class="indexblack"><a href=#wo_20 style="text-decoration: none"><span class="indexblack">BR</span></a></span>
<span class="indexblack"><a href=#wo_24 style="text-decoration: none"><span class="indexblack">BR</span></a></span>
</td>
</tr>
</table>
Expand Down Expand Up @@ -538,7 +538,7 @@
<!--WORLD WRITE MAP ENDS-->
<a name=MDETAILS></a>

<p><a name=fi17></a><a name=wo_17><table border="0" cellspacing="0" cellpadding="0">
<p><a name=fi21></a><a name=wo_21><table border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="left" valign="top">

Expand Down Expand Up @@ -680,7 +680,7 @@
<hr>


<p><a name=fi18></a><a name=wo_18><table border="0" cellspacing="0" cellpadding="0">
<p><a name=fi22></a><a name=wo_22><table border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="left" valign="top">

Expand Down Expand Up @@ -806,7 +806,7 @@
<hr>


<p><a name=fi19></a><a name=wo_19><table border="0" cellspacing="0" cellpadding="0">
<p><a name=fi23></a><a name=wo_23><table border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="left" valign="top">

Expand Down Expand Up @@ -933,7 +933,7 @@
<hr>


<p><a name=fi20></a><a name=wo_20><table border="0" cellspacing="0" cellpadding="0">
<p><a name=fi24></a><a name=wo_24><table border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="left" valign="top">

Expand Down Expand Up @@ -1056,4 +1056,57 @@
</tr>
</table>
</p>
<hr>
<b>Nowhere (that is, initially not in any room):</b><br>
<a href="#" onclick="showExtra('extra5', 'plus5'); return false;"><img border=0 id="plus5" src=inform:/doc_images/extra.png></a>&nbsp;main window - <i>glk window</i><div id="extra5" style="display: none;">
<p class="in3"><table width="100%" cellpadding="6" cellspacing="0" border="0" class="indexmorebox">
<tr>
<td>
<p class="tightin1">abstract object &gt; glk window &gt; <b>main window</b></p>
<p class="hangingin1">printed name: <span class="indexdullblue">"main window"</span>&nbsp;<a href="source:story.ni#line11"><img border=0 src=inform:/doc_images/Reveal.png></a></p>
<p class="hangingin1">type: <span class="indexdullblue">text buffer</span></p>

</td>
</tr>
</table>
</p>
</div>
<a href="#" onclick="showExtra('extra6', 'plus6'); return false;"><img border=0 id="plus6" src=inform:/doc_images/extra.png></a>&nbsp;status window - <i>glk window</i><div id="extra6" style="display: none;">
<p class="in3"><table width="100%" cellpadding="6" cellspacing="0" border="0" class="indexmorebox">
<tr>
<td>
<p class="tightin1">abstract object &gt; glk window &gt; <b>status window</b></p>
<p class="hangingin1">printed name: <span class="indexdullblue">"status window"</span>&nbsp;<a href="source:story.ni#line11"><img border=0 src=inform:/doc_images/Reveal.png></a></p>
<p class="hangingin1">type: <span class="indexdullblue">text grid</span></p>

</td>
</tr>
</table>
</p>
</div>
<a href="#" onclick="showExtra('extra7', 'plus7'); return false;"><img border=0 id="plus7" src=inform:/doc_images/extra.png></a>&nbsp;quote window - <i>glk window</i><div id="extra7" style="display: none;">
<p class="in3"><table width="100%" cellpadding="6" cellspacing="0" border="0" class="indexmorebox">
<tr>
<td>
<p class="tightin1">abstract object &gt; glk window &gt; <b>quote window</b></p>
<p class="hangingin1">printed name: <span class="indexdullblue">"quote window"</span>&nbsp;<a href="source:story.ni#line11"><img border=0 src=inform:/doc_images/Reveal.png></a></p>
<p class="hangingin1">type: <span class="indexdullblue">text buffer</span></p>

</td>
</tr>
</table>
</p>
</div>
<a href="#" onclick="showExtra('extra8', 'plus8'); return false;"><img border=0 id="plus8" src=inform:/doc_images/extra.png></a>&nbsp;unknown window - <i>glk window</i><div id="extra8" style="display: none;">
<p class="in3"><table width="100%" cellpadding="6" cellspacing="0" border="0" class="indexmorebox">
<tr>
<td>
<p class="tightin1">abstract object &gt; glk window &gt; <b>unknown window</b></p>
<p class="hangingin1">printed name: <span class="indexdullblue">"unknown window"</span>&nbsp;<a href="source:story.ni#line11"><img border=0 src=inform:/doc_images/Reveal.png></a></p>

</td>
</tr>
</table>
</p>
</div>

Loading

0 comments on commit 61ef78c

Please sign in to comment.