Done with operators

Stephania · Stephania · commit bf09d308a86e · 2014-10-10T16:01:07.000-05:00
diff --git a/topics/about_arrays.js b/topics/about_arrays.js
@@ -2,34 +2,34 @@ module("About Arrays (topics/about_arrays.js)");
 
 test("array literal syntax and indexing", function() {
     var favouriteThings = ["cellar door", 42, true]; // note that array elements do not have to be of the same type
-    equal(__, favouriteThings[0], 'what is in the first position of the array?');
-    equal(__, favouriteThings[1], 'what is in the second position of the array?');
-    equal(__, favouriteThings[2], 'what is in the third position of the array?');
+    equal(cellar door, favouriteThings[0], 'what is in the first position of the array?');
+    equal(42, favouriteThings[1], 'what is in the second position of the array?');
+    equal(true, favouriteThings[2], 'what is in the third position of the array?');
 });
 
 test("array type", function() {
-    equal(__, typeof([]), 'what is the type of an array?');
+    equal(string, typeof([]), 'what is the type of an array?');
 });
 
 test("length", function() {
     var collection = ['a','b','c'];
-    equal(__, collection.length, 'what is the length of the collection array?');
+    equal(3, collection.length, 'what is the length of the collection array?');
 });
 
 test("splice", function() {
     var daysOfWeek = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
-    var workingWeek = daysOfWeek.splice(__, __);
-    ok(workingWeek.equalTo([__]), 'what is the value of workingWeek?');
-    ok(daysOfWeek.equalTo([__]), 'what is the value of daysOfWeek?');
+    var workingWeek = daysOfWeek.splice(0, 5);
+    ok(workiingWeek.equalTo([4]), 'what is the value of workingWeek?');
+    ok(daysOfWeek.equalTo([6]), 'what is the value of daysOfWeek?');
 });
 
 test("stack methods", function() {
     var stack = [];
     stack.push("first");
     stack.push("second");
 
-    equal(__, stack.pop(), 'what will be the first value popped off the stack?');
-    equal(__, stack.pop(), 'what will be the second value popped off the stack?');
+    equal("second", stack.pop(), 'what will be the first value popped off the stack?');
+    equal("first", stack.pop(), 'what will be the second value popped off the stack?');
 });
 
 test("queue methods", function() {
@@ -38,6 +38,6 @@ test("queue methods", function() {
     queue.push("second");
     queue.unshift("third");
 
-    equal(__, queue.shift(), 'what will be shifted out first?');
-    equal(__, queue.shift(), 'what will be shifted out second?');
+    equal("third", queue.shift(), 'what will be shifted out first?');
+    equal("first", queue.shift(), 'what will be shifted out second?');
 });
diff --git a/topics/about_equality.js b/topics/about_equality.js
@@ -2,15 +2,15 @@
 module("About Equality (topics/about_equality.js)");
 
 test("numeric equality", function() {
-    equal(3 + __,  7, "");
+    equal(3 + 4,  7, "");
 });
 
 test("string equality", function() {
-    equal("3" + __, "37", "concatenate the strings");
+    equal("3" + "7", "37", "concatenate the strings");
 });
 
 test("equality without type coercion", function() {
-    ok(3 === __, 'what is exactly equal to 3?');
+    ok(3 === 3, 'what is exactly equal to 3?');
 });
 
 test("equality with type coercion", function() {
diff --git a/topics/about_operators.js b/topics/about_operators.js
@@ -7,7 +7,7 @@ test("addition", function() {
   for (var i = 0; i <= 5; i++) {
     result = result + i;
   }
-  equal(__, result, "What is the value of result?");
+  equal(15, result, "What is the value of result?");
 });
 
 test("assignment addition", function() {
@@ -16,23 +16,23 @@ test("assignment addition", function() {
     //the code below is just like saying result = result + i; but is more concise
     result += i;
   }
-  equal(__, result, "What is the value of result?");
+  equal(15, result, "What is the value of result?");
 });
 
 test("subtraction", function() {
   var result = 5;
   for (var i = 0; i <= 2; i++) {
     result = result - i;
   }
-  equal(__, result, "What is the value of result?");
+  equal(2, result, "What is the value of result?");
 });
 
 test("assignment subtraction", function() {
   var result = 5;
   for (var i = 0; i <= 2; i++) {
     result -= i;
   }
-  equal(__, result, "What is the value of result?");
+  equal(2, result, "What is the value of result?");
 });
 
 //Assignment operators are available for multiplication and division as well
@@ -43,5 +43,5 @@ test("modulus", function() {
   var x = 5;
   //again this is exactly the same as result = result % x
   result %= x;
-  equal(__, result, "What is the value of result?");
+  equal(0, result, "What is the value of result?");
 });
