tests: Test the notification presets.

Make sure they behave the same in legacy and ruled modes.

tests/test-naughty-preset.lua

@@ -0,0 +1,85 @@
+local naughty = require("naughty")
+local notification = require("naughty.notification")
+require("ruled.notification"):_clear()
+
+local steps = {}
+
+local BAD_IDEA = "never do this in practice, compat only"
+
+local notif = setmetatable({}, {__mode="v"})
+
+screen[1]:split()
+
+for _, legacy_preset in ipairs {true, false} do
+    table.insert(steps, function()
+        -- This will either take the legacy preset path
+        -- or the ruled preset path.
+        function naughty.get__has_preset_handler()
+            return legacy_preset
+        end
+
+        local custom_preset = {
+            bg   = "#00ff00",
+            fg   = "#ff0000",
+            text = BAD_IDEA
+        }
+
+        notif[1] = notification {
+            preset = custom_preset,
+        }
+
+        assert(notif[1].bg == "#00ff00")
+        assert(notif[1].message == BAD_IDEA)
+
+        return true
+    end)
+
+    table.insert(steps, function()
+        notif[1]:destroy()
+
+        return true
+    end)
+
+    for s in screen do
+        -- Make sure the screen doesn't cause a memory leak.
+        table.insert(steps, function()
+            collectgarbage("collect")
+
+            if notif[1] then return end
+
+            local custom_preset = {
+                bg = "#0000ff",
+                fg = "#ff0000",
+                screen = s
+            }
+
+            notif[1] = notification {
+                preset = custom_preset,
+                title = "test",
+            }
+
+            assert(notif[1].bg == "#0000ff")
+
+            assert(notif[1].screen == s)
+
+            return true
+        end)
+
+        table.insert(steps, function()
+            assert(notif[1].screen == s)
+            notif[1]:destroy()
+
+            return true
+        end)
+
+        table.insert(steps, function()
+            collectgarbage("collect")
+
+            if notif[1] then return end
+
+            return true
+        end)
+    end
+end
+
+require("_runner").run_steps(steps)

tests/test-naughty-screen.lua

@@ -71,90 +71,97 @@ local function check_screen(s)
     end
 end
 
--- Create notifications in each position.
+for _, legacy_preset in ipairs {true, false} do
-table.insert(steps, function()
-    rnotif._clear()
-    add_many(s1)
 
-    return true
+    -- Create notifications in each position.
-end)
+    table.insert(steps, function()
-
+        function naughty.get__has_preset_handler()
--- Make sure removing notification works.
+            return legacy_preset
-table.insert(steps, function()
-
-    remove_at(s1, 2)
-
-    -- Split the screen
-    s1:split()
-
-    s2 = screen[2]
-    assert(s1 ~= s2)
-
-    return true
-end)
-
--- Make sure the notification moved as the screen shrunk.
-table.insert(steps, function()
-    check_screen(s1)
-
-    -- Make sure we can still remove them without errors.
-    remove_at(s1, 2)
-
-    -- Add more!
-    add_many(s2)
-
-    -- Make sure none got moved to the wrong position due to a fallback code
-    -- path triggered by accident. The first few iteration were prone to this.
-    check_screen(s1)
-    check_screen(s2)
-
-    return true
-end)
-
--- Remove everything and see what happens.
-table.insert(steps, function()
-
-    for _=1, 3 do
-        for _, s in ipairs {s1,s2} do
-            remove_at(s, 1)
         end
-    end
 
-    for _=1, 2 do
+        rnotif._clear()
-        remove_at(s2, 1)
+        add_many(s1)
-    end
 
-    -- And add them again.
+        return true
-    add_many(s1)
+    end)
-    add_many(s2)
 
-    return true
+    -- Make sure removing notification works.
-end)
+    table.insert(steps, function()
 
---local weak = nil --FIXME
+        remove_at(s1, 2)
 
--- Delete a screen and make sure it gets GCed.
+        -- Split the screen
-table.insert(steps, function()
+        s1:split()
-    s2:fake_remove()
 
-    -- Help the weak tables a little.
+        s2 = screen[2]
-    for _, pos in ipairs(positions) do
+        assert(s1 ~= s2)
-        objs[pos][s1] = nil
-    end
 
-    -- Drop our string reference to s2.
+        return true
-    --weak, s2 = setmetatable({s2}, {__mode="v"}), nil --FIXME
+    end)
 
-    return true
+    -- Make sure the notification moved as the screen shrunk.
-end)
+    table.insert(steps, function()
+        check_screen(s1)
 
---FIXME
+        -- Make sure we can still remove them without errors.
---table.insert(steps, function()
+        remove_at(s1, 2)
---    if weak[1] == nil then return true end
+
---
+        -- Add more!
---    for _=1, 10 do
+        add_many(s2)
---        collectgarbage("collect")
+
---    end
+        -- Make sure none got moved to the wrong position due to a fallback code
---end)
+        -- path triggered by accident. The first few iteration were prone to this.
+        check_screen(s1)
+        check_screen(s2)
+
+        return true
+    end)
+
+    -- Remove everything and see what happens.
+    table.insert(steps, function()
+
+        for _=1, 3 do
+            for _, s in ipairs {s1,s2} do
+                remove_at(s, 1)
+            end
+        end
+
+        for _=1, 2 do
+            remove_at(s2, 1)
+        end
+
+        -- And add them again.
+        add_many(s1)
+        add_many(s2)
+
+        return true
+    end)
+
+    local weak = nil
+
+    -- Delete a screen and make sure it gets GCed.
+    table.insert(steps, function()
+        s2:fake_remove()
+
+        -- Help the weak tables a little.
+        for _, pos in ipairs(positions) do
+            objs[pos][s1] = nil
+        end
+
+        -- Drop our string reference to s2.
+        weak, s2 = setmetatable({s2}, {__mode="v"}), nil
+
+        return true
+    end)
+
+    table.insert(steps, function()
+        if weak[1] == nil then return true end
+
+        for _=1, 10 do
+            collectgarbage("collect")
+        end
+    end)
+
+end
 
 require("_runner").run_steps(steps)