Browse Source

Depreciate onLoad

v0.7.4-release
Ryan 16 years ago
parent
commit
31265be4a6
  1. 8
      src/node.js
  2. 14
      test/mjsunit/test-encode-utf8.js
  3. 14
      test/mjsunit/test-event-emitter-add-listeners.js
  4. 18
      test/mjsunit/test-file-cat-noexist.js
  5. 10
      test/mjsunit/test-http-cat.js
  6. 18
      test/mjsunit/test-http-client-upload.js
  7. 12
      test/mjsunit/test-http-proxy.js
  8. 27
      test/mjsunit/test-http-server.js
  9. 18
      test/mjsunit/test-http.js
  10. 24
      test/mjsunit/test-module-loading.js
  11. 28
      test/mjsunit/test-node-cat.js
  12. 6
      test/mjsunit/test-process-buffering.js
  13. 12
      test/mjsunit/test-process-kill.js
  14. 8
      test/mjsunit/test-process-simple.js
  15. 4
      test/mjsunit/test-process-spawn-loop.js
  16. 38
      test/mjsunit/test-promise-wait.js
  17. 8
      test/mjsunit/test-remote-module-loading.js
  18. 6
      test/mjsunit/test-tcp-many-clients.js
  19. 4
      test/mjsunit/test-tcp-pingpong-delay.js
  20. 10
      test/mjsunit/test-tcp-pingpong.js
  21. 16
      test/mjsunit/test-tcp-raw.js
  22. 25
      test/mjsunit/test-tcp-reconnect.js
  23. 16
      test/mjsunit/test-tcp-throttle-kernel-buffer.js
  24. 18
      test/mjsunit/test-tcp-throttle.js
  25. 20
      test/mjsunit/test-timers.js
  26. 4
      test/mjsunit/test-utf8-scripts.js

8
src/node.js

@ -126,7 +126,13 @@ node.Module.prototype.load = function (callback) {
self.onExit = self.target.__onExit;
self.waitChildrenLoad(function () {
if (self.onLoad) self.onLoad();
if (self.onLoad) {
node.stdio.writeError( "(node) onLoad is depreciated it will be "
+ "removed in the future. Don't want it to "
+ "leave? Discuss on mailing list.\n"
);
self.onLoad();
}
self.loaded = true;
loadPromise.emitSuccess([self.target]);
});

14
test/mjsunit/test-encode-utf8.js

@ -1,11 +1,9 @@
include("mjsunit.js");
function onLoad () {
var a = [116,101,115,116,32,206,163,207,131,207,128,206,177,32,226,161,140,226,160, 129,226,160,167,226,160,145];
var s = node.encodeUtf8(a);
assertEquals("test Σσπα ⡌⠁⠧⠑", s);
var a = [116,101,115,116,32,206,163,207,131,207,128,206,177,32,226,161,140,226,160, 129,226,160,167,226,160,145];
var s = node.encodeUtf8(a);
assertEquals("test Σσπα ⡌⠁⠧⠑", s);
a = [104, 101, 108, 108, 111];
s = node.encodeUtf8(a);
assertEquals("hello", s);
}
a = [104, 101, 108, 108, 111];
s = node.encodeUtf8(a);
assertEquals("hello", s);

14
test/mjsunit/test-event-emitter-add-listeners.js

@ -5,23 +5,21 @@ var e = new node.EventEmitter();
var events_new_listener_emited = [];
var times_hello_emited = 0;
function onLoad () {
e.addListener("newListener", function (event, listener) {
e.addListener("newListener", function (event, listener) {
puts("newListener: " + event);
events_new_listener_emited.push(event);
});
});
e.addListener("hello", function (a, b) {
e.addListener("hello", function (a, b) {
puts("hello");
times_hello_emited += 1
assertEquals("a", a);
assertEquals("b", b);
});
});
puts("start");
puts("start");
e.emit("hello", ["a", "b"]);
}
e.emit("hello", ["a", "b"]);
function onExit () {
assertArrayEquals(["hello"], events_new_listener_emited);

18
test/mjsunit/test-file-cat-noexist.js

@ -1,22 +1,20 @@
include("mjsunit.js");
var got_error = false;
function onLoad () {
var dirname = node.path.dirname(__filename);
var fixtures = node.path.join(dirname, "fixtures");
var filename = node.path.join(fixtures, "does_not_exist.txt");
var promise = node.fs.cat(filename, "raw");
var dirname = node.path.dirname(__filename);
var fixtures = node.path.join(dirname, "fixtures");
var filename = node.path.join(fixtures, "does_not_exist.txt");
var promise = node.fs.cat(filename, "raw");
promise.addCallback(function (content) {
promise.addCallback(function (content) {
node.debug("cat returned some content: " + content);
node.debug("this shouldn't happen as the file doesn't exist...");
assertTrue(false);
});
});
promise.addErrback(function () {
promise.addErrback(function () {
got_error = true;
});
}
});
function onExit () {
assertTrue(got_error);

10
test/mjsunit/test-http-cat.js

@ -16,19 +16,17 @@ server.listen(PORT);
var got_good_server_content = false;
var bad_server_got_error = false;
function onLoad () {
node.http.cat("http://localhost:"+PORT+"/", "utf8").addCallback(function (content) {
node.http.cat("http://localhost:"+PORT+"/", "utf8").addCallback(function (content) {
puts("got response");
got_good_server_content = true;
assertEquals(body, content);
server.close();
});
});
node.http.cat("http://localhost:12312/", "utf8").addErrback(function () {
node.http.cat("http://localhost:12312/", "utf8").addErrback(function () {
puts("got error (this should happen)");
bad_server_got_error = true;
});
}
});
function onExit () {
assertTrue(got_good_server_content);

18
test/mjsunit/test-http-client-upload.js

@ -24,16 +24,15 @@ var server = node.http.createServer(function(req, res) {
});
server.listen(PORT);
function onLoad () {
var client = node.http.createClient(PORT);
var req = client.post('/');
var client = node.http.createClient(PORT);
var req = client.post('/');
req.sendBody('1\n');
req.sendBody('2\n');
req.sendBody('3\n');
req.sendBody('1\n');
req.sendBody('2\n');
req.sendBody('3\n');
puts("client finished sending request");
req.finish(function(res) {
puts("client finished sending request");
req.finish(function(res) {
res.setBodyEncoding("utf8");
res.addListener('body', function(chunk) {
puts(chunk);
@ -42,8 +41,7 @@ function onLoad () {
client_res_complete = true;
server.close();
});
});
}
});
function onExit () {
assertEquals("1\n2\n3\n", sent_body);

12
test/mjsunit/test-http-proxy.js

@ -32,11 +32,10 @@ proxy.listen(PROXY_PORT);
var body = "";
function onLoad () {
var client = node.http.createClient(PROXY_PORT);
var req = client.get("/test");
// node.debug("client req")
req.finish(function (res) {
var client = node.http.createClient(PROXY_PORT);
var req = client.get("/test");
// node.debug("client req")
req.finish(function (res) {
// node.debug("got res");
assertEquals(200, res.statusCode);
res.setBodyEncoding("utf8");
@ -46,8 +45,7 @@ function onLoad () {
backend.close();
// node.debug("closed both");
});
});
}
});
function onExit () {
assertEquals(body, "hello world\n");

27
test/mjsunit/test-http-server.js

@ -7,9 +7,7 @@ var requests_sent = 0;
var server_response = "";
var client_got_eof = false;
function onLoad() {
node.http.createServer(function (req, res) {
node.http.createServer(function (req, res) {
res.id = request_number;
req.id = request_number++;
@ -31,18 +29,18 @@ function onLoad() {
res.finish();
}, 1);
}).listen(port);
}).listen(port);
var c = node.tcp.createConnection(port);
var c = node.tcp.createConnection(port);
c.setEncoding("utf8");
c.setEncoding("utf8");
c.addListener("connect", function () {
c.addListener("connect", function () {
c.send( "GET /hello HTTP/1.1\r\n\r\n" );
requests_sent += 1;
});
});
c.addListener("receive", function (chunk) {
c.addListener("receive", function (chunk) {
server_response += chunk;
if (requests_sent == 1) {
@ -51,16 +49,15 @@ function onLoad() {
assertEquals(c.readyState, "readOnly");
requests_sent += 1;
}
});
});
c.addListener("eof", function () {
c.addListener("eof", function () {
client_got_eof = true;
});
});
c.addListener("close", function () {
c.addListener("close", function () {
assertEquals(c.readyState, "closed");
});
}
});
function onExit () {
assertEquals(2, request_number);

18
test/mjsunit/test-http.js

@ -6,8 +6,7 @@ var responses_recvd = 0;
var body0 = "";
var body1 = "";
function onLoad () {
node.http.createServer(function (req, res) {
node.http.createServer(function (req, res) {
if (responses_sent == 0) {
assertEquals("GET", req.method);
assertEquals("/hello", req.uri.path);
@ -34,19 +33,19 @@ function onLoad () {
});
//assertEquals("127.0.0.1", res.connection.remoteAddress);
}).listen(PORT);
}).listen(PORT);
var client = node.http.createClient(PORT);
var req = client.get("/hello", {"Accept": "*/*", "Foo": "bar"});
req.finish(function (res) {
var client = node.http.createClient(PORT);
var req = client.get("/hello", {"Accept": "*/*", "Foo": "bar"});
req.finish(function (res) {
assertEquals(200, res.statusCode);
responses_recvd += 1;
res.setBodyEncoding("ascii");
res.addListener("body", function (chunk) { body0 += chunk; });
node.debug("Got /hello response");
});
});
setTimeout(function () {
setTimeout(function () {
req = client.post("/world");
req.finish(function (res) {
assertEquals(200, res.statusCode);
@ -55,8 +54,7 @@ function onLoad () {
res.addListener("body", function (chunk) { body1 += chunk; });
node.debug("Got /world response");
});
}, 1);
}
}, 1);
function onExit () {
node.debug("responses_recvd: " + responses_recvd);

24
test/mjsunit/test-module-loading.js

@ -3,24 +3,22 @@ var a = require("fixtures/a.js");
var d = require("fixtures/b/d.js");
var d2 = require("fixtures/b/d.js");
function onLoad () {
assertFalse(false, "testing the test program.");
assertFalse(false, "testing the test program.");
assertInstanceof(a.A, Function);
assertEquals("A", a.A());
assertInstanceof(a.A, Function);
assertEquals("A", a.A());
assertInstanceof(a.C, Function);
assertEquals("C", a.C());
assertInstanceof(a.C, Function);
assertEquals("C", a.C());
assertInstanceof(a.D, Function);
assertEquals("D", a.D());
assertInstanceof(a.D, Function);
assertEquals("D", a.D());
assertInstanceof(d.D, Function);
assertEquals("D", d.D());
assertInstanceof(d.D, Function);
assertEquals("D", d.D());
assertInstanceof(d2.D, Function);
assertEquals("D", d2.D());
}
assertInstanceof(d2.D, Function);
assertEquals("D", d2.D());
function onExit () {
assertInstanceof(a.A, Function);

28
test/mjsunit/test-node-cat.js

@ -18,34 +18,32 @@ server.listen(PORT);
var errors = 0;
var successes = 0;
function onLoad () {
var promise = node.cat("http://localhost:"+PORT, "utf8");
var promise = node.cat("http://localhost:"+PORT, "utf8");
promise.addCallback(function (content) {
promise.addCallback(function (content) {
assertEquals(body, content);
server.close();
successes += 1;
});
});
promise.addErrback(function () {
promise.addErrback(function () {
errors += 1;
});
});
var dirname = node.path.dirname(__filename);
var fixtures = node.path.join(dirname, "fixtures");
var x = node.path.join(fixtures, "x.txt");
var dirname = node.path.dirname(__filename);
var fixtures = node.path.join(dirname, "fixtures");
var x = node.path.join(fixtures, "x.txt");
promise = node.cat(x, "utf8");
promise = node.cat(x, "utf8");
promise.addCallback(function (content) {
promise.addCallback(function (content) {
assertEquals("xyz", content.replace(/[\r\n]/, ''));
successes += 1;
});
});
promise.addErrback(function () {
promise.addErrback(function () {
errors += 1;
});
}
});
function onExit () {
assertEquals(2, successes);

6
test/mjsunit/test-process-buffering.js

@ -18,13 +18,11 @@ function pwd (callback) {
}
function onLoad () {
pwd(function (result) {
pwd(function (result) {
p(result);
assertTrue(result.length > 1);
assertEquals("\n", result[result.length-1]);
});
}
});
function onExit () {
assertTrue(pwd_called);

12
test/mjsunit/test-process-kill.js

@ -2,15 +2,13 @@ include("mjsunit.js");
var exit_status = -1;
function onLoad () {
var cat = node.createProcess("cat");
var cat = node.createProcess("cat");
cat.addListener("output", function (chunk) { assertEquals(null, chunk); });
cat.addListener("error", function (chunk) { assertEquals(null, chunk); });
cat.addListener("exit", function (status) { exit_status = status; });
cat.addListener("output", function (chunk) { assertEquals(null, chunk); });
cat.addListener("error", function (chunk) { assertEquals(null, chunk); });
cat.addListener("exit", function (status) { exit_status = status; });
cat.kill();
}
cat.kill();
function onExit () {
assertTrue(exit_status > 0);

8
test/mjsunit/test-process-simple.js

@ -24,11 +24,9 @@ cat.addListener("exit", function (status) {
exit_status = status;
});
function onLoad () {
cat.write("hello");
cat.write(" ");
cat.write("world");
}
cat.write("hello");
cat.write(" ");
cat.write("world");
function onExit () {
assertEquals(0, exit_status);

4
test/mjsunit/test-process-spawn-loop.js

@ -20,9 +20,7 @@ function spawn (i) {
});
}
function onLoad () {
spawn(0);
}
spawn(0);
function onExit () {
assertTrue(finished);

38
test/mjsunit/test-promise-wait.js

@ -44,36 +44,34 @@ p5.addCallback(function () {
}, 100);
});
function onLoad () {
p2.emitSuccess();
p2.emitSuccess();
assertFalse(p1_done);
assertTrue(p2_done);
assertFalse(p3_done);
assertFalse(p1_done);
assertTrue(p2_done);
assertFalse(p3_done);
var ret1 = p1.wait()
assertEquals("single arg", ret1);
var ret1 = p1.wait()
assertEquals("single arg", ret1);
assertTrue(p1_done);
assertTrue(p2_done);
assertFalse(p3_done);
assertTrue(p1_done);
assertTrue(p2_done);
assertFalse(p3_done);
p3.emitSuccess();
p3.emitSuccess();
assertFalse(p4_done);
assertFalse(p5_done);
assertFalse(p4_done);
assertFalse(p5_done);
p5.emitSuccess();
p5.emitSuccess();
assertFalse(p4_done);
assertTrue(p5_done);
assertFalse(p4_done);
assertTrue(p5_done);
var ret4 = p4.wait();
assertArrayEquals(["a","b","c"], ret4);
var ret4 = p4.wait();
assertArrayEquals(["a","b","c"], ret4);
assertTrue(p4_done);
}
assertTrue(p4_done);
function onExit() {
assertTrue(p1_done);

8
test/mjsunit/test-remote-module-loading.js

@ -12,8 +12,6 @@ s.listen(8000);
include("mjsunit.js");
var a = require("http://localhost:8000/")
function onLoad() {
assertInstanceof(a.A, Function);
assertEquals("A", a.A());
s.close();
}
assertInstanceof(a.A, Function);
assertEquals("A", a.A());
s.close();

6
test/mjsunit/test-tcp-many-clients.js

@ -55,13 +55,11 @@ function runClient (callback) {
}
function onLoad () {
var finished_clients = 0;
for (var i = 0; i < concurrency; i++) {
var finished_clients = 0;
for (var i = 0; i < concurrency; i++) {
runClient(function () {
if (++finished_clients == concurrency) server.close();
});
}
}
function onExit () {

4
test/mjsunit/test-tcp-pingpong-delay.js

@ -83,9 +83,7 @@ function pingPongTest (port, host, on_complete) {
});
}
function onLoad () {
pingPongTest(21988);
}
pingPongTest(21988);
function onExit () {
assertEquals(1, tests_run);

10
test/mjsunit/test-tcp-pingpong.js

@ -77,12 +77,10 @@ function pingPongTest (port, host, on_complete) {
});
}
function onLoad () {
/* All are run at once, so run on different ports */
pingPongTest(20989, "localhost");
pingPongTest(20988, null);
pingPongTest(20997, "::1");
}
/* All are run at once, so run on different ports */
pingPongTest(20989, "localhost");
pingPongTest(20988, null);
pingPongTest(20997, "::1");
function onExit () {
assertEquals(3, tests_run);

16
test/mjsunit/test-tcp-raw.js

@ -14,10 +14,9 @@ echoServer.listen(PORT);
var recv = [];
var j = 0;
function onLoad () {
var c = node.tcp.createConnection(PORT);
var c = node.tcp.createConnection(PORT);
c.addListener("receive", function (chunk) {
c.addListener("receive", function (chunk) {
if (++j < 256) {
c.send([j], "raw");
} else {
@ -26,17 +25,16 @@ function onLoad () {
for (var i = 0; i < chunk.length; i++) {
recv.push(chunk[i]);
}
});
});
c.addListener("connect", function () {
c.addListener("connect", function () {
c.send([j], "raw");
});
});
c.addListener("close", function () {
c.addListener("close", function () {
p(recv);
echoServer.close();
});
};
});
function onExit () {
var expected = [];

25
test/mjsunit/test-tcp-reconnect.js

@ -6,9 +6,7 @@ var c = 0;
var client_recv_count = 0;
var disconnect_count = 0;
function onLoad () {
var server = node.tcp.createServer(function (socket) {
var server = node.tcp.createServer(function (socket) {
socket.addListener("connect", function () {
socket.send("hello\r\n");
});
@ -21,33 +19,32 @@ function onLoad () {
//puts("server had_error: " + JSON.stringify(had_error));
assertFalse(had_error);
});
});
server.listen(port);
});
server.listen(port);
var client = node.tcp.createConnection(port);
var client = node.tcp.createConnection(port);
client.setEncoding("UTF8");
client.setEncoding("UTF8");
client.addListener("connect", function () {
client.addListener("connect", function () {
puts("client connected.");
});
});
client.addListener("receive", function (chunk) {
client.addListener("receive", function (chunk) {
client_recv_count += 1;
puts("client_recv_count " + client_recv_count);
assertEquals("hello\r\n", chunk);
client.close();
});
});
client.addListener("close", function (had_error) {
client.addListener("close", function (had_error) {
puts("disconnect");
assertFalse(had_error);
if (disconnect_count++ < N)
client.connect(port); // reconnect
else
server.close();
});
}
});
function onExit () {
assertEquals(N+1, disconnect_count);

16
test/mjsunit/test-tcp-throttle-kernel-buffer.js

@ -23,11 +23,10 @@ chars_recved = 0;
npauses = 0;
function onLoad () {
var paused = false;
client = node.tcp.createConnection(PORT);
client.setEncoding("ascii");
client.addListener("receive", function (d) {
var paused = false;
client = node.tcp.createConnection(PORT);
client.setEncoding("ascii");
client.addListener("receive", function (d) {
chars_recved += d.length;
puts("got " + chars_recved);
if (!paused) {
@ -43,13 +42,12 @@ function onLoad () {
paused = false;
}, 100);
}
});
});
client.addListener("eof", function () {
client.addListener("eof", function () {
server.close();
client.close();
});
}
});
function onExit () {
assertEquals(N, chars_recved);

18
test/mjsunit/test-tcp-throttle.js

@ -21,15 +21,14 @@ server.listen(PORT);
recv = "";
chars_recved = 0;
function onLoad () {
client = node.tcp.createConnection(PORT);
client.setEncoding("ascii");
client.addListener("receive", function (d) {
client = node.tcp.createConnection(PORT);
client.setEncoding("ascii");
client.addListener("receive", function (d) {
print(d);
recv += d;
});
});
setTimeout(function () {
setTimeout(function () {
chars_recved = recv.length;
puts("pause at: " + chars_recved);
assertTrue(chars_recved > 1);
@ -55,13 +54,12 @@ function onLoad () {
}, 500);
}, 500);
}, 500);
client.addListener("eof", function () {
client.addListener("eof", function () {
server.close();
client.close();
});
}
});
function onExit () {
assertEquals(N, recv.length);

20
test/mjsunit/test-timers.js

@ -5,23 +5,22 @@ var WINDOW = 800; // why is does this need to be so big?
var interval_count = 0;
var setTimeout_called = false;
function onLoad () {
assertInstanceof(setTimeout, Function);
var starttime = new Date;
assertInstanceof(setTimeout, Function);
var starttime = new Date;
setTimeout(function () {
setTimeout(function () {
var endtime = new Date;
var diff = endtime - starttime;
if (diff < 0) diff = -diff;
assertTrue(1000 - WINDOW < diff && diff < 1000 + WINDOW);
setTimeout_called = true;
}, 1000);
}, 1000);
// this timer shouldn't execute
var id = setTimeout(function () { assertTrue(false); }, 500);
clearTimeout(id);
// this timer shouldn't execute
var id = setTimeout(function () { assertTrue(false); }, 500);
clearTimeout(id);
setInterval(function () {
setInterval(function () {
interval_count += 1;
var endtime = new Date;
var diff = endtime - starttime;
@ -34,8 +33,7 @@ function onLoad () {
assertTrue(interval_count <= 3);
if (interval_count == 3)
clearInterval(this);
}, 1000);
}
}, 1000);
function onExit () {
assertTrue(setTimeout_called);

4
test/mjsunit/test-utf8-scripts.js

@ -4,7 +4,5 @@ include("mjsunit.js");
puts("Σὲ γνωρίζω ἀπὸ τὴν κόψη");
function onLoad () {
  assertTrue( /Hellö Wörld/.test("Hellö Wörld") );
}
assertTrue( /Hellö Wörld/.test("Hellö Wörld") );

Loading…
Cancel
Save