fix test

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]

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

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()

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()

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)
 

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)
 

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()

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)

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()

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")

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")

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")

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")

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")