Software /
code /
prosody
Changeset
7510:8a0a50e8ef2d
Merge 0.10->trunk
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 21 Jul 2016 12:24:18 +0100 (2016-07-21) |
parents | 7506:8cca24bea3e0 (current diff) 7509:d4bd036e679b (diff) |
children | 7516:f74ff35a4b03 |
files | tests/test.lua |
diffstat | 2 files changed, 62 insertions(+), 55 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test.lua Thu Jul 14 18:57:30 2016 +0200 +++ b/tests/test.lua Thu Jul 21 12:24:18 2016 +0100 @@ -28,6 +28,7 @@ dotest "util.random" dotest "util.xml" dotest "util.xmppstream" + dotest "util.queue" dotest "net.http.parser" dosingletest("test_sasl.lua", "latin1toutf8");
--- a/tests/test_util_queue.lua Thu Jul 14 18:57:30 2016 +0200 +++ b/tests/test_util_queue.lua Thu Jul 21 12:24:18 2016 +0100 @@ -1,68 +1,74 @@ -local new = require "util.queue".new; -local q = new(10); +function new(new) + do + local q = new(10); -assert(q.size == 10); -assert(q:count() == 0); + assert_equal(q.size, 10); + assert_equal(q:count(), 0); -assert(q:push("one")); -assert(q:push("two")); -assert(q:push("three")); + assert_is(q:push("one")); + assert_is(q:push("two")); + assert_is(q:push("three")); -for i = 4, 10 do - print("pushing "..i) - assert(q:push("hello")); - assert(q:count() == i, "count is not "..i.."("..q:count()..")"); -end -assert(q:push("hello") == nil, "queue overfull!"); -assert(q:push("hello") == nil, "queue overfull!"); -assert(q:pop() == "one", "queue item incorrect"); -assert(q:pop() == "two", "queue item incorrect"); -assert(q:push("hello")); -assert(q:push("hello")); -assert(q:pop() == "three", "queue item incorrect"); -assert(q:push("hello")); -assert(q:push("hello") == nil, "queue overfull!"); -assert(q:push("hello") == nil, "queue overfull!"); + for i = 4, 10 do + assert_is(q:push("hello")); + assert_equal(q:count(), i, "count is not "..i.."("..q:count()..")"); + end + assert_equal(q:push("hello"), nil, "queue overfull!"); + assert_equal(q:push("hello"), nil, "queue overfull!"); + assert_equal(q:pop(), "one", "queue item incorrect"); + assert_equal(q:pop(), "two", "queue item incorrect"); + assert_is(q:push("hello")); + assert_is(q:push("hello")); + assert_equal(q:pop(), "three", "queue item incorrect"); + assert_is(q:push("hello")); + assert_equal(q:push("hello"), nil, "queue overfull!"); + assert_equal(q:push("hello"), nil, "queue overfull!"); -assert(q:count() == 10, "queue count incorrect"); + assert_equal(q:count(), 10, "queue count incorrect"); -for i = 1, 10 do - assert(q:pop() == "hello", "queue item incorrect"); -end + for _ = 1, 10 do + assert_equal(q:pop(), "hello", "queue item incorrect"); + end + + assert_equal(q:count(), 0, "queue count incorrect"); -assert(q:count() == 0, "queue count incorrect"); - -assert(q:push(1)); -for i = 1, 1001 do - assert(q:pop() == i); - assert(q:count() == 0); - assert(q:push(i+1)); - assert(q:count() == 1); -end -assert(q:pop() == 1002); -assert(q:push(1)); -for i = 1, 1000000 do - q:pop(); - q:push(i+1); -end + assert_is(q:push(1)); + for i = 1, 1001 do + assert_equal(q:pop(), i); + assert_equal(q:count(), 0); + assert_is(q:push(i+1)); + assert_equal(q:count(), 1); + end + assert_equal(q:pop(), 1002); + assert_is(q:push(1)); + for i = 1, 1000 do + assert_equal(q:pop(), i); + assert_is(q:push(i+1)); + end + assert_equal(q:pop(), 1001); + assert_equal(q:count(), 0); + end --- Test queues that purge old items when pushing to a full queue -local q = new(10, true); + do + -- Test queues that purge old items when pushing to a full queue + local q = new(10, true); -for i = 1, 10 do - q:push(i); -end + for i = 1, 10 do + q:push(i); + end -assert(q:count() == 10); + assert_equal(q:count(), 10); -assert(q:push(11)); -assert(q:count() == 10); -assert(q:pop() == 2); -- First item should have been purged + assert_is(q:push(11)); + assert_equal(q:count(), 10); + assert_equal(q:pop(), 2); -- First item should have been purged -for i = 12, 32 do - assert(q:push(i)); + for i = 12, 32 do + assert_is(q:push(i)); + end + + assert_equal(q:count(), 10); + assert_equal(q:pop(), 23); + end end - -assert(q:count() == 10); -assert(q:pop() == 23);