From 14e77306b7719edb2e8705a7f1a4befd3ca5b116 Mon Sep 17 00:00:00 2001 From: poire-z Date: Sat, 2 Jun 2018 19:28:00 +0200 Subject: [PATCH] Fix unit tests after crengine update (#3993) --- spec/unit/readerfooter_spec.lua | 8 ++++---- spec/unit/readersearch_spec.lua | 6 +++++- spec/unit/readertoc_spec.lua | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/spec/unit/readerfooter_spec.lua b/spec/unit/readerfooter_spec.lua index cd47b1bfa..394f543aa 100644 --- a/spec/unit/readerfooter_spec.lua +++ b/spec/unit/readerfooter_spec.lua @@ -146,7 +146,7 @@ describe("Readerfooter module", function() local timeinfo = footer.textGeneratorMap.time() local page_count = readerui.document:getPageCount() -- stats has not been initialized here, so we get na TB and TC - assert.are.same('1 / '..page_count..' | '..timeinfo..' | => 1 | B:0% | R:0% | TB: na | TC: na', + assert.are.same('1 / '..page_count..' | '..timeinfo..' | => 0 | B:0% | R:1% | TB: na | TC: na', footer.footer_text.text) end) @@ -295,8 +295,8 @@ describe("Readerfooter module", function() assert.are.same(365, footer.text_width) footer:onPageUpdate(100) - assert.are.same(191, footer.progress_bar.width) - assert.are.same(389, footer.text_width) + assert.are.same(183, footer.progress_bar.width) + assert.are.same(397, footer.text_width) end) it("should support chapter markers", function() @@ -545,7 +545,7 @@ describe("Readerfooter module", function() assert.is.same(0, footer.text_width) tapFooterMenu(fake_menu, "Progress percentage") - assert.are.same('R:0%', footer.footer_text.text) + assert.are.same('R:1%', footer.footer_text.text) assert.is.same(false, footer.has_no_mode) assert.is.same(footer.footer_text:getSize().w + footer.text_left_margin, footer.text_width) diff --git a/spec/unit/readersearch_spec.lua b/spec/unit/readersearch_spec.lua index b3ab00702..153b3bbe9 100644 --- a/spec/unit/readersearch_spec.lua +++ b/spec/unit/readersearch_spec.lua @@ -65,12 +65,16 @@ describe("Readersearch module", function() end end) it("should find the last occurrence", function() + -- local logger = require("logger") + -- logger.info("nb of pages", doc:getPageCount()) + -- 20180602: currently 200 pages (was 202 before) for i = 100, 180, 10 do rolling:onGotoPage(i) local words = search:searchFromEnd("Verona") assert.truthy(words) local pageno = doc:getPageFromXPointer(words[1].start) - assert.truthy(pageno > 200) + -- logger.info("last match on page", pageno) + assert.truthy(pageno > 195) end for i = 230, 235, 1 do rolling:onGotoPage(i) diff --git a/spec/unit/readertoc_spec.lua b/spec/unit/readertoc_spec.lua index e4a7157a2..6c777d271 100644 --- a/spec/unit/readertoc_spec.lua +++ b/spec/unit/readertoc_spec.lua @@ -68,7 +68,7 @@ describe("Readertoc module", function() end) it("should get page left of chapter", function() assert.truthy(toc:getChapterPagesLeft(10, 0) > 10) - assert.truthy(toc:getChapterPagesLeft(102, 0) > 10) + assert.truthy(toc:getChapterPagesLeft(100, 0) > 10) assert.are.same(nil, toc:getChapterPagesLeft(200, 0)) end) it("should get page done of chapter", function()