mirror of
https://github.com/britzl/monarch.git
synced 2025-09-27 18:12:22 +02:00
Cleaned up callback tests
Fixes #
This commit is contained in:
12
test/msg.lua
12
test/msg.lua
@@ -64,5 +64,17 @@ function M.last(url)
|
||||
return messages[#messages]
|
||||
end
|
||||
|
||||
function M.filter(url, fn)
|
||||
local t = {}
|
||||
local messages = M.messages(url)
|
||||
for i=1,#messages do
|
||||
local message = messages[i]
|
||||
if fn(message) then
|
||||
t[#t + 1] = message
|
||||
end
|
||||
end
|
||||
return t
|
||||
end
|
||||
|
||||
|
||||
return M
|
@@ -418,43 +418,37 @@ return function()
|
||||
|
||||
monarch.show(SCREEN1)
|
||||
assert(wait_until_not_busy())
|
||||
assert(mock_msg.messages(URL1)[1].message_id == monarch.SCREEN_TRANSITION_IN_STARTED)
|
||||
assert(mock_msg.messages(URL1)[1].message.screen == SCREEN1)
|
||||
assert(mock_msg.messages(URL2)[1].message_id == monarch.SCREEN_TRANSITION_IN_STARTED)
|
||||
assert(mock_msg.messages(URL2)[1].message.screen == SCREEN1)
|
||||
assert(mock_msg.messages(URL1)[2].message_id == monarch.SCREEN_TRANSITION_IN_FINISHED)
|
||||
assert(mock_msg.messages(URL1)[2].message.screen == SCREEN1)
|
||||
assert(mock_msg.messages(URL2)[2].message_id == monarch.SCREEN_TRANSITION_IN_FINISHED)
|
||||
assert(mock_msg.messages(URL2)[2].message.screen == SCREEN1)
|
||||
|
||||
monarch.remove_listener(URL2)
|
||||
monarch.show(SCREEN2)
|
||||
assert(wait_until_not_busy())
|
||||
|
||||
assert(#mock_msg.messages(URL1) == 6)
|
||||
assert(#mock_msg.messages(URL2) == 2)
|
||||
assert(mock_msg.messages(URL1)[3].message_id == monarch.SCREEN_TRANSITION_IN_STARTED)
|
||||
assert(mock_msg.messages(URL1)[3].message.screen == SCREEN2)
|
||||
assert(mock_msg.messages(URL1)[4].message_id == monarch.SCREEN_TRANSITION_OUT_STARTED)
|
||||
assert(mock_msg.messages(URL1)[4].message.screen == SCREEN1)
|
||||
assert(mock_msg.messages(URL1)[5].message_id == monarch.SCREEN_TRANSITION_IN_FINISHED)
|
||||
assert(mock_msg.messages(URL1)[5].message.screen == SCREEN2)
|
||||
assert(mock_msg.messages(URL1)[6].message_id == monarch.SCREEN_TRANSITION_OUT_FINISHED)
|
||||
assert(mock_msg.messages(URL1)[6].message.screen == SCREEN1)
|
||||
|
||||
monarch.back()
|
||||
assert(wait_until_not_busy())
|
||||
|
||||
assert(#mock_msg.messages(URL1) == 10)
|
||||
assert(#mock_msg.messages(URL2) == 2)
|
||||
assert(mock_msg.messages(URL1)[7].message_id == monarch.SCREEN_TRANSITION_IN_STARTED)
|
||||
assert(mock_msg.messages(URL1)[7].message.screen == SCREEN1)
|
||||
assert(mock_msg.messages(URL1)[8].message_id == monarch.SCREEN_TRANSITION_OUT_STARTED)
|
||||
assert(mock_msg.messages(URL1)[8].message.screen == SCREEN2)
|
||||
assert(mock_msg.messages(URL1)[9].message_id == monarch.SCREEN_TRANSITION_IN_FINISHED)
|
||||
assert(mock_msg.messages(URL1)[9].message.screen == SCREEN1)
|
||||
assert(mock_msg.messages(URL1)[10].message_id == monarch.SCREEN_TRANSITION_OUT_FINISHED)
|
||||
assert(mock_msg.messages(URL1)[10].message.screen == SCREEN2)
|
||||
local messages = mock_msg.filter(URL1, function(m)
|
||||
return m.message.screen == SCREEN1
|
||||
end)
|
||||
assert(messages[1].message_id == monarch.SCREEN_TRANSITION_IN_STARTED)
|
||||
assert(messages[2].message_id == monarch.SCREEN_TRANSITION_IN_FINISHED)
|
||||
assert(messages[3].message_id == monarch.SCREEN_TRANSITION_OUT_STARTED)
|
||||
assert(messages[4].message_id == monarch.SCREEN_TRANSITION_OUT_FINISHED)
|
||||
assert(messages[5].message_id == monarch.SCREEN_TRANSITION_IN_STARTED)
|
||||
assert(messages[6].message_id == monarch.SCREEN_TRANSITION_IN_FINISHED)
|
||||
|
||||
messages = mock_msg.filter(URL2, function(m)
|
||||
return m.message.screen == SCREEN1
|
||||
end)
|
||||
assert(messages[1].message_id == monarch.SCREEN_TRANSITION_IN_STARTED)
|
||||
assert(messages[2].message_id == monarch.SCREEN_TRANSITION_IN_FINISHED)
|
||||
|
||||
messages = mock_msg.filter(URL1, function(m)
|
||||
return m.message.screen == SCREEN2
|
||||
end)
|
||||
assert(messages[1].message_id == monarch.SCREEN_TRANSITION_IN_STARTED)
|
||||
assert(messages[2].message_id == monarch.SCREEN_TRANSITION_IN_FINISHED)
|
||||
assert(messages[3].message_id == monarch.SCREEN_TRANSITION_OUT_STARTED)
|
||||
assert(messages[4].message_id == monarch.SCREEN_TRANSITION_OUT_FINISHED)
|
||||
end)
|
||||
|
||||
it("should be able to show a screen even while it is preloading", function()
|
||||
|
Reference in New Issue
Block a user