Skip to content

Commit 6b4ee36

Browse files
grekogreko
committed
after some learing
1 parent 835fc62 commit 6b4ee36

13 files changed

Lines changed: 82 additions & 81 deletions

‎topics/about_arrays.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,33 @@ module("About Arrays (topics/about_arrays.js)");
33

44
test("array literal syntax and indexing", function() {
55
var favouriteThings = ["cellar door", 42, true]; // note that array elements do not have to be of the same type
6-
equals(favouriteThings[0], __, 'what is in the first position of the array?');
7-
equals(favouriteThings[1], __, 'what is in the second position of the array?');
8-
equals(favouriteThings[2], __, 'what is in the third position of the array?');
6+
equals(favouriteThings[0], "cellar door", 'what is in the first position of the array?');
7+
equals(favouriteThings[1], 42, 'what is in the second position of the array?');
8+
equals(favouriteThings[2], true, 'what is in the third position of the array?');
99
});
1010

1111
test("array type", function() {
12-
equals(typeof([]), __, 'what is the type of an array?');
12+
equals(typeof([]), "object", 'what is the type of an array?');
1313
});
1414

1515
test("length", function() {
1616
var collection = ['a','b','c'];
17-
equals(collection.length, __, 'what is the length of the collection array?');
17+
equals(collection.length, 3, 'what is the length of the collection array?');
1818
});
1919

2020
test("splice", function() {
2121
var daysOfWeek = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
22-
var workingWeek = daysOfWeek.splice(__, __);
23-
ok(workingWeek.equalTo([__]), 'what is the value of workingWeek?');
24-
ok(daysOfWeek.equalTo([__]), 'what is the value of daysOfWeek?');
22+
var workingWeek = daysOfWeek.splice(0,5);
23+
ok(workingWeek.equalTo(['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday']), 'what is the value of workingWeek?');
24+
ok(daysOfWeek.equalTo(['Saturday', 'Sunday']), 'what is the value of daysOfWeek?');
25+
2526
});
2627

2728
test("stack methods", function() {
2829
var stack = [];
2930
stack.push("first");
3031
stack.push("second");
3132

32-
equals(stack.pop(), __, 'what will be the first value popped off the stack?');
33-
equals(stack.pop(), __, 'what will be the second value popped off the stack?');
33+
equals(stack.pop(), "second", 'what will be the first value popped off the stack?');
34+
equals(stack.pop(), "first", 'what will be the second value popped off the stack?');
3435
});

‎topics/about_asserts.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
module("About Asserts (topics/about_asserts.js)");
33

44
test("ok", function() {
5-
ok(__, 'what will satisfy the ok assertion?');
5+
ok("ok", 'what will satisfy the ok assertion?');
66
});
77

88
test("not", function() {
9-
not(__, 'what is a false value?');
9+
not(false, 'what is a false value?');
1010
});
1111

1212
test("equals", function() {
13-
equals(1+1, __, 'what will satisfy the equals assertion?');
13+
equals(1+1,2, 'what will satisfy the equals assertion?');
1414
});

‎topics/about_assignment.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
module("About Assignment (topics/about_assignment.js)");
33

44
test("local variables", function() {
5-
var temp = __;
5+
var temp = 1;
66
equals(1, temp, "Assign a value to the variable temp");
77
});
88

99
test("global variables", function() {
1010
temp = 1;
11-
equals(temp, window.__, 'global variables are assigned to the window object');
11+
equals(temp, window.temp, 'global variables are assigned to the window object');
1212
});

‎topics/about_control_structures.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ test("if", function() {
55
if (2 > 0) {
66
isPositive = true;
77
}
8-
equals(isPositive, __, 'what is the value of isPositive?');
8+
equals(isPositive, true, 'what is the value of isPositive?');
99
});
1010

1111
test("for", function() {
1212
var counter = 10;
1313
for (var i = 1; i <= 3; i++) {
1414
counter = counter + i;
1515
}
16-
equals(counter, __, 'what is the value of counter?');
16+
equals(counter, 16, 'what is the value of counter?');
1717
});
1818

1919
test("for in", function() {
@@ -27,15 +27,15 @@ test("for in", function() {
2727
for (property_name in person) {
2828
result = result + property_name;
2929
};
30-
equals(result, __, 'what is the value of result?');
30+
equals(result, "nameage", 'what is the value of result?');
3131
});
3232

3333
test("ternary operator", function() {
3434
var fruit = true ? "apple" : "orange";
35-
equals(fruit, __, 'what is the value of fruit?');
35+
equals(fruit, "apple", 'what is the value of fruit?');
3636

3737
fruit = false ? "apple" : "orange";
38-
equals(fruit, __, 'now what is the value of fruit?');
38+
equals(fruit, "orange", 'now what is the value of fruit?');
3939
});
4040

4141
test("switch", function() {
@@ -48,7 +48,7 @@ test("switch", function() {
4848
result = 2;
4949
break;
5050
}
51-
equals(result, __, 'what is the value of result?');
51+
equals(result, 2, 'what is the value of result?');
5252
});
5353

5454
test("switch default case", function() {
@@ -64,10 +64,10 @@ test("switch default case", function() {
6464
result = "Merry";
6565
break;
6666
}
67-
equals(result, __, 'what is the value of result?');
67+
equals(result,"Merry", 'what is the value of result?');
6868
});
6969

7070
test("null coalescing", function() {
7171
var result = null || "a value";
72-
equals(result, __, 'what is the value of result?');
72+
equals(result, "a value", 'what is the value of result?');
7373
});

‎topics/about_equality.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
module("About Equality (topics/about_equality.js)");
33

44
test("numeric equality", function() {
5-
equals(3 + __, 7, 'hmmmm?');
5+
equals(3 + 4, 7, 'hmmmm?');
66
});
77

88
test("string equality", function() {
9-
equals("3" + __, "37", "concatenate the strings");
9+
equals("3" + "7", "37", "concatenate the strings");
1010
});
1111

1212
test("equality without type coercion", function() {
13-
ok(3 === __, 'what is exactly equal to 3?');
13+
ok(3 === 3, 'what is exactly equal to 3?');
1414
});
1515

1616
test("equality with type coercion", function() {
17-
ok(3 == "__", 'what string is equal to 3, with type coercion?');
17+
ok(3 == " 3 ", 'what string is equal to 3, with type coercion?');
1818
});
1919

2020
test("string literals", function() {
21-
equals("frankenstein", '__', "quote types are interchangable, but must match.");
21+
equals("frankenstein", 'frankenstein', "quote types are interchangable, but must match.");
2222
});

‎topics/about_numbers.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ module("About Numbers (topics/about_numbers.js)");
44
test("types", function() {
55
var typeOfIntegers = typeof(6);
66
var typeOfFloats = typeof(3.14159);
7-
equals(typeOfIntegers === typeOfFloats, __, 'are ints and floats the same type?');
8-
equals(typeOfIntegers, __, 'what is the javascript numeric type?');
9-
equals(1.0, __, 'what is a integer number equivalent to 1.0?');
7+
equals(typeOfIntegers === typeOfFloats,true, 'are ints and floats the same type?');
8+
equals(typeOfIntegers, "number", 'what is the javascript numeric type?');
9+
equals(1.0, 1, 'what is a integer number equivalent to 1.0?');
1010
});
1111

1212
test("NaN", function() {
1313
var resultOfFailedOperations = 7/'apple';
14-
equals(isNaN(resultOfFailedOperations), __, 'what will satisfy the equals assertion?');
15-
equals(resultOfFailedOperations == NaN, __, 'is NaN == NaN?');
14+
equals(isNaN(resultOfFailedOperations), true, 'what will satisfy the equals assertion?');
15+
equals(resultOfFailedOperations == NaN, false, 'is NaN == NaN?');
1616
});

‎topics/about_objects.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@ module("About Objects (topics/about_objects.js)");
33

44
test("object type", function() {
55
var empty_object = {};
6-
equals(typeof(empty_object), __, 'what is the type of an object?');
6+
equals(typeof(empty_object), "object", 'what is the type of an object?');
77
});
88

99
test("object literal notation", function() {
1010
var person = {
11-
__:__,
12-
__:__
11+
name:"Amory Blaine",
12+
age:102
1313
};
1414
equals(person.name, "Amory Blaine", 'what is the person\'s name?');
1515
equals(person.age, 102, 'what is the person\'s age?');
1616
});
1717

1818
test("dynamically adding properties", function() {
1919
var person = {};
20-
person.__ = "Amory Blaine";
21-
person.__ = 102;
20+
person.name = "Amory Blaine";
21+
person.age = 102;
2222
equals(person.name, "Amory Blaine", 'what is the person\'s name?');
2323
equals(person.age, 102, 'what is the person\'s age?');
2424
});
2525

2626
test("adding properties from strings", function() {
2727
var person = {};
28-
person["__"] = "Amory Blaine";
29-
person["__"] = 102;
28+
person["name"] = "Amory Blaine";
29+
person["age"] = 102;
3030
equals(person.name, "Amory Blaine", 'what is the person\'s name?');
3131
equals(person.age, 102, 'what is the person\'s age?');
3232
});
@@ -36,7 +36,7 @@ test("adding functions", function() {
3636
name: "Amory Blaine",
3737
age: 102,
3838
toString: function() {
39-
return __; // HINT: use the 'this' keyword to refer to the person object.
39+
return "I " + this.name + " am " + this.age+ " years old."; // HINT: use the 'this' keyword to refer to the person object.
4040
}
4141
};
4242
equals(person.toString(), "I Amory Blaine am 102 years old.", 'what should the toString function be?');

‎topics/about_operators.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ test("addition", function() {
77
for (var i = 0; i <= 5; i++) {
88
result = result + i;
99
}
10-
equals(result, __, "What is the value of result?");
10+
equals(result, 15, "What is the value of result?");
1111
});
1212

1313
test("assignment addition", function() {
@@ -16,23 +16,23 @@ test("assignment addition", function() {
1616
//the code below is just like saying result = result + i; but is more concise
1717
result += i;
1818
}
19-
equals(result, __, "What is the value of result?");
19+
equals(result, 15, "What is the value of result?");
2020
});
2121

2222
test("subtraction", function() {
2323
var result = 5;
2424
for (var i = 0; i <= 2; i++) {
2525
result = result - i;
2626
}
27-
equals(result, __, "What is the value of result?");
27+
equals(result, 2, "What is the value of result?");
2828
});
2929

3030
test("assignment subtraction", function() {
3131
var result = 5;
3232
for (var i = 0; i <= 2; i++) {
3333
result -= i;
3434
}
35-
equals(result, __, "What is the value of result?");
35+
equals(result, 2, "What is the value of result?");
3636
});
3737

3838
//Assignment operators are available for multiplication and division as well
@@ -43,5 +43,5 @@ test("modulus", function() {
4343
var x = 5;
4444
//again this is exactly the same as result = result % x
4545
result %= x;
46-
equals(result, __, "What is the value of result?");
46+
equals(result, 0, "What is the value of result?");
4747
});

‎topics/about_prototypal_inheritance.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Mammal.prototype = {
1616

1717
test("defining a 'class'", function() {
1818
var eric = new Mammal("Eric");
19-
equals(eric.sayHi(), __, 'what will Eric say?');
19+
equals(eric.sayHi(), "Hello, my name is Eric", 'what will Eric say?');
2020
});
2121

2222
// add another function to the Mammal 'type' that uses the sayHi function
@@ -26,7 +26,7 @@ Mammal.prototype.favouriteSaying = function() {
2626

2727
test("more functions", function() {
2828
var bobby = new Mammal("Bobby");
29-
equals(bobby.favouriteSaying(), __, "what is Bobby's favourite saying?");
29+
equals(bobby.favouriteSaying(), "Bobby's favourite saying is Hello, my name is Bobby", "what is Bobby's favourite saying?");
3030
});
3131

3232
test("calling functions added to a prototype after an object was created", function() {
@@ -36,7 +36,7 @@ test("calling functions added to a prototype after an object was created", funct
3636
};
3737
// the following statement asks the paul object to call a function that was added
3838
// to the Mammal prototype after paul was constructed.
39-
equals(paul.numberOfLettersInName(), __, "how long is Paul's name?");
39+
equals(paul.numberOfLettersInName(),4, "how long is Paul's name?");
4040
});
4141

4242
// helper function for inheritance.

‎topics/about_prototype_chain.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,37 +27,37 @@ child.b = 2;
2727
* */
2828

2929
test("Is there an 'a' and 'b' own property on child?", function () {
30-
equals(child.hasOwnProperty('a'), __, 'child.hasOwnProperty(\'a\')?');
31-
equals(child.hasOwnProperty('b'), __, 'child.hasOwnProperty(\'b\')?');
30+
equals(child.hasOwnProperty('a'), true, 'child.hasOwnProperty(\'a\')?');
31+
equals(child.hasOwnProperty('b'), true, 'child.hasOwnProperty(\'b\')?');
3232
});
3333

3434
test("Is there an 'a' and 'b' property on child?", function () {
35-
equals(child.a, __, 'what is \'a\' value?');
36-
equals(child.b, __, 'what is \'b\' value?');
35+
equals(child.a,1, 'what is \'a\' value?');
36+
equals(child.b,2, 'what is \'b\' value?');
3737
});
3838

3939
test("If 'b' was removed, whats b value?", function () {
4040
delete child.b;
41-
equals(child.b, __, 'what is \'b\' value now?');
41+
equals(child.b, 3, 'what is \'b\' value now?');
4242
});
4343

4444

4545
test("Is there a 'c' own property on child?", function () {
46-
equals(child.hasOwnProperty('c'), __, 'child.hasOwnProperty(\'c\')?');
46+
equals(child.hasOwnProperty('c'), false, 'child.hasOwnProperty(\'c\')?');
4747
});
4848

4949
// Is there a 'c' own property on child? No, check its prototype
5050
// Is there a 'c' own property on child.[[Prototype]]? Yes, its value is...
5151
test("Is there a 'c' property on child?", function () {
52-
equals(child.c, __, 'what is the value of child.c?');
52+
equals(child.c, 4, 'what is the value of child.c?');
5353
});
5454

5555

5656
// Is there a 'd' own property on child? No, check its prototype
5757
// Is there a 'd' own property on child.[[Prototype]]? No, check it prototype
5858
// child.[[Prototype]].[[Prototype]] is null, stop searching, no property found, return...
5959
test("Is there an 'd' property on child?", function () {
60-
equals(child.d, __, 'what is the value of child.d?');
60+
equals(child.d, undefined, 'what is the value of child.d?');
6161
});
6262

6363

0 commit comments

Comments
 (0)