Merge pull request #1781 from psychon/fullscreen_test

Some changes to fullscreen tests

tests/_client.lua

@@ -16,6 +16,9 @@ local function open_window(class, title, options)
         default_height = 100,
         title          = title
     }
+    if options.gravity then
+        window:set_gravity(tonumber(options.gravity))
+    end
     if options.snid and options.snid ~= "" then
         window:set_startup_id(options.snid)
     end
@@ -106,7 +109,8 @@ local function get_snid(sn_rules, callback)
     return snid
 end
 
-return function(class, title, sn_rules, callback, resize_increment)
+return function(class, title, sn_rules, callback, resize_increment, args)
+    args  = args or {}
     class = class or "test_app"
     title = title or "Awesome test client"
 
@@ -120,6 +124,10 @@ return function(class, title, sn_rules, callback, resize_increment)
     if resize_increment then
         options = options .. "resize_increment,"
     end
+    if args.gravity then
+        assert(type(args.gravity)=="number","Use `lgi.Gdk.Gravity.NORTH_WEST`")
+        options = options .. "gravity=" .. args.gravity .. ","
+    end
     local data = class .. "\n" .. title .. "\n" .. options .. "\n"
     local success, msg = pipe:write_all(data)
     assert(success, tostring(msg))

tests/test-maximize.lua

@@ -2,13 +2,20 @@
 
 local runner = require("_runner")
 local awful = require("awful")
+local test_client = require("_client")
+local lgi = require("lgi")
+
+local function geo_to_str(g)
+    return "pos=" .. g.x .. "," .. g.y ..
+        ";size=" .. g.width .. "x" .. g.height
+end
 
 local original_geo = nil
 
 local steps = {
     function(count)
         if count == 1 then
-            awful.spawn("xterm")
+            test_client(nil,nil,nil,nil,nil,{gravity=lgi.Gdk.Gravity.NORTH_WEST})
         else
             local c = client.get()[1]
             if c then
@@ -66,9 +73,8 @@ local steps = {
 
         local new_geo = c:geometry()
 
-        for k,v in pairs(original_geo) do
-            assert(new_geo[k] == v)
-        end
+        assert(geo_to_str(original_geo) == geo_to_str(new_geo),
+            geo_to_str(original_geo) .. " == " .. geo_to_str(new_geo))
 
         c.fullscreen = true
 
@@ -97,9 +103,8 @@ local steps = {
 
         local new_geo = c:geometry()
 
-        for k,v in pairs(original_geo) do
-            assert(new_geo[k] == v)
-        end
+        assert(geo_to_str(original_geo) == geo_to_str(new_geo),
+            geo_to_str(original_geo) .. " == " .. geo_to_str(new_geo))
 
         c.floating  = true
 
@@ -134,9 +139,8 @@ local steps = {
 
         local new_geo = c:geometry()
 
-        for k,v in pairs(original_geo) do
-            assert(new_geo[k] == v)
-        end
+        assert(geo_to_str(original_geo) == geo_to_str(new_geo),
+            geo_to_str(original_geo) .. " == " .. geo_to_str(new_geo))
 
         return true
     end