From 4d8da961779e4254314fc9e5f7e63b3da89c5704 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 10 Feb 2019 17:07:50 -0800 Subject: [PATCH] fix test --- frontend/ui/font.lua | 11 +---------- reader.lua | 4 +--- spec/unit/autofrontlight_spec.lua | 2 ++ spec/unit/autosuspend_spec.lua | 1 + spec/unit/background_runner_spec.lua | 2 ++ spec/unit/background_task_plugin_spec.lua | 1 + spec/unit/batterystat_spec.lua | 2 ++ spec/unit/commonrequire.lua | 9 +++++++-- spec/unit/device_spec.lua | 1 + spec/unit/filemanager_spec.lua | 1 + spec/unit/readerfooter_spec.lua | 1 + spec/unit/readerhighlight_spec.lua | 1 + spec/unit/readerlink_spec.lua | 1 + spec/unit/readerview_spec.lua | 1 + 14 files changed, 23 insertions(+), 15 deletions(-) diff --git a/frontend/ui/font.lua b/frontend/ui/font.lua index 62dad4739..38922febe 100644 --- a/frontend/ui/font.lua +++ b/frontend/ui/font.lua @@ -85,17 +85,8 @@ local Font = { -- face table faces = {}, - - -- set by self.setScreen - screen = nil, } ---- Sets the screen object that will be used by font module for font size scaling --- NOTE: this call is required for using KOReader UI framework -function Font:setScreen(screen) - self.screen = screen -end - --- Gets font face object. -- @string font -- @int size optional size @@ -107,7 +98,7 @@ function Font:getFace(font, size) if not size then size = self.sizemap[font] end -- original size before scaling by screen DPI local orig_size = size - size = self.screen:scaleBySize(size) + size = Runtimectl:scaleByRenderSize(size) local hash = font..size local face_obj = self.faces[hash] diff --git a/reader.lua b/reader.lua index 9a4eeb9b8..be70e99f2 100755 --- a/reader.lua +++ b/reader.lua @@ -39,9 +39,6 @@ local Runtimectl = require("runtimectl") local Device = require("device") Runtimectl:init(Device) -local Font = require("ui/font") -Font:setScreen(Device.screen) - if G_reader_settings:has("color_rendering") then Runtimectl:setColorRenderingEnabled(G_reader_settings:isTrue("color_rendering")) else @@ -139,6 +136,7 @@ end -- font local fontmap = G_reader_settings:readSetting("fontmap") if fontmap ~= nil then + local Font = require("ui/font") for k, v in pairs(fontmap) do Font.fontmap[k] = v end diff --git a/spec/unit/autofrontlight_spec.lua b/spec/unit/autofrontlight_spec.lua index 1d6730429..118577f09 100644 --- a/spec/unit/autofrontlight_spec.lua +++ b/spec/unit/autofrontlight_spec.lua @@ -4,6 +4,7 @@ describe("AutoFrontlight widget tests", function() setup(function() require("commonrequire") package.unloadAll() + require("runtimectl"):init(require("device")) MockTime = require("mock_time") MockTime:install() @@ -22,6 +23,7 @@ describe("AutoFrontlight widget tests", function() teardown(function() MockTime:uninstall() package.unloadAll() + require("runtimectl"):init(require("device")) end) before_each(function() diff --git a/spec/unit/autosuspend_spec.lua b/spec/unit/autosuspend_spec.lua index bb1416a4b..7a535c47d 100644 --- a/spec/unit/autosuspend_spec.lua +++ b/spec/unit/autosuspend_spec.lua @@ -2,6 +2,7 @@ describe("AutoSuspend widget tests", function() setup(function() require("commonrequire") package.unloadAll() + require("runtimectl"):init(require("device")) end) before_each(function() diff --git a/spec/unit/background_runner_spec.lua b/spec/unit/background_runner_spec.lua index 0d43cdd35..27a5e2f84 100644 --- a/spec/unit/background_runner_spec.lua +++ b/spec/unit/background_runner_spec.lua @@ -4,6 +4,7 @@ describe("BackgroundRunner widget tests", function() setup(function() require("commonrequire") package.unloadAll() + require("runtimectl"):init(require("device")) -- Device needs to be loaded before UIManager. Device = require("device") Device.input.waitEvent = function() end @@ -18,6 +19,7 @@ describe("BackgroundRunner widget tests", function() teardown(function() MockTime:uninstall() package.unloadAll() + require("runtimectl"):init(require("device")) stopBackgroundRunner() end) diff --git a/spec/unit/background_task_plugin_spec.lua b/spec/unit/background_task_plugin_spec.lua index 0e00a99b0..5bc64243b 100644 --- a/spec/unit/background_task_plugin_spec.lua +++ b/spec/unit/background_task_plugin_spec.lua @@ -15,6 +15,7 @@ describe("BackgroundTaskPlugin", function() teardown(function() MockTime:uninstall() package.unloadAll() + require("runtimectl"):init(require("device")) stopBackgroundRunner() end) diff --git a/spec/unit/batterystat_spec.lua b/spec/unit/batterystat_spec.lua index 8dfcc5563..4740f60f1 100644 --- a/spec/unit/batterystat_spec.lua +++ b/spec/unit/batterystat_spec.lua @@ -8,6 +8,7 @@ describe("BatteryState plugin tests #nocov", function() setup(function() require("commonrequire") package.unloadAll() + require("runtimectl"):init(require("device")) MockTime = require("mock_time") MockTime:install() end) @@ -15,6 +16,7 @@ describe("BatteryState plugin tests #nocov", function() teardown(function() MockTime:uninstall() package.unloadAll() + require("runtimectl"):init(require("device")) end) before_each(function() diff --git a/spec/unit/commonrequire.lua b/spec/unit/commonrequire.lua index 6b21e8dad..bc3e6794f 100644 --- a/spec/unit/commonrequire.lua +++ b/spec/unit/commonrequire.lua @@ -16,12 +16,17 @@ G_reader_settings = require("luasettings"):open(".reader") einkfb = require("ffi/framebuffer") --luacheck: ignore einkfb.dummy = true --luacheck: ignore +local Device = require("device") + +local Runtimectl = require("runtimectl") +Runtimectl:init(Device) + -- init output device -local Screen = require("device").screen +local Screen = Device.screen Screen:init() -- init input device (do not show SDL window) -local Input = require("device").input +local Input = Device.input Input.dummy = true package.unload = function(module) diff --git a/spec/unit/device_spec.lua b/spec/unit/device_spec.lua index c1f169cca..9bf9cb8e0 100644 --- a/spec/unit/device_spec.lua +++ b/spec/unit/device_spec.lua @@ -20,6 +20,7 @@ describe("device module", function() } require("commonrequire") package.unloadAll() + require("runtimectl"):init(require("device")) end) before_each(function() diff --git a/spec/unit/filemanager_spec.lua b/spec/unit/filemanager_spec.lua index 185552053..ff9049350 100644 --- a/spec/unit/filemanager_spec.lua +++ b/spec/unit/filemanager_spec.lua @@ -3,6 +3,7 @@ describe("FileManager module", function() setup(function() require("commonrequire") package.unloadAll() + require("runtimectl"):init(require("device")) FileManager = require("apps/filemanager/filemanager") Screen = require("device").screen UIManager = require("ui/uimanager") diff --git a/spec/unit/readerfooter_spec.lua b/spec/unit/readerfooter_spec.lua index 27717aa70..d05b7c760 100644 --- a/spec/unit/readerfooter_spec.lua +++ b/spec/unit/readerfooter_spec.lua @@ -6,6 +6,7 @@ describe("Readerfooter module", function() setup(function() require("commonrequire") package.unloadAll() + require("runtimectl"):init(require("device")) DocumentRegistry = require("document/documentregistry") DocSettings = require("docsettings") ReaderUI = require("apps/reader/readerui") diff --git a/spec/unit/readerhighlight_spec.lua b/spec/unit/readerhighlight_spec.lua index 941b66de1..09d79cc32 100644 --- a/spec/unit/readerhighlight_spec.lua +++ b/spec/unit/readerhighlight_spec.lua @@ -3,6 +3,7 @@ describe("Readerhighlight module", function() setup(function() require("commonrequire") package.unloadAll() + require("runtimectl"):init(require("device")) DocumentRegistry = require("document/documentregistry") Event = require("ui/event") Geom = require("ui/geometry") diff --git a/spec/unit/readerlink_spec.lua b/spec/unit/readerlink_spec.lua index dfa64ff37..6537df40d 100644 --- a/spec/unit/readerlink_spec.lua +++ b/spec/unit/readerlink_spec.lua @@ -4,6 +4,7 @@ describe("ReaderLink module", function() setup(function() require("commonrequire") package.unloadAll() + require("runtimectl"):init(require("device")) DocumentRegistry = require("document/documentregistry") Event = require("ui/event") ReaderUI = require("apps/reader/readerui") diff --git a/spec/unit/readerview_spec.lua b/spec/unit/readerview_spec.lua index 37f9ce1ab..e29f9ad10 100644 --- a/spec/unit/readerview_spec.lua +++ b/spec/unit/readerview_spec.lua @@ -4,6 +4,7 @@ describe("Readerview module", function() setup(function() require("commonrequire") package.unloadAll() + require("runtimectl"):init(require("device")) DocumentRegistry = require("document/documentregistry") Blitbuffer = require("ffi/blitbuffer") ReaderUI = require("apps/reader/readerui")