Reformats some of the tests with a 'test' func.

- 500 lines of assertions look a lot better indented. May use the 'test' func for bookkeeping later.
ndreynolds · Nov 2, 2012 · 7905c89 · 7905c89
1 parent 814e95a
commit 7905c89
Show file tree

Hide file tree

Showing 10 changed files with 1,132 additions and 1,076 deletions.
diff --git a/test/test_array_global.js b/test/test_array_global.js
diff --git a/test/test_assignment.js b/test/test_assignment.js
@@ -2,48 +2,52 @@
 // ------------------
 
 var assert = console.assert;
+
 var assertEquals = function(a, b) {
   return a === b;
 };
 
+var test = function(name, f) {
+  f();
+};
 
-// Variable assignment
-
-var x = 0;
-
-x += 4;
-assertEquals(4, x);
 
-x /= 2;
-assertEquals(2, x);
+test('Variable assignment', function() {
+  var x = 0;
 
-x -= 1;
-assertEquals(1, x);
+  x += 4;
+  assertEquals(4, x);
 
-x *= 7;
-assertEquals(7, x);
+  x /= 2;
+  assertEquals(2, x);
 
+  x -= 1;
+  assertEquals(1, x);
 
-// Assignment with member expressions
+  x *= 7;
+  assertEquals(7, x);
+});
 
-var y = {};
+test('Assignment with member expressions', function() {
+  var y = {};
 
-y.a = 42;
-assertEquals(42, y.a);
+  y.a = 42;
+  assertEquals(42, y.a);
 
-y.b = 56;
-y.b += 10;
-assertEquals(66, y.b);
+  y.b = 56;
+  y.b += 10;
+  assertEquals(66, y.b);
 
-y.c = 17;
-y.c *= 45;
-assertEquals(765, y.c);
+  y.c = 17;
+  y.c *= 45;
+  assertEquals(765, y.c);
 
-// A little crazy, but viable:
-var z = {};
-z.a = {};
-z.a.b = {};
-z.a.b.c = {};
-z.a.b.c.d = {};
-z.a.b.c.d.e = 42;
-assertEquals(42, z.a.b.c.d.e);
+  // A little crazy, but viable:
+  var z = {};
+  z.a = {};
+  z.a.b = {};
+  z.a.b.c = {};
+  z.a.b.c.d = {};
+  z.a.b.c.d.e = 42;
+  assertEquals(42, z.a.b.c.d.e);
+});
diff --git a/test/test_boolean_global.js b/test/test_boolean_global.js
@@ -10,6 +10,10 @@ var assertEquals = function(a, b) {
   assert(a === b);
 };
 
+var test = function(name, f) {
+  f();
+};
+
 
 // ----------------------------------------------------------------------------
 // Boolean Global
@@ -18,29 +22,29 @@ var assertEquals = function(a, b) {
 assert(Boolean);
 assertEquals('function', typeof Boolean);
 
-// Constructor
-
-assertEquals('object', typeof new Boolean);
-assertEquals('object', typeof (new Boolean));
-assertEquals('object', typeof (new Boolean()));
-assertEquals('object', typeof (new Boolean(true)));
-assertEquals('boolean', typeof Boolean(true));
-assertEquals('boolean', typeof Boolean(false));
-assertEquals(true, (new Boolean(true)).valueOf());
-assertEquals(false, (new Boolean(false)).valueOf());
-assertEquals(false, (new Boolean(false)).valueOf());
-assertEquals(false, Boolean(void 0));
-assertEquals(false, Boolean(null));
-assertEquals(false, Boolean(false));
-assertEquals(true, Boolean(true));
-assertEquals(false, Boolean(0));
-assertEquals(true, Boolean(1));
-assertEquals(true, Boolean(assertEquals));
-assertEquals(true, Boolean(new Object()));
-assert(new Boolean(false) !== false);
-assert(new Boolean(false) == false);
-assert(new Boolean(true) !== true);
-assert(new Boolean(true) == true);
+test('Constructor', function() {
+  assertEquals('object', typeof new Boolean);
+  assertEquals('object', typeof (new Boolean));
+  assertEquals('object', typeof (new Boolean()));
+  assertEquals('object', typeof (new Boolean(true)));
+  assertEquals('boolean', typeof Boolean(true));
+  assertEquals('boolean', typeof Boolean(false));
+  assertEquals(true, (new Boolean(true)).valueOf());
+  assertEquals(false, (new Boolean(false)).valueOf());
+  assertEquals(false, (new Boolean(false)).valueOf());
+  assertEquals(false, Boolean(void 0));
+  assertEquals(false, Boolean(null));
+  assertEquals(false, Boolean(false));
+  assertEquals(true, Boolean(true));
+  assertEquals(false, Boolean(0));
+  assertEquals(true, Boolean(1));
+  assertEquals(true, Boolean(assertEquals));
+  assertEquals(true, Boolean(new Object()));
+  assert(new Boolean(false) !== false);
+  assert(new Boolean(false) == false);
+  assert(new Boolean(true) !== true);
+  assert(new Boolean(true) == true);
+});
 
 
 // ----------------------------------------------------------------------------
@@ -49,21 +53,18 @@ assert(new Boolean(true) == true);
 
 assert(Boolean.prototype);
 
-var t = true;
-var f = false;
-
-
-// Boolean.prototype.toString()
-
-assertEquals('true', t.toString());
-assertEquals('false', f.toString());
-assertEquals('true', true.toString());
-assertEquals('false', false.toString());
-
-
-// Boolean.prototype.valueOf()
-
-assertEquals(true, t.valueOf());
-assertEquals(false, f.valueOf());
-assertEquals(true, true.valueOf());
-assertEquals(false, false.valueOf());
+test('Boolean#toString()', function() {
+  var t = true, f = false;
+  assertEquals('true', t.toString());
+  assertEquals('false', f.toString());
+  assertEquals('true', true.toString());
+  assertEquals('false', false.toString());
+});
+
+test('Boolean#valueOf()', function() {
+  var t = true, f = false;
+  assertEquals(true, t.valueOf());
+  assertEquals(false, f.valueOf());
+  assertEquals(true, true.valueOf());
+  assertEquals(false, false.valueOf());
+});