From 615ee009616f5970469c406f0f8c7a650029b6d8 Mon Sep 17 00:00:00 2001
From: "FiveFilters.org" <fivefilters@fivefilters.org>
Date: Wed, 25 Aug 2021 02:44:19 +0200
Subject: Include more ancestors in candidate scoring

https://github.com/mozilla/readability/commit/3844d8f05b3f114e3df16c3bc3caf44e5ba52181
---
 test/test-pages/hukumusume/expected-images.json |  14 +-
 test/test-pages/hukumusume/expected.html        | 181 ++++++++++++++++++++++--
 2 files changed, 181 insertions(+), 14 deletions(-)

(limited to 'test/test-pages/hukumusume')

diff --git a/test/test-pages/hukumusume/expected-images.json b/test/test-pages/hukumusume/expected-images.json
index ed782fb..1e62b57 100644
--- a/test/test-pages/hukumusume/expected-images.json
+++ b/test/test-pages/hukumusume/expected-images.json
@@ -1,8 +1,10 @@
 [
-    "http:\/\/fakehost\/test\/..\/..\/..\/gazou\/pc_gazou\/aesop\/aesop052.jpg",
-    "http:\/\/fakehost\/test\/..\/..\/..\/..\/366\/logo_bana\/corner_1.gif",
-    "http:\/\/fakehost\/test\/..\/..\/..\/..\/366\/logo_bana\/corner_2.gif",
-    "http:\/\/fakehost\/test\/..\/..\/..\/gazou\/origami_gazou\/kantan\/dogface.gif",
-    "http:\/\/fakehost\/test\/..\/..\/..\/gazou\/origami_gazou\/kantan\/dog.gif",
-    "http:\/\/fakehost\/test\/..\/..\/..\/gazou\/pc_gazou\/all\/top_bana\/back_logo_r.gif"
+    "http:\/\/fakehost\/366\/logo_bana\/corner_1.gif",
+    "http:\/\/fakehost\/366\/logo_bana\/corner_2.gif",
+    "http:\/\/fakehost\/gazou\/pc_gazou\/aesop\/aesop052.jpg",
+    "http:\/\/fakehost\/gazou\/origami_gazou\/kantan\/dogface.gif",
+    "http:\/\/fakehost\/gazou\/origami_gazou\/kantan\/dog.gif",
+    "http:\/\/fakehost\/gazou\/pc_gazou\/all\/top_bana\/back_logo_r.gif",
+    "file:\/\/\/C|\/Documents%20and%20Settings\/%E7%A6%8F%E5%A8%98note\/%E3%83%87%E3%82%B9%E3%82%AF%E3%83%88%E3%83%83%E3%83%97\/company_website15\/image\/spacer.gif",
+    "file:\/\/\/C|\/Documents%20and%20Settings\/%E7%A6%8F%E5%A8%98note\/%E3%83%87%E3%82%B9%E3%82%AF%E3%83%88%E3%83%83%E3%83%97"
 ]
\ No newline at end of file
diff --git a/test/test-pages/hukumusume/expected.html b/test/test-pages/hukumusume/expected.html
index 81b5b5b..1d63a9e 100644
--- a/test/test-pages/hukumusume/expected.html
+++ b/test/test-pages/hukumusume/expected.html
@@ -1,16 +1,47 @@
-<div width="619">
+<div>
+                    <td>
+                        <table readabilityDataTable="0">
+                            <tbody>
+                                <tr>
+                                    <td>
+                                        <img src="http://fakehost/366/logo_bana/corner_1.gif" width="7" height="7">
+                                    </td>
+                                    <td></td>
+                                    <td>
+                                        <img src="http://fakehost/366/logo_bana/corner_2.gif" width="7" height="7">
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                        <table readabilityDataTable="0">
+                            <tbody>
+                                <tr>
+                                    <td>
+                                        
+                                        
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        &nbsp;
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </td>
+                    <td>
                         <p>
-                            <a href="http://fakehost/test/../../../index.html">福娘童話集</a> &gt; <a href="http://fakehost/test/../index.html">きょうのイソップ童話</a> &gt; <a href="http://fakehost/test/../itiran/01gatu.htm">１月のイソップ童話</a> &gt; 欲張りなイヌ
+                            <a href="http://fakehost/index.html">福娘童話集</a> &gt; <a href="http://fakehost/index.html">きょうのイソップ童話</a> &gt; <a href="http://fakehost/itiran/01gatu.htm">１月のイソップ童話</a> &gt; 欲張りなイヌ
                         </p>
                         <div>
-                            <p><span color="#FF0000" size="+2">元旦のイソップ童話</span></p><p><img src="http://fakehost/test/../../../gazou/pc_gazou/aesop/aesop052.jpg" alt="よくばりなイヌ" width="480" height="360"></p><p>
+                            <p><span color="#FF0000" size="+2">元旦のイソップ童話</span></p><p><img src="http://fakehost/gazou/pc_gazou/aesop/aesop052.jpg" alt="よくばりなイヌ" width="480" height="360"></p><p>
                             欲張りなイヌ</p><p><a href="http://hukumusume.com/douwa/English/aesop/01/01_j.html">ひらがな</a>　←→　<a href="http://hukumusume.com/douwa/English/aesop/01/01_j&amp;E.html">日本語・英語</a>　←→　<a href="http://hukumusume.com/douwa/English/aesop/01/01_E.html">English</a></p></div>
                         <div>
                                         <table readabilityDataTable="0">
                                             <tbody>
                                                 <tr>
                                                     <td>
-                                                        <img src="http://fakehost/test/../../../../366/logo_bana/corner_1.gif" width="7" height="7">
+                                                        <img src="http://fakehost/366/logo_bana/corner_1.gif" width="7" height="7">
                                                     </td>
                                                     <td>
                                                         <span color="#FF0000"><b>おりがみをつくろう</b></span>
@@ -19,13 +50,13 @@
                                                         <span size="-1">( <a href="http://www.origami-club.com/index.html">おりがみくらぶ</a> より)</span>
                                                     </td>
                                                     <td>
-                                                        <img src="http://fakehost/test/../../../../366/logo_bana/corner_2.gif" width="7" height="7">
+                                                        <img src="http://fakehost/366/logo_bana/corner_2.gif" width="7" height="7">
                                                     </td>
                                                 </tr>
                                                 <tr>
                                                     <td colspan="4">
                                                         <p>
-                                                                        <a href="http://www.origami-club.com/easy/dogfase/index.html"><span size="+2"><img src="http://fakehost/test/../../../gazou/origami_gazou/kantan/dogface.gif" alt="犬の顔の折り紙" width="73" height="51">いぬのかお</span></a>　　　<a href="http://www.origami-club.com/easy/dog/index.html"><img src="http://fakehost/test/../../../gazou/origami_gazou/kantan/dog.gif" alt="犬の顔の紙" width="62" height="43"><span size="+2">いぬ</span></a>
+                                                                        <a href="http://www.origami-club.com/easy/dogfase/index.html"><span size="+2"><img src="http://fakehost/gazou/origami_gazou/kantan/dogface.gif" alt="犬の顔の折り紙" width="73" height="51">いぬのかお</span></a>　　　<a href="http://www.origami-club.com/easy/dog/index.html"><img src="http://fakehost/gazou/origami_gazou/kantan/dog.gif" alt="犬の顔の紙" width="62" height="43"><span size="+2">いぬ</span></a>
                                                                     </p>
                                                     </td>
                                                 </tr>
@@ -58,5 +89,139 @@
                             おしまい
                         </p>
                         <div>
-                            <p><span><img src="http://fakehost/test/../../../gazou/pc_gazou/all/top_bana/back_logo_r.gif" alt="前のページへ戻る" name="Image10" width="175" height="32" id="Image10"></span></p></div>
-                    </div>
\ No newline at end of file
+                            <p><span><img src="http://fakehost/gazou/pc_gazou/all/top_bana/back_logo_r.gif" alt="前のページへ戻る" name="Image10" width="175" height="32" id="Image10"></span></p></div>
+                    </td>
+                    <td>
+                        <img src="file:///C|/Documents%20and%20Settings/%E7%A6%8F%E5%A8%98note/%E3%83%87%E3%82%B9%E3%82%AF%E3%83%88%E3%83%83%E3%83%97/company_website15/image/spacer.gif" width="1" height="1">
+                    </td>
+                    <td>
+                        <table readabilityDataTable="0">
+                            <tbody>
+                                <tr>
+                                    <td>
+                                        <img src="http://fakehost/366/logo_bana/corner_1.gif" width="7" height="7">
+                                    </td>
+                                    <td></td>
+                                    <td>
+                                        <img src="http://fakehost/366/logo_bana/corner_2.gif" width="7" height="7">
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                        <table readabilityDataTable="1">
+                            <tbody>
+                                <tr>
+                                    <td>
+                                        &nbsp;&nbsp;&nbsp;&nbsp; <span size="-1"><b>1月 1日の豆知識</b></span><span size="-2"><u><p>
+                                        366日への旅</p></u></span>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <img src="file:///C|/Documents%20and%20Settings/%E7%A6%8F%E5%A8%98note/%E3%83%87%E3%82%B9%E3%82%AF%E3%83%88%E3%83%83%E3%83%97" width="1" height="1"><b><span size="-1">きょうの記念日</span></b><a href="http://fakehost/366/kinenbi/pc/01gatu/1_01.htm"><span size="-1">元旦</span></a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <img src="file:///C|/Documents%20and%20Settings/%E7%A6%8F%E5%A8%98note/%E3%83%87%E3%82%B9%E3%82%AF%E3%83%88%E3%83%83%E3%83%97/company_website15/image/spacer.gif" width="1" height="1"><b><span size="-1">きょうの誕生花</span></b><a href="http://fakehost/366/hana/pc/01gatu/1_01.htm"><span size="-1">松(まつ)</span></a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b><span size="-1">きょうの誕生日・出来事</span></b><a href="http://fakehost/366/birthday/pc/01gatu/1_01.htm"><span size="-1">1949年　Mr.マリック(マジシャン)</span></a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b><span size="-1">恋の誕生日占い</span></b><a href="http://fakehost/sakura/uranai/birthday/01/01.html"><span size="-1">自分の考えをしっかりと持った女の子。</span></a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b><span size="-1">なぞなぞ小学校</span></b><a href="http://fakehost/nazonazo/new/2012/04/02.html"><span size="-1">○(丸)を取ったらお母さんになってしまう男の人は？</span></a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b><span size="-1">あこがれの職業紹介</span></b><a href="http://fakehost/sakura/navi/work/2017/041.html"><span size="-1">歌手</span></a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b><span size="-1">恋の魔法とおまじない</span></b> 001<a href="http://fakehost/omajinai/new/2012/00/re01.html"><span size="-1">両思いになれる おまじない</span></a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span size="-1">　　<b>1月 1日の童話・昔話</b><u><span size="-2"><p>
+                                        福娘童話集</p></span></u></span>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b><span size="-1">きょうの日本昔話</span></b><a href="http://fakehost/douwa/pc/jap/01/01.htm"><span size="-1">ネコがネズミを追いかける訳</span></a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b><span size="-1">きょうの世界昔話<img src="file:///C|/Documents%20and%20Settings/%E7%A6%8F%E5%A8%98note/%E3%83%87%E3%82%B9%E3%82%AF%E3%83%88%E3%83%83%E3%83%97/company_website15/image/spacer.gif" width="1" height="1"></span></b><a href="http://fakehost/douwa/pc/world/01/01a.htm"><span size="-1">モンゴルの十二支話</span></a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <img src="file:///C|/Documents%20and%20Settings/%E7%A6%8F%E5%A8%98note/%E3%83%87%E3%82%B9%E3%82%AF%E3%83%88%E3%83%83%E3%83%97/company_website15/image/spacer.gif" width="1" height="1"><b><span size="-1">きょうの日本民話</span></b><a href="http://fakehost/douwa/pc/minwa/01/01c.html"><span size="-1">仕事の取替えっこ</span></a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b><span size="-1">きょうのイソップ童話</span></b><a href="http://fakehost/douwa/pc/aesop/01/01.htm"><span size="-1">欲張りなイヌ</span></a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b><span size="-1">きょうの江戸小話</span></b><a href="http://fakehost/douwa/pc/kobanashi/01/01.htm"><span size="-1">ぞうきんとお年玉</span></a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b><span size="-1">きょうの百物語</span></b><a href="http://fakehost/douwa/pc/kaidan/01/01.htm"><span size="-1">百物語の幽霊</span></a>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                        <table readabilityDataTable="0">
+                            <tbody>
+                                <tr>
+                                    <td>
+                                        <b><span size="-1">福娘のサイト</span></b>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span size="-1"><b>366日への旅</b><p><a href="http://hukumusume.com/366/">毎日の記念日・誕生花 ・有名人の誕生日と性格判断</a></p></span>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span size="-1"><b>福娘童話集</b><p><a href="http://hukumusume.com/douwa/">世界と日本の童話と昔話</a></p></span>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span size="-1"><b>女の子応援サイト -さくら-</b><p><a href="http://hukumusume.com/sakura/index.html">誕生日占い、お仕事紹介、おまじない、など</a></p></span>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span size="-1"><b>子どもの病気相談所</b><p><a href="http://hukumusume.com/my_baby/sick/">病気検索と対応方法、症状から検索するWEB問診</a></p></span>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span size="-1"><b>世界60秒巡り</b><p><a href="http://hukumusume.com/366/world/">国旗国歌や世界遺産など、世界の国々の豆知識</a></p></span>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </td>
+                </div>
\ No newline at end of file
-- 
cgit v1.2.3