From f25335d3966e37d644a09c7d8bbe12720baa54ef Mon Sep 17 00:00:00 2001
From: Sulverus <sulverus@gmail.com>
Date: Fri, 22 May 2015 19:55:47 +0300
Subject: [PATCH] triggers tests updated

---
 test/box/bad_trigger.result  |  5 ++--
 test/box/bad_trigger.test.py |  2 +-
 test/box/on_replace.result   | 23 +++++++++++-------
 test/box/on_replace.test.lua |  8 ++++---
 test/box/session.result      | 46 ++++++++++++++++--------------------
 test/box/session.test.lua    | 20 ++++++++--------
 6 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/test/box/bad_trigger.result b/test/box/bad_trigger.result
index 998e13440c..f31568c9bc 100644
--- a/test/box/bad_trigger.result
+++ b/test/box/bad_trigger.result
@@ -6,9 +6,9 @@
 function f1() nosuchfunction() end
 ---
 ...
-box.session.on_connect(f1)
+type(box.session.on_connect(f1))
 ---
-- 1
+- function
 ...
 greeting:  True
 fixheader:  True
@@ -17,5 +17,4 @@ error message:  [string "function f1() nosuchfunction() end"]:1: attempt to call
 eof: True
 box.session.on_connect(nil, f1)
 ---
-- 0
 ...
diff --git a/test/box/bad_trigger.test.py b/test/box/bad_trigger.test.py
index b7337cdf61..5c8d0e1e15 100644
--- a/test/box/bad_trigger.test.py
+++ b/test/box/bad_trigger.test.py
@@ -13,7 +13,7 @@ print """
  """
 
 server.admin("function f1() nosuchfunction() end")
-server.admin("box.session.on_connect(f1)")
+server.admin("type(box.session.on_connect(f1))")
 
 unpacker = msgpack.Unpacker(use_list = False)
 
diff --git a/test/box/on_replace.result b/test/box/on_replace.result
index 2b4348fd71..8b7b5d3331 100644
--- a/test/box/on_replace.result
+++ b/test/box/on_replace.result
@@ -14,7 +14,7 @@ ts.on_replace()
 ...
 ts:on_replace()
 ---
-- 0
+- []
 ...
 ts:on_replace(123)
 ---
@@ -23,9 +23,9 @@ ts:on_replace(123)
 function fail(old_tuple, new_tuple) error('test') end
 ---
 ...
-ts:on_replace(fail)
+type(ts:on_replace(fail))
 ---
-- 1
+- function
 ...
 ts:insert{1, 'b', 'c'}
 ---
@@ -36,7 +36,6 @@ ts:get{1}
 ...
 ts:on_replace(nil, fail)
 ---
-- 0
 ...
 ts:insert{1, 'b', 'c'}
 ---
@@ -49,9 +48,9 @@ ts:get{1}
 function fail(old_tuple, new_tuple) error('abc') end
 ---
 ...
-ts:on_replace(fail)
+type(ts:on_replace(fail))
 ---
-- 1
+- function
 ...
 ts:insert{2, 'b', 'c'}
 ---
@@ -63,9 +62,9 @@ ts:get{2}
 function save_out(told, tnew) o = told n = tnew end
 ---
 ...
-ts:on_replace(save_out, fail)
+type(ts:on_replace(save_out, fail))
 ---
-- 1
+- function
 ...
 ts:insert{2, 'a', 'b', 'c'}
 ---
@@ -91,6 +90,14 @@ n
 ---
 - [2, 'd', 'e', 'f']
 ...
+type(ts:on_replace(function() test = 1 end))
+---
+- function
+...
+#ts:on_replace()
+---
+- 2
+...
 ts:drop()
 ---
 ...
diff --git a/test/box/on_replace.test.lua b/test/box/on_replace.test.lua
index 2ec3138c2d..c67c869287 100644
--- a/test/box/on_replace.test.lua
+++ b/test/box/on_replace.test.lua
@@ -7,7 +7,7 @@ ts:on_replace()
 ts:on_replace(123)
 
 function fail(old_tuple, new_tuple) error('test') end
-ts:on_replace(fail)
+type(ts:on_replace(fail))
 
 ts:insert{1, 'b', 'c'}
 ts:get{1}
@@ -18,13 +18,13 @@ ts:insert{1, 'b', 'c'}
 ts:get{1}
 
 function fail(old_tuple, new_tuple) error('abc') end
-ts:on_replace(fail)
+type(ts:on_replace(fail))
 
 ts:insert{2, 'b', 'c'}
 ts:get{2}
 
 function save_out(told, tnew) o = told n = tnew end
-ts:on_replace(save_out, fail)
+type(ts:on_replace(save_out, fail))
 
 ts:insert{2, 'a', 'b', 'c'}
 o
@@ -34,4 +34,6 @@ ts:replace{2, 'd', 'e', 'f'}
 o
 n
 
+type(ts:on_replace(function() test = 1 end))
+#ts:on_replace()
 ts:drop()
diff --git a/test/box/session.result b/test/box/session.result
index 144f164dad..edffc0a900 100644
--- a/test/box/session.result
+++ b/test/box/session.result
@@ -53,34 +53,34 @@ session.peer() == session.peer(session.id())
 function noop() end
 ---
 ...
-session.on_connect(noop)
+type(session.on_connect(noop))
 ---
-- 1
+- function
 ...
-session.on_disconnect(noop)
+type(session.on_disconnect(noop))
 ---
-- 1
+- function
 ...
 -- check it's possible to reset these triggers
 function fail() error('hear') end
 ---
 ...
-session.on_connect(fail, noop)
+type(session.on_connect(fail, noop))
 ---
-- 1
+- function
 ...
-session.on_disconnect(fail, noop)
+type(session.on_disconnect(fail, noop))
 ---
-- 1
+- function
 ...
 -- check on_connect/on_disconnect argument count and type
-session.on_connect()
+type(session.on_connect())
 ---
-- 1
+- table
 ...
-session.on_disconnect()
+type(session.on_disconnect())
 ---
-- 1
+- table
 ...
 session.on_connect(function() end, function() end)
 ---
@@ -109,11 +109,9 @@ session.on_disconnect(1)
 -- use of nil to clear the trigger
 session.on_connect(nil, fail)
 ---
-- 0
 ...
 session.on_disconnect(nil, fail)
 ---
-- 0
 ...
 -- check how connect/disconnect triggers work
 function inc() active_connections = active_connections + 1 end
@@ -125,13 +123,13 @@ function dec() active_connections = active_connections - 1 end
 net = { box = require('net.box') }
 ---
 ...
-session.on_connect(inc)
+type(session.on_connect(inc))
 ---
-- 1
+- function
 ...
-session.on_disconnect(dec)
+type(session.on_disconnect(dec))
 ---
-- 1
+- function
 ...
 active_connections = 0
 ---
@@ -174,11 +172,9 @@ active_connections
 ...
 session.on_connect(nil, inc)
 ---
-- 0
 ...
 session.on_disconnect(nil, dec)
 ---
-- 0
 ...
 -- write audit trail of connect/disconnect into a space
 function audit_connect() box.space['tweedledum']:insert{session.id()} end
@@ -187,13 +183,13 @@ function audit_connect() box.space['tweedledum']:insert{session.id()} end
 function audit_disconnect() box.space['tweedledum']:delete{session.id()} end
 ---
 ...
-session.on_connect(audit_connect)
+type(session.on_connect(audit_connect))
 ---
-- 1
+- function
 ...
-session.on_disconnect(audit_disconnect)
+type(session.on_disconnect(audit_disconnect))
 ---
-- 1
+- function
 ...
 box.schema.user.grant('guest', 'read,write,execute', 'universe')
 ---
@@ -215,11 +211,9 @@ a:close()
 -- cleanup
 session.on_connect(nil, audit_connect)
 ---
-- 0
 ...
 session.on_disconnect(nil, audit_disconnect)
 ---
-- 0
 ...
 active_connections
 ---
diff --git a/test/box/session.test.lua b/test/box/session.test.lua
index 56e5a0c350..fe68b7edc8 100644
--- a/test/box/session.test.lua
+++ b/test/box/session.test.lua
@@ -19,17 +19,17 @@ session.peer() == session.peer(session.id())
 
 -- check on_connect/on_disconnect triggers
 function noop() end
-session.on_connect(noop)
-session.on_disconnect(noop)
+type(session.on_connect(noop))
+type(session.on_disconnect(noop))
 
 -- check it's possible to reset these triggers
 function fail() error('hear') end
-session.on_connect(fail, noop)
-session.on_disconnect(fail, noop)
+type(session.on_connect(fail, noop))
+type(session.on_disconnect(fail, noop))
 
 -- check on_connect/on_disconnect argument count and type
-session.on_connect()
-session.on_disconnect()
+type(session.on_connect())
+type(session.on_disconnect())
 
 session.on_connect(function() end, function() end)
 session.on_disconnect(function() end, function() end)
@@ -48,8 +48,8 @@ session.on_disconnect(nil, fail)
 function inc() active_connections = active_connections + 1 end
 function dec() active_connections = active_connections - 1 end
 net = { box = require('net.box') }
-session.on_connect(inc)
-session.on_disconnect(dec)
+type(session.on_connect(inc))
+type(session.on_disconnect(dec))
 active_connections = 0
 LISTEN = require('uri').parse(box.cfg.listen)
 c = net.box:new(LISTEN.host, LISTEN.service)
@@ -69,8 +69,8 @@ session.on_disconnect(nil, dec)
 -- write audit trail of connect/disconnect into a space
 function audit_connect() box.space['tweedledum']:insert{session.id()} end
 function audit_disconnect() box.space['tweedledum']:delete{session.id()} end
-session.on_connect(audit_connect)
-session.on_disconnect(audit_disconnect)
+type(session.on_connect(audit_connect))
+type(session.on_disconnect(audit_disconnect))
 
 box.schema.user.grant('guest', 'read,write,execute', 'universe')
 a = net.box:new(LISTEN.host, LISTEN.service)
-- 
GitLab