From b0cfc1a452b8c97d68ad0f8b9985724f5cc5ccee Mon Sep 17 00:00:00 2001 From: hochang <“hochang@ebaysf.com”> Date: Fri, 30 Mar 2012 14:51:19 -0700 Subject: [PATCH 1/4] execute replaces exec --- lib/unit.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/unit.js b/lib/unit.js index 6a0aa7c..f0db030 100644 --- a/lib/unit.js +++ b/lib/unit.js @@ -220,18 +220,20 @@ exports.init = function (opt) { udf.setup(function (ctx) { var listener = new Listener(getEngine()); if (aMeta.script) { - getEngine().exec(aMeta.script, function (err, result) { - listener.assert(test); - try { - udf.test(test, err, result, ctx); - } - catch (e) { - test.ok(false, 'Got Exception in tester: ' + util.inspect(e, false, null)); - } - udf.tearDown(function () { - test.done(); - cb(); - }, ctx); + getEngine().execute(aMeta.script, function(emitter) { + emitter.on('end', function (err, result) { + listener.assert(test); + try { + udf.test(test, err, result, ctx); + } + catch (e) { + test.ok(false, 'Got Exception in tester: ' + util.inspect(e, false, null)); + } + udf.tearDown(function () { + test.done(); + cb(); + }, ctx); + }); }); } else if (aMeta.request) { From 2602cce036d793f2f6518bcb5e657faa896fafbd Mon Sep 17 00:00:00 2001 From: hochang <“hochang@ebaysf.com”> Date: Fri, 30 Mar 2012 17:04:22 -0700 Subject: [PATCH 2/4] context place holder added --- lib/unit.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/unit.js b/lib/unit.js index f0db030..11197a8 100644 --- a/lib/unit.js +++ b/lib/unit.js @@ -220,7 +220,7 @@ exports.init = function (opt) { udf.setup(function (ctx) { var listener = new Listener(getEngine()); if (aMeta.script) { - getEngine().execute(aMeta.script, function(emitter) { + getEngine().execute(aMeta.script, {}, function(emitter) { emitter.on('end', function (err, result) { listener.assert(test); try { @@ -235,8 +235,7 @@ exports.init = function (opt) { }, ctx); }); }); - } - else if (aMeta.request) { + }else if (aMeta.request) { getConsole().app.listen(port, function () { var options = { host:'localhost', From 74a0166f9d3e7c2ec29c6d7cd4577dc2a8d0741b Mon Sep 17 00:00:00 2001 From: hochang <“hochang@ebaysf.com”> Date: Thu, 5 Apr 2012 16:37:05 -0700 Subject: [PATCH 3/4] add one example to context place holder --- lib/unit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/unit.js b/lib/unit.js index 11197a8..0fe9327 100644 --- a/lib/unit.js +++ b/lib/unit.js @@ -220,7 +220,7 @@ exports.init = function (opt) { udf.setup(function (ctx) { var listener = new Listener(getEngine()); if (aMeta.script) { - getEngine().execute(aMeta.script, {}, function(emitter) { + getEngine().execute(aMeta.script, {foo :'bar'}, function(emitter) { emitter.on('end', function (err, result) { listener.assert(test); try { From e9b580b8a74d62fee564b0a7ec7193b40aeee5af Mon Sep 17 00:00:00 2001 From: hochang <“hochang@ebaysf.com”> Date: Fri, 6 Apr 2012 15:49:56 -0700 Subject: [PATCH 4/4] better example --- lib/unit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/unit.js b/lib/unit.js index 0fe9327..ed7c432 100644 --- a/lib/unit.js +++ b/lib/unit.js @@ -220,7 +220,7 @@ exports.init = function (opt) { udf.setup(function (ctx) { var listener = new Listener(getEngine()); if (aMeta.script) { - getEngine().execute(aMeta.script, {foo :'bar'}, function(emitter) { + getEngine().execute(aMeta.script, {context: {foo:'bar'}}, function(emitter) { emitter.on('end', function (err, result) { listener.assert(test); try {