Update functional tests to account for i, em, and strong in isolated diffs

Author: jschroed91

tests/Caxy/Tests/HtmlDiff/HtmlFileIterator.php

@@ -43,7 +43,7 @@ public function next()
      */
     public function key()
     {
-        return $this->key;
+        return basename($this->files[$this->key]);
     }
 
     /**

tests/fixtures/HtmlDiff/new-paragraph-and-list.html

@@ -16,5 +16,5 @@
 </newText>
 
 <expected>
-<i class="diffmod"><em class="diffmod">Corridors</i></em> shall be fire-resistance rated in accordance with Table 1020.1. The <i class="diffmod"><em class="diffmod">corridor</i></em> walls required to be fire-resistance rated shall comply with Section 708 for <i class="diffmod"><em class="diffmod">fire partitions</i></em>.<br / class="diffmod"><br /><ins class="diffins">In addition, corridors in buildings of Types IIB, IIIB, and VB construction and assigned Risk Categories III and IV in Table 1604.5, other than Group I, shall have a fire resistance rating of not less than 1 hour where such buildings are any of the following:</ins><br / class="diffmod"><br /><ol><li><ins class="diffins">Assigned a Seismic Design Category C or D in Table 1613.3.5(1).</ins></li><ins class="diffins"> </ins><li class="diffmod"><ins class="diffins">Located in a flood hazard area established in accordance with Section 1612.3.</ins></li><ins class="diffins"> </ins><li class="diffmod"><ins class="diffins">Located in a </ins><em class="diffmod"><ins class="diffins">hurricane-prone regions</ins></em><ins class="diffins">.</ins></li><ins class="diffins"> </ins></ol><ul class="exception" class="diff-list"><li class="normal"><b class="diffmod"><strong class="diffmod">Exceptions:</b></strong><ol class="diff-list"><li class="normal">A <i class="diffmod"><em class="diffmod">fire-resistance rating</i></em> is not required for <i class="diffmod"><em class="diffmod">corridors</i></em> in an occupancy in Group E where each room that is used for instruction has not less than one door opening directly to the exterior and rooms for assembly purposes have not less than one-half of the required <i class="diffmod"><em class="diffmod">means of egress</i></em> doors opening directly to the exterior. Exterior doors specified in this exception are required to be at ground level.</li><li class="normal">A <i class="diffmod"><em class="diffmod">fire-resistance rating</i></em> is not required for <i class="diffmod"><em class="diffmod">corridors</i></em> contained within a <i class="diffmod"><em class="diffmod">dwelling unit</i></em> or <i class="diffmod"><em class="diffmod">sleeping unit</i></em> in an occupancy in Groups I-1 and R.</li><li class="normal">A <i class="diffmod"><em class="diffmod">fire-resistance rating</i></em> is not required for <i class="diffmod"><em class="diffmod">corridors</i></em> in <i class="diffmod"><em class="diffmod">open parking garages</i></em>.</li><li class="normal">A <i class="diffmod"><em class="diffmod">fire-resistance rating</i></em> is not required for <i class="diffmod"><em class="diffmod">corridors</i></em> in an occupancy in Group B that is a space requiring only a single <i class="diffmod"><em class="diffmod">means of egress</i></em> complying with Section 1006.2.</li><li class="normal"><i class="diffmod"><em class="diffmod">Corridors</i></em> adjacent to the <i class="diffmod"><em class="diffmod">exterior walls</i></em> of buildings shall be permitted to have unprotected openings on unrated <i class="diffmod"><em class="diffmod">exterior walls</i></em> where unrated walls are permitted by Table 602 and unprotected openings are permitted by Table 705.8.</li></ol></li></ul>
-</expected>
+<i class="diffmod"><del class="diffmod">Corridors</del></i><em class="diffmod"><ins class="diffmod">Corridors</ins></em> shall be fire-resistance rated in accordance with Table 1020.1. The <i class="diffmod"><del class="diffmod">corridor</del></i><em class="diffmod"><ins class="diffmod">corridor</ins></em> walls required to be fire-resistance rated shall comply with Section 708 for <i class="diffmod"><del class="diffmod">fire partitions</del></i><em class="diffmod"><ins class="diffmod">fire partitions</ins></em>.<ul class="diffmod exception"><li><b><del class="diffmod">Exceptions:</del></b><ol><li><del class="diffmod">A </del><i class="diffmod"><del class="diffmod">fire-resistance rating</del></i><del class="diffmod"> is not required for </del><i class="diffmod"><del class="diffmod">corridors</del></i><del class="diffmod"> in an occupancy in Group E where each room that is used for instruction has not less than one door opening directly to the exterior and rooms for assembly purposes have not less than one-half of the required </del><i class="diffmod"><del class="diffmod">means of egress</del></i><del class="diffmod"> doors opening directly to the exterior. Exterior doors specified in this exception are required to be at ground level.</del></li><li><del class="diffmod">A </del><i class="diffmod"><del class="diffmod">fire-resistance rating</del></i><del class="diffmod"> is not required for </del><i class="diffmod"><del class="diffmod">corridors</del></i><del class="diffmod"> contained within a </del><i class="diffmod"><del class="diffmod">dwelling unit</del></i><del class="diffmod"> or </del><i class="diffmod"><del class="diffmod">sleeping unit</del></i><del class="diffmod"> in an occupancy in Groups I-1 and R.</del></li><li><del class="diffmod">A </del><i class="diffmod"><del class="diffmod">fire-resistance rating</del></i><del class="diffmod"> is not required for </del><i class="diffmod"><del class="diffmod">corridors</del></i><del class="diffmod"> in </del><i class="diffmod"><del class="diffmod">open parking garages</del></i><del class="diffmod">.</del></li><li><del class="diffmod">A </del><i class="diffmod"><del class="diffmod">fire-resistance rating</del></i><del class="diffmod"> is not required for </del><i class="diffmod"><del class="diffmod">corridors</del></i><del class="diffmod"> in an occupancy in Group B that is a space requiring only a single </del><i class="diffmod"><del class="diffmod">means of egress</del></i><del class="diffmod"> complying with Section 1006.2.</del></li><li><i><del class="diffmod">Corridors</del></i><del class="diffmod"> adjacent to the </del><i class="diffmod"><del class="diffmod">exterior walls</del></i><del class="diffmod"> of buildings shall be permitted to have unprotected openings on unrated </del><i class="diffmod"><del class="diffmod">exterior walls</del></i><del class="diffmod"> where unrated walls are permitted by Table 602 and unprotected openings are permitted by Table 705.8.</del></li></ol></li></ul><br / class="diffmod"><br /><ins class="diffmod">In addition, corridors in buildings of Types IIB, IIIB, and VB construction and assigned Risk Categories III and IV in Table 1604.5, other than Group I, shall have a fire resistance rating of not less than 1 hour where such buildings are any of the following:</ins><br / class="diffmod"><br /><ol><li><ins class="diffmod">Assigned a Seismic Design Category C or D in Table 1613.3.5(1).</ins></li><ins class="diffmod"> </ins><li class="diffmod"><ins class="diffmod">Located in a flood hazard area established in accordance with Section 1612.3.</ins></li><ins class="diffmod"> </ins><li class="diffmod"><ins class="diffmod">Located in a </ins><em class="diffmod"><ins class="diffmod">hurricane-prone regions</ins></em><ins class="diffmod">.</ins></li><ins class="diffmod"> </ins></ol><ul class="exception"><li><strong><ins class="diffmod">Exceptions:</ins></strong><ol><li><ins class="diffmod">A </ins><em class="diffmod"><ins class="diffmod">fire-resistance rating</ins></em><ins class="diffmod"> is not required for </ins><em class="diffmod"><ins class="diffmod">corridors</ins></em><ins class="diffmod"> in an occupancy in Group E where each room that is used for instruction has not less than one door opening directly to the exterior and rooms for assembly purposes have not less than one-half of the required </ins><em class="diffmod"><ins class="diffmod">means of egress</ins></em><ins class="diffmod"> doors opening directly to the exterior. Exterior doors specified in this exception are required to be at ground level.</ins></li><ins class="diffmod"> </ins><li class="diffmod"><ins class="diffmod">A </ins><em class="diffmod"><ins class="diffmod">fire-resistance rating</ins></em><ins class="diffmod"> is not required for </ins><em class="diffmod"><ins class="diffmod">corridors</ins></em><ins class="diffmod"> contained within a </ins><em class="diffmod"><ins class="diffmod">dwelling unit</ins></em><ins class="diffmod"> or </ins><em class="diffmod"><ins class="diffmod">sleeping unit</ins></em><ins class="diffmod"> in an occupancy in Groups I-1 and R.</ins></li><ins class="diffmod"> </ins><li class="diffmod"><ins class="diffmod">A </ins><em class="diffmod"><ins class="diffmod">fire-resistance rating</ins></em><ins class="diffmod"> is not required for </ins><em class="diffmod"><ins class="diffmod">corridors</ins></em><ins class="diffmod"> in </ins><em class="diffmod"><ins class="diffmod">open parking garages</ins></em><ins class="diffmod">.</ins></li><ins class="diffmod"> </ins><li class="diffmod"><ins class="diffmod">A </ins><em class="diffmod"><ins class="diffmod">fire-resistance rating</ins></em><ins class="diffmod"> is not required for </ins><em class="diffmod"><ins class="diffmod">corridors</ins></em><ins class="diffmod"> in an occupancy in Group B that is a space requiring only a single </ins><em class="diffmod"><ins class="diffmod">means of egress</ins></em><ins class="diffmod"> complying with Section 1006.2.</ins></li><ins class="diffmod"> </ins><li class="diffmod"><em><ins class="diffmod">Corridors</ins></em><ins class="diffmod"> adjacent to the </ins><em class="diffmod"><ins class="diffmod">exterior walls</ins></em><ins class="diffmod"> of buildings shall be permitted to have unprotected openings on unrated </ins><em class="diffmod"><ins class="diffmod">exterior walls</ins></em><ins class="diffmod"> where unrated walls are permitted by Table 602 and unprotected openings are permitted by Table 705.8.</ins></li><ins class="diffmod"> </ins></ol></li><ins class="diffmod"> </ins></ul>
+</expected>

tests/fixtures/HtmlDiff/override-4.html

@@ -24,5 +24,5 @@
 </newText>
 
 <expected>
-    <em>Corridors</em> shall be fire-resistance rated in accordance with Table 1020.1<ins class="diffins"> and where applicable in Section 1020.1.1</ins>. The <em>corridor</em> walls required to be fire-resistance rated shall comply with Section 708 for <em>fire partitions</em>.<br /><br / class="diffmod"><del class="diffdel">In addition, corridors in buildings of Types IIB, IIIB, and VB construction and assigned Risk Categories III and IV in Table 1604.5, other than Group I, shall have a fire resistance rating of not less than 1 hour where such buildings are any of the following:</del><br / class="diffmod"><br /><ol><li><del class="diffdel">Assigned a Seismic Design Category C or D in Table 1613.3.5(1).</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">Located in a flood hazard area established in accordance with Section 1612.3.</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">Located in a </del><em class="diffmod"><del class="diffdel">hurricane-prone regions</del></em><del class="diffdel">.</del></li><del class="diffdel"> </del></ol><ul class="exception" class="diff-list"><li class="normal new"><ins><strong>Exceptions:</strong></ins></li><li class="normal"><strong class="diffmod"><del class="diffdel">Exceptions:</del></strong><ol class="diff-list"><li class="normal">A <em>fire-resistance rating</em> is not required for <em>corridors</em> in an occupancy in Group E where each room that is used for instruction has not less than one door opening directly to the exterior and rooms for assembly purposes have not less than one-half of the required <em>means of egress</em> doors opening directly to the exterior. Exterior doors specified in this exception are required to be at ground level.</li><li class="normal">A <em>fire-resistance rating</em> is not required for <em>corridors</em> contained within a <em>dwelling unit</em> or <em>sleeping unit</em> in an occupancy in Groups I-1 and R.</li><li class="normal">A <em>fire-resistance rating</em> is not required for <em>corridors</em> in <em>open parking garages</em>.</li><li class="normal">A <em>fire-resistance rating</em> is not required for <em>corridors</em> in an occupancy in Group B that is a space requiring only a single <em>means of egress</em> complying with Section 1006.2.</li><li class="normal"><em>Corridors</em> adjacent to the <em>exterior walls</em> of buildings shall be permitted to have unprotected openings on unrated <em>exterior walls</em> where unrated walls are permitted by Table 602 and unprotected openings are permitted by Table 705.8.</li></ol></li></ul>
-</expected>
+<em>Corridors</em> shall be fire-resistance rated in accordance with Table 1020.1<ins class="diffins"> and where applicable in Section 1020.1.1</ins>. The <em>corridor</em> walls required to be fire-resistance rated shall comply with Section 708 for <em>fire partitions</em>.<br /><br / class="diffmod"><del class="diffdel">In addition, corridors in buildings of Types IIB, IIIB, and VB construction and assigned Risk Categories III and IV in Table 1604.5, other than Group I, shall have a fire resistance rating of not less than 1 hour where such buildings are any of the following:</del><br / class="diffmod"><br /><ol><li><del class="diffdel">Assigned a Seismic Design Category C or D in Table 1613.3.5(1).</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">Located in a flood hazard area established in accordance with Section 1612.3.</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">Located in a </del><em class="diffmod"><del class="diffdel">hurricane-prone regions</del></em><del class="diffdel">.</del></li><del class="diffdel"> </del></ol><ul class="exception"><li><strong>Exceptions:</strong></li><ins class="diffins"> </ins><li class="diffmod"><ins class="diffins"> </ins><ol><li>A <em>fire-resistance rating</em> is not required for <em>corridors</em> in an occupancy in Group E where each room that is used for instruction has not less than one door opening directly to the exterior and rooms for assembly purposes have not less than one-half of the required <em>means of egress</em> doors opening directly to the exterior. Exterior doors specified in this exception are required to be at ground level.</li> <li>A <em>fire-resistance rating</em> is not required for <em>corridors</em> contained within a <em>dwelling unit</em> or <em>sleeping unit</em> in an occupancy in Groups I-1 and R.</li> <li>A <em>fire-resistance rating</em> is not required for <em>corridors</em> in <em>open parking garages</em>.</li> <li>A <em>fire-resistance rating</em> is not required for <em>corridors</em> in an occupancy in Group B that is a space requiring only a single <em>means of egress</em> complying with Section 1006.2.</li> <li><em>Corridors</em> adjacent to the <em>exterior walls</em> of buildings shall be permitted to have unprotected openings on unrated <em>exterior walls</em> where unrated walls are permitted by Table 602 and unprotected openings are permitted by Table 705.8.</li> </ol></li> </ul>
+</expected>