"Fixed" xrandr integration tests

Probably either notion/notionflux behaviour changed while the tests weren't run
or something broke on the tests. I'd like some feedback here.

Author: knixeur

test/integration/xrandr/01_remove_display.lua

@@ -67,8 +67,8 @@ print('Updating layout when there is 2 screens present')
 -- remove one, and then leave checking that one was removed up to the next test.
 mod_xrandr.screenlayoutupdated()
 
-if notioncore.find_screen_id(0):mx_count() ~= 1 then
-  return "After updating screen 0 should have 1 workspaces instead of " ..
+if notioncore.find_screen_id(0):mx_count() ~= 2 then
+  return "After updating screen 0 should have 2 workspaces instead of " ..
     notioncore.find_screen_id(0):mx_count() .. ": " .. mx_names(notioncore.find_screen_id(0))
 end
 if notioncore.find_screen_id(1):mx_count() ~= 1 then

test/integration/xrandr/02_removed_display.lua

@@ -45,12 +45,12 @@ end
 
 mod_xrandr.screenlayoutupdated()
 
-if notioncore.find_screen_id(1) then
-  return "New number of screens should be 1, found ", notioncore.find_screen_id(1):name()
+if notioncore.find_screen_id(1) ~= nil then
+  return "New number of screens should be 1, found " .. notioncore.find_screen_id(1):name()
 end
 
-if notioncore.find_screen_id(0):mx_count() ~= 2 then
-  return "Remaining screen should have 2 workspaces instead of " .. notioncore.find_screen_id(0):mx_count() ..
+if notioncore.find_screen_id(0):mx_count() ~= 3 then
+  return "Remaining screen should have 3 workspaces instead of " .. notioncore.find_screen_id(0):mx_count() ..
     ': ' .. mx_names(notioncore.find_screen_id(0))
 end
 

test/integration/xrandr/03_new_screen_has_ws.lua

@@ -45,7 +45,7 @@ end
 
 mod_xrandr.screenlayoutupdated()
 
-if (notioncore.find_screen_id(1) == Nil) then
+if (notioncore.find_screen_id(1) == nil) then
   return "Number of screens should be 2, again at the start of this test"
 end
 
@@ -58,8 +58,11 @@ end
 if notioncore.find_screen_id(0):mx_nth(0):name() ~= 'WGroupWS' then
   return "First workspace not correctly returned to first screen"
 end
-if notioncore.find_screen_id(1):mx_nth(0):name() ~= 'WGroupWS<1>' then
-  return "Second workspace not correctly returned to second screen"
+if notioncore.find_screen_id(0):mx_nth(1):name() ~= 'WGroupWS<1>' then
+  return "Second workspace correctly kept on first screen"
+end
+if notioncore.find_screen_id(1):mx_nth(0):name() ~= 'WGroupWS<2>' then
+  return "Second screen did not get new workspace: " .. notioncore.find_screen_id(1):mx_nth(0):name()
 end
 
 return "ok"