Skip to content

Commit

Permalink
update :isOS function
Browse files Browse the repository at this point in the history
  • Loading branch information
ellraiser committed Mar 20, 2024
1 parent 0891ba2 commit afd31b8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
15 changes: 6 additions & 9 deletions classes/TestMethod.lua
Original file line number Diff line number Diff line change
Expand Up @@ -376,17 +376,14 @@ TestMethod = {

-- @method - TestMethod:isOS()
-- @desc - checks for a specific OS (or list of OSs)
-- @param {string||table} - single OS string or list of OSs that are allowed,
-- these will be checked agaisnt love.system.getOS()'s return value
-- @param {string/s} - each arg passed will be checked as a valid OS, as long
-- as one passed the function will return true
-- @return {boolean} - returns true if one of the OSs given matches actual OS
isOS = function(self, oss)
if type(oss) == 'table' then
for o=1,#oss do
if oss[o] == love.test.current_os then return true end
end
else
return love.test.current_os == oss
isOS = function(self, ...)
for os=1,select("#", ...) do
if select(os, ...) == love.test.current_os then return true end
end
return false
end,

-- @method - TestMethod:evaluateTest()
Expand Down
2 changes: 1 addition & 1 deletion classes/TestSuite.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ TestSuite = {
delayed = nil,
fakequit = false,
windowmode = true,
current_os = love.system.getOS(),
current_os = love._os,

-- love modules to test
audio = {},
Expand Down
2 changes: 1 addition & 1 deletion tests/graphics.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1467,7 +1467,7 @@ love.test.graphics.captureScreenshot = function(test)
TextCommand = prevtextcommand
test:assertNotNil(cbdata)

if test:isOS({'iOS', 'Android'}) then
if test:isOS('iOS', 'Android') then
-- Mobile operating systems don't let us control the window resolution,
-- so we can't compare the reference image properly.
test:assertTrue(true, 'skip test')
Expand Down

0 comments on commit afd31b8

Please sign in to comment.