diff --git a/lib/mjsunit.js b/lib/mjsunit.js deleted file mode 100644 index 305e08d032..0000000000 --- a/lib/mjsunit.js +++ /dev/null @@ -1,166 +0,0 @@ -// Copyright 2008 the V8 project authors. All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// - -/*jslint - evil: true -*/ - -function MjsUnitAssertionError(message) { - this.message = message; - Error.captureStackTrace(this, fail); -} - -MjsUnitAssertionError.prototype.toString = function () { - return this.message; -}; - -/* - * This file is included in all mini jsunit test cases. The test - * framework expects lines that signal failed tests to start with - * the f-word and ignore all other lines. - */ - -function fail (expected, found, name_opt) { - var start; - if (name_opt) { - // Fix this when we ditch the old test runner. - start = "Fail" + "ure (" + name_opt + "): "; - } else { - start = "Fail" + "ure:"; - } - throw new MjsUnitAssertionError(start + " expected <" + expected + "> found <" + found + ">"); -}; - - -function deepEquals (a, b) { - if (a == b) { - return true; - } - if ((typeof a) !== 'object' || (typeof b) !== 'object' || - (a === null) || (b === null)) { - return false; - } - if (a.constructor === Array) { - if (b.constructor !== Array) { - return false; - } - if (a.length != b.length) { - return false; - } - for (var i = 0; i < a.length; i++) { - if (i in a) { - if (!(i in b) || !(deepEquals(a[i], b[i]))) { - return false; - } - } else if (i in b) { - return false; - } - } - return true; - } - return false; -}; - - -exports.assertEquals = function (expected, found, name_opt) { - if (!deepEquals(found, expected)) { - fail(expected, found, name_opt); - } -}; - - -exports.assertArrayEquals = function (expected, found, name_opt) { - var start = ""; - if (name_opt) { - start = name_opt + " - "; - } - exports.assertEquals(expected.length, found.length, start + "array length"); - if (expected.length == found.length) { - for (var i = 0; i < expected.length; ++i) { - exports.assertEquals(expected[i], found[i], start + "array element at index " + i); - } - } -}; - - -exports.assertTrue = function (value, name_opt) { - exports.assertEquals(true, value, name_opt); -}; - - -exports.assertFalse = function (value, name_opt) { - exports.assertEquals(false, value, name_opt); -}; - - -exports.assertNaN = function (value, name_opt) { - if (!isNaN(value)) { - fail("NaN", value, name_opt); - } -}; - - -exports.assertThrows = function (code) { - var threwException = true; - try { - eval(code); - threwException = false; - } catch (e) { - // Do nothing. - } - if (!threwException) { - exports.assertTrue(false, "did not throw exception"); - } -}; - - -exports.assertInstanceof = function (obj, type) { - if (!(obj instanceof type)) { - exports.assertTrue(false, "Object <" + obj + "> is not an instance of <" + type + ">"); - } -}; - - -exports.assertDoesNotThrow = function (code) { - try { - eval(code); - } catch (e) { - exports.assertTrue(false, "threw an exception"); - } -}; - - -exports.assertUnreachable = function (name_opt) { - // Fix this when we ditch the old test runner. - var message = "Fail" + "ure: unreachable"; - if (name_opt) { - message += " - " + name_opt; - } - throw new MjsUnitAssertionError(message); -}; diff --git a/src/node.cc b/src/node.cc index a874c55bba..db2b55aace 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1071,7 +1071,7 @@ static Handle Loop(const Arguments& args) { assert(args.Length() == 0); // TODO Probably don't need to start this each time. - // Avoids failing on test/mjsunit/test-eio-race3.js though + // Avoids failing on test/simple/test-eio-race3.js though ev_idle_start(EV_DEFAULT_UC_ &eio_poller); ev_loop(EV_DEFAULT_UC_ 0); @@ -1654,7 +1654,6 @@ static Handle Binding(const Arguments& args) { exports->Set(String::New("http"), String::New(native_http)); exports->Set(String::New("crypto"), String::New(native_crypto)); exports->Set(String::New("ini"), String::New(native_ini)); - exports->Set(String::New("mjsunit"), String::New(native_mjsunit)); exports->Set(String::New("net"), String::New(native_net)); exports->Set(String::New("posix"), String::New(native_posix)); exports->Set(String::New("querystring"), String::New(native_querystring)); @@ -1953,7 +1952,7 @@ int main(int argc, char *argv[]) { eio_init(node::EIOWantPoll, node::EIODonePoll); // Don't handle more than 10 reqs on each eio_poll(). This is to avoid - // race conditions. See test/mjsunit/test-eio-race.js + // race conditions. See test/simple/test-eio-race.js eio_set_max_poll_reqs(10); }