From e5c1ff1ef639e24bae31651edd50f4df8e8fe00e Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 27 Mar 2016 17:17:46 -0700 Subject: [PATCH] test(bookmark): purge doc settings before test --- frontend/docsettings.lua | 6 ++++++ spec/unit/commonrequire.lua | 1 - spec/unit/readerbookmark_spec.lua | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/docsettings.lua b/frontend/docsettings.lua index 2537857e3..9cba169aa 100644 --- a/frontend/docsettings.lua +++ b/frontend/docsettings.lua @@ -1,6 +1,7 @@ local lfs = require("libs/libkoreader-lfs") local DataStorage = require("datastorage") local dump = require("dump") +local purgeDir = require("ffi/util").purgeDir local DocSettings = {} @@ -29,6 +30,11 @@ function DocSettings:getNameFromHistory(hist_name) return string.sub(hist_name, s+2, -5) end +function DocSettings:purgeDocSettings(doc_path) + purgeDir(self:getSidecarDir(doc_path)) + os.remove(self:getHistoryPath(doc_path)) +end + function DocSettings:open(docfile) local history_path local sidecar_path diff --git a/spec/unit/commonrequire.lua b/spec/unit/commonrequire.lua index 9ebb11204..244305401 100644 --- a/spec/unit/commonrequire.lua +++ b/spec/unit/commonrequire.lua @@ -49,4 +49,3 @@ function assertNotAlmostEquals(expected, actual, margin) .. ', received: ' .. actual ) end - diff --git a/spec/unit/readerbookmark_spec.lua b/spec/unit/readerbookmark_spec.lua index 66d6f5a75..61a8d859d 100644 --- a/spec/unit/readerbookmark_spec.lua +++ b/spec/unit/readerbookmark_spec.lua @@ -1,9 +1,10 @@ describe("ReaderBookmark module #ok", function() - local DocumentRegistry, ReaderUI, UIManager, Screen, Geom, DEBUG + local DocumentRegistry, ReaderUI, UIManager, Screen, Geom, DEBUG, DocSettings local sample_epub, sample_pdf setup(function() require("commonrequire") + DocSettings = require("docsettings") DocumentRegistry = require("document/documentregistry") ReaderUI = require("apps/reader/readerui") UIManager = require("ui/uimanager") @@ -46,6 +47,7 @@ describe("ReaderBookmark module #ok", function() local page = 10 local readerui setup(function() + DocSettings:purgeDocSettings(sample_epub) readerui = ReaderUI:new{ document = DocumentRegistry:openDocument(sample_epub), } @@ -120,6 +122,7 @@ describe("ReaderBookmark module #ok", function() describe("bookmark for PDF document", function() local readerui setup(function() + DocSettings:purgeDocSettings(sample_pdf) readerui = ReaderUI:new{ document = DocumentRegistry:openDocument(sample_pdf), }