diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/ctest.lua | 6 | ||||
| -rwxr-xr-x | test/fread.lua | 20 | ||||
| -rwxr-xr-x | test/fwrite.lua | 20 | ||||
| -rwxr-xr-x | test/httptest.lua | 10 | ||||
| -rwxr-xr-x | test/multiplexing.lua | 16 | ||||
| -rwxr-xr-x | test/stest.lua | 6 |
6 files changed, 33 insertions, 45 deletions
diff --git a/test/ctest.lua b/test/ctest.lua index c62a57a..e33b372 100755 --- a/test/ctest.lua +++ b/test/ctest.lua @@ -19,10 +19,10 @@ print('Entered ' .. arg[0]) -local utils = require 'lem.utils' -local streams = require 'lem.streams' +local utils = require 'lem.utils' +local io = require 'lem.io' -local iconn, oconn = assert(streams.tcp_connect('127.0.0.1', arg[1] or 8080)) +local iconn, oconn = assert(io.tcp_connect('127.0.0.1', arg[1] or 8080)) for i = 1, 10 do assert(oconn:write('ping\n')) diff --git a/test/fread.lua b/test/fread.lua index 56309d8..8267bdd 100755 --- a/test/fread.lua +++ b/test/fread.lua @@ -17,25 +17,19 @@ -- along with LEM. If not, see <http://www.gnu.org/licenses/>. -- -local utils = require 'lem.utils' -local stream = require 'lem.streams' +local utils = require 'lem.utils' +local io = require 'lem.io' -local write -do - local stdout = stream.stdout - function write(str) - return stdout:write(str) - end -end +local write = io.write print("Press enter to read '" .. (arg[1] or arg[0]) .. "'") -stream.stdin:read() +io.stdin:read() local threads = 2 for i = 1, threads do utils.spawn(function() - local file = assert(stream.open(arg[1] or arg[0])) - assert(getmetatable(file) == stream.File, "Hmm...") + local file = assert(io.open(arg[1] or arg[0])) + assert(getmetatable(file) == io.File, "Hmm...") ---[[ local chunk, err @@ -67,6 +61,6 @@ while threads > 0 do end print "\nDone. Press enter to continue." -stream.stdin:read() +io.stdin:read() -- vim: set ts=2 sw=2 noet: diff --git a/test/fwrite.lua b/test/fwrite.lua index f4e8856..d76485f 100755 --- a/test/fwrite.lua +++ b/test/fwrite.lua @@ -17,25 +17,19 @@ -- along with LEM. If not, see <http://www.gnu.org/licenses/>. -- -local utils = require 'lem.utils' -local stream = require 'lem.streams' +local utils = require 'lem.utils' +local io = require 'lem.io' -local write -do - local stdout = stream.stdout - function write(str) - return stdout:write(str) - end -end +local write = io.write print("Press enter to read '" .. (arg[1] or arg[0]) .. "'") -stream.stdin:read() +io.stdin:read() local threads = 2 for i = 1, threads do utils.spawn(function(n) - local file = assert(stream.open('file' .. tostring(n) .. '.txt', 'w')) - assert(getmetatable(file) == stream.File, "Hmm...") + local file = assert(io.open('file' .. tostring(n) .. '.txt', 'w')) + assert(getmetatable(file) == io.File, "Hmm...") print(tostring(n) .. '-1') assert(file:write('Hej!\n')) @@ -60,6 +54,6 @@ while threads > 0 do end print "\nDone. Press enter to continue." -stream.stdin:read() +io.stdin:read() -- vim: set ts=2 sw=2 noet: diff --git a/test/httptest.lua b/test/httptest.lua index 7bc3b93..85d21d1 100755 --- a/test/httptest.lua +++ b/test/httptest.lua @@ -17,9 +17,9 @@ -- along with LEM. If not, see <http://www.gnu.org/licenses/>. -- -local utils = require 'lem.utils' -local streams = require 'lem.streams' -local http = require 'lem.http' +local utils = require 'lem.utils' +local io = require 'lem.io' +local http = require 'lem.http' local format = string.format local concat = table.concat @@ -27,8 +27,8 @@ local concat = table.concat local done = false utils.spawn(function() - --local istream, ostream = assert(streams.tcp_connect('www.google.dk', 80)) - local istream, ostream = assert(streams.tcp_connect('127.0.0.1', 8080)) + --local istream, ostream = assert(io.tcp_connect('www.google.dk', 80)) + local istream, ostream = assert(io.tcp_connect('127.0.0.1', 8080)) print('\nConnected.') diff --git a/test/multiplexing.lua b/test/multiplexing.lua index b294767..fc421cb 100755 --- a/test/multiplexing.lua +++ b/test/multiplexing.lua @@ -17,13 +17,13 @@ -- along with LEM. If not, see <http://www.gnu.org/licenses/>. -- -local utils = require 'lem.utils' -local streams = require 'lem.streams' -local queue = require 'lem.streams.queue' +local utils = require 'lem.utils' +local io = require 'lem.io' +local queue = require 'lem.io.queue' local exit = false local ticker = utils.newsleeper() -local stdout = queue.wrap(streams.stdout) +local stdout = queue.wrap(io.stdout) do local format = string.format @@ -51,14 +51,14 @@ end -- type 'mkfifo pipe' to create a named pipe for this script -- and do 'cat > pipe' (in another terminal) to write to it -local pipe = assert(streams.open(arg[1] or 'pipe', 'r')) +local pipe = assert(io.open(arg[1] or 'pipe', 'r')) -- spawn coroutines to read from stdin and the pipe -utils.spawn(poll, streams.stdin, 'stdin') +utils.spawn(poll, io.stdin, 'stdin') utils.spawn(poll, pipe, 'pipe') do - --local out = streams.stderr + --local out = io.stderr local out = stdout local sound @@ -73,7 +73,7 @@ do until exit end -streams.stdin:close() +io.stdin:close() pipe:close() -- vim: syntax=lua ts=2 sw=2 noet: diff --git a/test/stest.lua b/test/stest.lua index ab432d1..b791bc8 100755 --- a/test/stest.lua +++ b/test/stest.lua @@ -19,10 +19,10 @@ print('Entered ' .. arg[0]) -local utils = require 'lem.utils' -local streams = require 'lem.streams' +local utils = require 'lem.utils' +local io = require 'lem.io' -local server = assert(streams.tcp4_listen('*', arg[1] or 8080)) +local server = assert(io.tcp4_listen('*', arg[1] or 8080)) --timer(10, function() exit(0) end) utils.spawn(function() |