diff options
Diffstat (limited to 'testes')
-rw-r--r-- | testes/coroutine.lua | 2 | ||||
-rw-r--r-- | testes/gc.lua | 8 | ||||
-rw-r--r-- | testes/locals.lua | 4 | ||||
-rw-r--r-- | testes/main.lua | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/testes/coroutine.lua b/testes/coroutine.lua index 73333c14..0a4c2ef3 100644 --- a/testes/coroutine.lua +++ b/testes/coroutine.lua | |||
@@ -184,7 +184,7 @@ do | |||
184 | if not T then | 184 | if not T then |
185 | warn("@on") | 185 | warn("@on") |
186 | else -- test library | 186 | else -- test library |
187 | assert(string.find(_WARN, "200")); _WARN = nil | 187 | assert(string.find(_WARN, "200")); _WARN = false |
188 | warn("@normal") | 188 | warn("@normal") |
189 | end | 189 | end |
190 | assert(st == false and coroutine.status(co) == "dead" and msg == 111) | 190 | assert(st == false and coroutine.status(co) == "dead" and msg == 111) |
diff --git a/testes/gc.lua b/testes/gc.lua index 91915c0b..80850f92 100644 --- a/testes/gc.lua +++ b/testes/gc.lua | |||
@@ -372,7 +372,7 @@ if T then | |||
372 | warn("@on"); warn("@store") | 372 | warn("@on"); warn("@store") |
373 | collectgarbage() | 373 | collectgarbage() |
374 | assert(string.find(_WARN, "error in __gc metamethod")) | 374 | assert(string.find(_WARN, "error in __gc metamethod")) |
375 | assert(string.match(_WARN, "@(.-)@") == "expected"); _WARN = nil | 375 | assert(string.match(_WARN, "@(.-)@") == "expected"); _WARN = false |
376 | for i = 8, 10 do assert(s[i]) end | 376 | for i = 8, 10 do assert(s[i]) end |
377 | 377 | ||
378 | for i = 1, 5 do | 378 | for i = 1, 5 do |
@@ -481,7 +481,7 @@ if T then | |||
481 | u = setmetatable({}, {__gc = function () error "@expected error" end}) | 481 | u = setmetatable({}, {__gc = function () error "@expected error" end}) |
482 | u = nil | 482 | u = nil |
483 | collectgarbage() | 483 | collectgarbage() |
484 | assert(string.find(_WARN, "@expected error")); _WARN = nil | 484 | assert(string.find(_WARN, "@expected error")); _WARN = false |
485 | warn("@normal") | 485 | warn("@normal") |
486 | end | 486 | end |
487 | 487 | ||
@@ -657,14 +657,14 @@ if T then | |||
657 | n = n + 1 | 657 | n = n + 1 |
658 | assert(n == o[1]) | 658 | assert(n == o[1]) |
659 | if n == 1 then | 659 | if n == 1 then |
660 | _WARN = nil | 660 | _WARN = false |
661 | elseif n == 2 then | 661 | elseif n == 2 then |
662 | assert(find(_WARN, "@expected warning")) | 662 | assert(find(_WARN, "@expected warning")) |
663 | lastmsg = _WARN -- get message from previous error (first 'o') | 663 | lastmsg = _WARN -- get message from previous error (first 'o') |
664 | else | 664 | else |
665 | assert(lastmsg == _WARN) -- subsequent error messages are equal | 665 | assert(lastmsg == _WARN) -- subsequent error messages are equal |
666 | end | 666 | end |
667 | warn("@store"); _WARN = nil | 667 | warn("@store"); _WARN = false |
668 | error"@expected warning" | 668 | error"@expected warning" |
669 | end} | 669 | end} |
670 | for i = 10, 1, -1 do | 670 | for i = 10, 1, -1 do |
diff --git a/testes/locals.lua b/testes/locals.lua index 0e5e0c74..f5e96244 100644 --- a/testes/locals.lua +++ b/testes/locals.lua | |||
@@ -337,7 +337,7 @@ local function endwarn () | |||
337 | if not T then | 337 | if not T then |
338 | warn("@on") -- back to normal | 338 | warn("@on") -- back to normal |
339 | else | 339 | else |
340 | assert(_WARN == nil) | 340 | assert(_WARN == false) |
341 | warn("@normal") | 341 | warn("@normal") |
342 | end | 342 | end |
343 | end | 343 | end |
@@ -346,7 +346,7 @@ end | |||
346 | local function checkwarn (msg) | 346 | local function checkwarn (msg) |
347 | if T then | 347 | if T then |
348 | assert(string.find(_WARN, msg)) | 348 | assert(string.find(_WARN, msg)) |
349 | _WARN = nil -- reset variable to check next warning | 349 | _WARN = false -- reset variable to check next warning |
350 | end | 350 | end |
351 | end | 351 | end |
352 | 352 | ||
diff --git a/testes/main.lua b/testes/main.lua index de14a088..d2d602de 100644 --- a/testes/main.lua +++ b/testes/main.lua | |||
@@ -393,12 +393,12 @@ if T then -- test library? | |||
393 | -- testing 'warn' | 393 | -- testing 'warn' |
394 | warn("@store") | 394 | warn("@store") |
395 | warn("@123", "456", "789") | 395 | warn("@123", "456", "789") |
396 | assert(_WARN == "@123456789"); _WARN = nil | 396 | assert(_WARN == "@123456789"); _WARN = false |
397 | 397 | ||
398 | warn("zip", "", " ", "zap") | 398 | warn("zip", "", " ", "zap") |
399 | assert(_WARN == "zip zap"); _WARN = nil | 399 | assert(_WARN == "zip zap"); _WARN = false |
400 | warn("ZIP", "", " ", "ZAP") | 400 | warn("ZIP", "", " ", "ZAP") |
401 | assert(_WARN == "ZIP ZAP"); _WARN = nil | 401 | assert(_WARN == "ZIP ZAP"); _WARN = false |
402 | warn("@normal") | 402 | warn("@normal") |
403 | end | 403 | end |
404 | 404 | ||