API: Move Promise and EventEmitter into 'events' module

5 files changed, 20 insertions, 15 deletions

diff --git a/test/mjsunit/test-event-emitter-add-listeners.js b/test/mjsunit/test-event-emitter-add-listeners.js
index 8668e6f73..643b8d8dd 100644
--- a/test/mjsunit/test-event-emitter-add-listeners.js
+++ b/test/mjsunit/test-event-emitter-add-listeners.js
@@ -1,6 +1,7 @@
 process.mixin(require("./common"));
+var events = require('events');
 
-var e = new process.EventEmitter();
+var e = new events.EventEmitter();
 
 var events_new_listener_emited = [];
 var times_hello_emited = 0;
diff --git a/test/mjsunit/test-promise-cancel.js b/test/mjsunit/test-promise-cancel.js
index 7a84c7a4e..84ae9a600 100644
--- a/test/mjsunit/test-promise-cancel.js
+++ b/test/mjsunit/test-promise-cancel.js
@@ -1,6 +1,7 @@
 process.mixin(require('./common'));
+events = require('events');
 
-var promise = new process.Promise();
+var promise = new events.Promise();
 var cancelled = false;
 promise.addCancelback(function(){
   if(cancelled){
diff --git a/test/mjsunit/test-promise-timeout.js b/test/mjsunit/test-promise-timeout.js
index a6f253525..1a571a148 100644
--- a/test/mjsunit/test-promise-timeout.js
+++ b/test/mjsunit/test-promise-timeout.js
@@ -1,8 +1,9 @@
 process.mixin(require("./common"));
+events = require('events');
 
 var timeouts = 0;
 
-var promise = new process.Promise();
+var promise = new events.Promise();
 promise.timeout(250);
 assert.equal(250, promise.timeout());
 
@@ -20,7 +21,7 @@ setTimeout(function() {
   promise.emitSuccess('Am I too late?');
 }, 500);
 
-var waitPromise = new process.Promise();
+var waitPromise = new events.Promise();
 try {
   waitPromise.timeout(250).wait()
 } catch (e) {
@@ -29,7 +30,7 @@ try {
   timeouts++;
 }
 
-var successPromise = new process.Promise();
+var successPromise = new events.Promise();
 successPromise.timeout(500);
 setTimeout(function() {
   successPromise.emitSuccess();
@@ -39,7 +40,7 @@ successPromise.addErrback(function() {
   assert.ok(false, 'addErrback should not fire if there is no timeout');
 });
 
-var errorPromise = new process.Promise();
+var errorPromise = new events.Promise();
 errorPromise.timeout(500);
 setTimeout(function() {
   errorPromise.emitError(new Error('intentional'));
@@ -50,7 +51,7 @@ errorPromise.addErrback(function(e) {
   assert.equal('intentional', e.message);
 });
 
-var cancelPromise = new process.Promise();
+var cancelPromise = new events.Promise();
 cancelPromise.timeout(500);
 setTimeout(function() {
   cancelPromise.cancel();
@@ -68,7 +69,7 @@ cancelPromise.addErrback(function(e) {
   assert.ok(false, 'addErrback should not fire if the promise is canceled');
 });
 
-var cancelTimeoutPromise = new process.Promise();
+var cancelTimeoutPromise = new events.Promise();
 cancelTimeoutPromise.timeout(500);
 setTimeout(function() {
   cancelPromise.emitCancel();
@@ -80,4 +81,4 @@ cancelPromise.addErrback(function(e) {
 
 process.addListener('exit', function() {
   assert.equal(2, timeouts);
-});
\ No newline at end of file
+});
diff --git a/test/mjsunit/test-promise-wait.js b/test/mjsunit/test-promise-wait.js
index 37c8c4d6a..ef32ebf2e 100644
--- a/test/mjsunit/test-promise-wait.js
+++ b/test/mjsunit/test-promise-wait.js
@@ -1,7 +1,8 @@
 process.mixin(require("./common"));
+events = require('events');
 
 var p1_done = false;
-var p1 = new process.Promise();
+var p1 = new events.Promise();
 p1.addCallback(function () {
   assert.equal(1, arguments.length);
   assert.equal("single arg", arguments[0]);
@@ -9,7 +10,7 @@ p1.addCallback(function () {
 });
 
 var p2_done = false;
-var p2 = new process.Promise();
+var p2 = new events.Promise();
 p2.addCallback(function () {
   p2_done = true;
   setTimeout(function () {
@@ -18,7 +19,7 @@ p2.addCallback(function () {
 });
 
 var p3_done = false;
-var p3 = new process.Promise();
+var p3 = new events.Promise();
 p3.addCallback(function () {
   p3_done = true;
 });
@@ -26,7 +27,7 @@ p3.addCallback(function () {
 
 
 var p4_done = false;
-var p4 = new process.Promise();
+var p4 = new events.Promise();
 p4.addCallback(function () {
   assert.equal(3, arguments.length);
   assert.equal("a", arguments[0]);
@@ -36,7 +37,7 @@ p4.addCallback(function () {
 });
 
 var p5_done = false;
-var p5 = new process.Promise();
+var p5 = new events.Promise();
 p5.addCallback(function () {
   p5_done = true;
   setTimeout(function () {
diff --git a/test/mjsunit/test-wait-ordering.js b/test/mjsunit/test-wait-ordering.js
index 537ad24d8..1cbcc0a0f 100644
--- a/test/mjsunit/test-wait-ordering.js
+++ b/test/mjsunit/test-wait-ordering.js
@@ -1,7 +1,8 @@
 process.mixin(require("./common"));
+var events = require('events');
 
 function timer (t) {
-  var promise = new process.Promise();
+  var promise = new events.Promise();
   setTimeout(function () {
     promise.emitSuccess();
   }, t);