test(frames): Update tests for new frame APIs

Author: alerque

core/frameparser.lua

@@ -28,7 +28,7 @@ SILE._frameParserBits = {
    relation = relation,
 }
 
-return P{
+local frameparser = P{
    "additive",
    additive = V"plus" + V"minus" + V"multiplicative",
    multiplicative = V"times" + V"divide" + V"primary",
@@ -40,3 +40,5 @@ return P{
    braced = ws * P"(" * ws * V"additive" * ws * P")" * ws
 }
 -- stylua: ignore end
+
+return frameparser

core/utilities/init_spec.lua

@@ -1,10 +1,9 @@
 SILE = require("core.sile")
 SILE.init()
 
--- Work around not having an active class in this test but needing language modules
-SILE.typesetter = SILE.typesetters.default()
-
 describe("SILE.utilities", function ()
+   require("classes.plain")({})
+
    it("should exist as SU", function ()
       assert.is.truthy(SU)
    end)

core/utilities/numbers_spec.lua

@@ -3,10 +3,9 @@ SILE.init()
 SILE.utilities.error = error
 SILE.utilities.warn = function () end
 
--- Work around not having an active class in this test but needing language modules
-SILE.typesetter = SILE.typesetters.default()
-
 describe("SILE.utilities", function ()
+   require("classes.plain")({})
+
    describe("formatNumber", function ()
       local icu = require("justenoughicu")
       local icu73plus = tostring(icu.version()) >= "73.0"

spec/frame_spec.lua

@@ -11,8 +11,9 @@ describe("The frame factory", function ()
 
    describe("Simple", function ()
       local frame = SILE.newFrame({ id = "hello", top = 20, left = 30, bottom = 200, right = 300 })
-      it("should exist", function ()
-         assert.is.truthy(frame)
+      it("should be a frame", function ()
+         local isframe = SILE.types.frame:class_of(frame)
+         assert.is.truthy(isframe)
       end)
       it("should have width", function ()
          assert.is.equal(270, frame:width():tonumber())
@@ -21,8 +22,9 @@ describe("The frame factory", function ()
          assert.is.equal(180, frame:height():tonumber())
       end)
       it("should be registered in the class frames table", function ()
-         assert.is.truthy(SILE.frames["hello"])
-         assert.is.equal(frame, SILE.frames["hello"])
+         local hello = SILE.frames:pull("hello")
+         assert.is.truthy(hello)
+         assert.is.equal(frame, hello)
       end)
    end)
 end)

spec/frameparser_spec.lua

@@ -23,12 +23,9 @@ describe("The frame parser", function ()
 
    describe("function", function () -- also tests identifier
       require("classes.plain")({})
-      SILE.documentState.thisPageTemplate = {
-         frames = {
-            a = SILE.newFrame({ id = "A", top = 20, left = 30, bottom = 200, right = 300 }),
-            bb3 = SILE.newFrame({ id = "B", top = 20, left = 30, bottom = 200, right = 300 }),
-         },
-      }
+      local a = SILE.frames:new({ id = "a", top = 20, left = 30, bottom = 200, right = 300 })
+      local bb3 = SILE.frames:new({ id = "bb3", top = 20, left = 30, bottom = 200, right = 300 })
+
       --it("should match valid functions", function() assert.is.equal(30,r:match("left(a)")) end)
       it("should match valid functions", function ()
          assert.is.truthy(r:match("top(bb3)"))

spec/hyphenator_spec.lua

@@ -3,10 +3,9 @@ SILE = require("core.sile")
 SILE.input.backend = "debug"
 SILE.init()
 
--- Work around not having an active class in this test but needing language modules
-SILE.typesetter = SILE.typesetters.default()
-
 describe("Hyphenation module", function ()
+   require("classes.plain")({})
+
    SILE.call("language", { main = "fr" })
    local hyphenator = SILE.typesetter.language.hyphenator
 

spec/languages_spec.lua

@@ -2,10 +2,9 @@ SILE = require("core.sile")
 SILE.input.backend = "debug"
 SILE.init()
 
--- Work around not having an active class in this test but needing language modules
-SILE.typesetter = SILE.typesetters.default()
-
 describe("Language module", function ()
+   require("classes.plain")({})
+
    it("should set env locale", function ()
       SILE.call("language", { main = "tr" })
       local syslang = os.getenv("LANG")

spec/shaper_spec.lua

@@ -3,6 +3,8 @@ SILE.input.backend = "debug"
 SILE.init()
 
 describe("SILE.shapers.default", function ()
+   require("classes.plain")({})
+
    it("should always have positive stretch and shrink", function ()
       SILE.settings:set("shaper.variablespaces", true)
       SILE.settings:set("shaper.spacestretchfactor", 2)
@@ -14,9 +16,6 @@ describe("SILE.shapers.default", function ()
    end)
 
    describe("measureChar", function ()
-      -- Work around not having an active class in this test but needing language modules
-      SILE.typesetter = SILE.typesetters.default()
-
       SILE.settings:set("font.family", "Libertinus Serif", true)
 
       it("should measure simple characters", function ()