Skip to content

Commit 7a67d32

Browse files
committed
Refactor expected output for HTML merged renderer
Code changes of the HTML merged renderer causes different output. The expected output for the phpunit test of this renderer is refactored to reflect those changes.
1 parent 533a6bf commit 7a67d32

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

tests/resources/htmlMerged.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<th class="" title="">3</th>
1414
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;meta http-equiv="Content-type" content="text/html; charset=utf-8"/&gt;</td>
1515
</tr></tbody><tbody class="ChangeReplace"><tr>
16-
<th class="" title="">4</th>
16+
<th>4</th>
1717
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;title&gt;Hello <del>World</del><ins>You</ins>!&lt;/title&gt;</td>
1818
</tr></tbody><tbody class="ChangeEqual"><tr>
1919
<th class="" title="">5</th>
@@ -25,18 +25,18 @@
2525
<th class="" title="">7</th>
2626
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;h1&gt;This is demo content to show features of the php-diff package.&lt;/h1&gt;</td>
2727
</tr></tbody><tbody class="ChangeEqual"><tr>
28-
<th class="ChangeDelete" title="Lines deleted at Version2:
29-
8: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;h2&gt;This line is removed from version2.&lt;/h2&gt;
28+
<th class="ChangeDelete" title="Lines of Version1 deleted at Version2:
29+
8: &amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;h2&amp;gt;This line is removed from version2.&amp;lt;/h2&amp;gt;
3030
">8</th>
3131
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;h2&gt;This line is the same for both versions.&lt;/h2&gt;</td>
3232
</tr></tbody><tbody class="ChangeReplace"><tr>
33-
<th class="" title="">9</th>
33+
<th>9</th>
3434
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;h2&gt;<del>this line has inline</del><ins>This line has</ins> differences between both versions.&lt;/h2&gt;</td>
3535
</tr></tbody><tbody class="ChangeEqual"><tr>
3636
<th class="" title="">10</th>
3737
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;h2&gt;This line is the same for both versions.&lt;/h2&gt;</td>
3838
</tr></tbody><tbody class="ChangeReplace"><tr>
39-
<th class="" title="">11</th>
39+
<th>11</th>
4040
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;h2&gt;This line also has <del>inl</del><ins>InL</ins>ine differences between both versions.&lt;/h2&gt;</td>
4141
</tr></tbody><tbody class="ChangeEqual"><tr>
4242
<th class="" title="">12</th>
@@ -54,13 +54,13 @@
5454
<th class="" title="">16</th>
5555
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;It's also compatible with multibyte characters (like Chinese and emoji) as shown below:</td>
5656
</tr></tbody><tbody class="ChangeReplace"><tr>
57-
<th class="" title="">17</th>
57+
<th>17</th>
5858
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;另外我覺得那個評<del>價</del><ins>鑑</ins>的白色櫃子有點沒有必要欸。外觀我就不說了 ,怎麼連空間都那麼狹隘。不過倒是從這個地方看出所謂的“改革”</td>
5959
</tr><tr>
60-
<th class="" title="">18</th>
60+
<th>18</th>
6161
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Do you know what "<del>金槍魚罐頭</del><ins>魚の缶詰</ins>" means in Chinese?</td>
6262
</tr><tr>
63-
<th class="" title="">19</th>
63+
<th>19</th>
6464
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>🍏🍎</del><ins>🍎🍏</ins>🙂</td>
6565
</tr></tbody><tbody class="ChangeEqual"><tr>
6666
<th class="" title="">20</th>
@@ -84,13 +84,13 @@
8484
<th class="" title="">27</th>
8585
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;p&gt;Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.&lt;/p&gt;</td>
8686
</tr></tbody><tbody class="ChangeReplace"><tr>
87-
<th class="" title="">28</th>
87+
<th>28</th>
8888
<td><del>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</del><ins>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</ins>&lt;h2&gt;This line also has inline differences between both versions. It's the whitespace in front.&lt;/h2&gt;</td>
8989
</tr></tbody><tbody class="ChangeEqual"><tr>
9090
<th class="" title="">29</th>
9191
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;h2&gt;This line is the same for both versions.&lt;/h2&gt;</td>
9292
</tr></tbody><tbody class="ChangeReplace"><tr>
93-
<th class="" title="">30</th>
93+
<th>30</th>
9494
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;h2&gt;This line also has inline differences between both versions<del>.</del><ins>!</ins>&lt;/h2&gt;</td>
9595
</tr></tbody><tbody class="ChangeEqual"><tr>
9696
<th class="" title="">31</th>

0 commit comments

Comments
 (0)