Skip to content

Commit 1cc91c8

Browse files
E.J. ElliottE.J. Elliott
E.J. Elliott
authored and
E.J. Elliott
committed
functions and closures finished
1 parent 95b355e commit 1cc91c8

File tree

7 files changed

+40
-38
lines changed

7 files changed

+40
-38
lines changed

‎topics/about_functions_and_closure.js‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ test("defining functions directly", function() {
77
result = "b";
88
};
99
changeResult();
10-
equal(__, result, 'what is the value of result?');
10+
equal("b", result, 'what is the value of result?');
1111
});
1212

1313
test("assigning functions to variables", function() {
1414
var triple = function(input) {
1515
return input * 3;
1616
};
17-
equal(__, triple(4), 'what is triple 4?');
17+
equal(12, triple(4), 'what is triple 4?');
1818
});
1919

2020
test("self invoking functions", function() {
@@ -23,23 +23,25 @@ test("self invoking functions", function() {
2323
// self invoking functions are used to provide scoping and to alias variables
2424
(function(pv) {
2525
var secretValue = "password";
26-
equal(__, pv, 'what is the value of pv?');
27-
equal("__", typeof(secretValue), "is secretValue available in this context?");
28-
equal("__", typeof(publicValue), "is publicValue available in this context?");
26+
equal("shared", pv, 'what is the value of pv?');
27+
equal("string", typeof(secretValue), "is secretValue available in this context?");
28+
equal("string", typeof(publicValue), "is publicValue available in this context?");
2929
})(publicValue);
3030

31-
equal("__", typeof(secretValue), "is secretValue available in this context?");
32-
equal("__", typeof(publicValue), "is publicValue available in this context?");
31+
equal("undefined", typeof(secretValue), "is secretValue available in this context?");
32+
equal("string", typeof(publicValue), "is publicValue available in this context?");
3333
});
3434

3535
test("arguments array", function() {
3636
var add = function() {
3737
var total = 0;
3838
for(var i = 0; i < arguments.length; i++) {
39+
total += arguments[i];
3940
// complete the implementation of this method so that it returns the sum of its arguments
4041
// __
4142
}
4243
// __
44+
return total;
4345
};
4446

4547
equal(15, add(1,2,3,4,5), "add 1,2,3,4,5");
@@ -57,7 +59,7 @@ test("using call to invoke function",function(){
5759
//function, and the arguments to be sent to the function,multiple arguments are separated by commas.
5860
var result = invokee.call("I am this!", "Where did it come from?");
5961

60-
equal(__, result, "what will the value of invokee's this be?");
62+
equal("I am this!Where did it come from?", result, "what will the value of invokee's this be?");
6163
});
6264

6365
test("using apply to invoke function",function(){
@@ -70,6 +72,6 @@ test("using apply to invoke function",function(){
7072
//function and the second is the array of arguments to be passed into the called function.
7173
var result = invokee.apply("I am this!", ["I am arg1","I am arg2"]);
7274

73-
equal(__, result, "what will the value of invokee's this be?");
75+
equal("I am this!I am arg1I am arg2", result, "what will the value of invokee's this be?");
7476
});
7577

‎topics/about_prototypal_inheritance.js‎

Lines changed: 5 additions & 5 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-
equal(__, eric.sayHi(), 'what will Eric say?');
19+
equal("Hello, my name is Eric", eric.sayHi(), '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-
equal(__, bobby.favouriteSaying(), "what is Bobby's favourite saying?");
29+
equal("Bobby's favourite saying is Hello, my name is Bobby", bobby.favouriteSaying(), "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-
equal(__, paul.numberOfLettersInName(), "how long is Paul's name?");
39+
equal(4, paul.numberOfLettersInName(), "how long is Paul's name?");
4040
});
4141

4242
// helper function for inheritance.
@@ -56,6 +56,6 @@ extend(Bat, Mammal);
5656

5757
test("Inheritance", function() {
5858
var lenny = new Bat("Lenny", "1.5m");
59-
equal(__, lenny.sayHi(), "what does Lenny say?");
60-
equal(__, lenny.wingspan, "what is Lenny's wingspan?");
59+
equal("Hello, my name is Lenny", lenny.sayHi(), "what does Lenny say?");
60+
equal("1.5m", lenny.wingspan, "what is Lenny's wingspan?");
6161
});

‎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-
equal(__, child.hasOwnProperty('a'), 'child.hasOwnProperty(\'a\')?');
31-
equal(__, child.hasOwnProperty('b'), 'child.hasOwnProperty(\'b\')?');
30+
equal(true, child.hasOwnProperty('a'), 'child.hasOwnProperty(\'a\')?');
31+
equal(true, child.hasOwnProperty('b'), 'child.hasOwnProperty(\'b\')?');
3232
});
3333

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

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

4444

4545
test("Is there a 'c' own property on child?", function () {
46-
equal(__, child.hasOwnProperty('c'), 'child.hasOwnProperty(\'c\')?');
46+
equal(false, child.hasOwnProperty('c'), '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-
equal(__, child.c, 'what is the value of child.c?');
52+
equal(4, child.c, '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-
equal(__, child.d, 'what is the value of child.d?');
60+
equal(null, child.d, 'what is the value of child.d?');
6161
});
6262

6363

‎topics/about_reflection.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test("property enumeration", function() {
2525
keys.push(propertyName);
2626
values.push(person[propertyName]);
2727
}
28-
ok(keys.equalTo(['keys','values','person']), 'what are the property names of the object?');
28+
ok(keys.equalTo(['name','age','unemployed']), 'what are the property names of the object?');
2929
ok(values.equalTo(['Amory Blaine',102,true]), 'what are the property values of the object?');
3030
});
3131

@@ -37,8 +37,8 @@ test("hasOwnProperty", function() {
3737
for (propertyName in b) {
3838
keys.push(propertyName);
3939
}
40-
equal(1, keys.length, 'how many elements are in the keys array?');
41-
deepEqual([propertyName, b], keys, 'what are the properties of the array?');
40+
equal(2, keys.length, 'how many elements are in the keys array?');
41+
deepEqual(['bprop', 'aprop'], keys, 'what are the properties of the array?');
4242

4343
// hasOwnProperty returns true if the parameter is a property directly on the object,
4444
// but not if it is a property accessible via the prototype chain.
@@ -49,15 +49,15 @@ test("hasOwnProperty", function() {
4949
}
5050
}
5151
equal(1, ownKeys.length, 'how many elements are in the ownKeys array?');
52-
deepEqual([propertyName], ownKeys, 'what are the own properties of the array?');
52+
deepEqual(['bprop'], ownKeys, 'what are the own properties of the array?');
5353
});
5454

5555
test("constructor property", function () {
5656
var a = new A();
5757
var b = new B();
58-
equal(var, typeof(a.constructor), "what is the type of a's constructor?");
59-
equal(a, a.constructor.name, "what is the name of a's constructor?");
60-
equal(a, b.constructor.name, "what is the name of b's constructor?");
58+
equal("function", typeof(a.constructor), "what is the type of a's constructor?");
59+
equal("A", a.constructor.name, "what is the name of a's constructor?");
60+
equal("A", b.constructor.name, "what is the name of b's constructor?");
6161
});
6262

6363
test("eval", function() {

‎topics/about_regular_expressions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module("About Regular Expressions (topics/about_regular_expressions.js)");
44
test("exec", function() {
55
var numberFinder = /(\d).*(\d)/;
66
var results = numberFinder.exec("what if 6 turned out to be 9?");
7-
ok(results.equalTo([__, __, __]), 'what is the value of results?');
7+
ok(results.equalTo([6, 9, 54]), 'what is the value of results?');
88
});
99

1010
test("test", function() {

‎topics/about_scope.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module("About Scope (topics/about_scope.js)");
33
thisIsAGlobalVariable = 77;
44

55
test("global variables", function() {
6-
equal(__, thisIsAGlobalVariable, 'is thisIsAGlobalVariable defined in this scope?');
6+
equal(77, thisIsAGlobalVariable, 'is thisIsAGlobalVariable defined in this scope?');
77
});
88

99
test("variables declared inside of a function", function() {
@@ -12,10 +12,10 @@ test("variables declared inside of a function", function() {
1212
// this is a self-invoking function. Notice that it calls itself at the end ().
1313
(function() {
1414
var innerVariable = "inner";
15-
equal(__, outerVariable, 'is outerVariable defined in this scope?');
16-
equal(__, innerVariable, 'is innerVariable defined in this scope?');
15+
equal("outer", outerVariable, 'is outerVariable defined in this scope?');
16+
equal("inner", innerVariable, 'is innerVariable defined in this scope?');
1717
})();
1818

19-
equal(__, outerVariable, 'is outerVariable defined in this scope?');
20-
equal(__, typeof(innerVariable), 'is innerVariable defined in this scope?');
19+
equal("outer", outerVariable, 'is outerVariable defined in this scope?');
20+
equal("undefined", typeof(innerVariable), 'is innerVariable defined in this scope?');
2121
});

‎topics/about_this.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test("'this' inside a method", function () {
44
var person = {
55
name: 'bob',
66
intro: function () {
7-
return "Hello, my name is " + this.__;
7+
return "Hello, my name is " + this.name;
88
}
99
}
1010
equal(person.intro(), "Hello, my name is bob", "If an object has a method can you access properties inside it?");
@@ -22,7 +22,7 @@ test("'this' on unattached function", function () {
2222

2323
// if the function is not called as an object property 'this' is the global context
2424
// (window in a browser). This is an example. Please do not do this in practise.
25-
window.__ = 'Peter';
25+
window.globalName = 'Peter';
2626
equal(alias(), "Hello, my name is Peter", "What does 'this' refer to when it is not part of an object?");
2727
});
2828

@@ -35,7 +35,7 @@ test("'this' set explicitly", function () {
3535
}
3636

3737
// calling a function with 'call' lets us assign 'this' explicitly
38-
var message = person.intro.call({__: "Frank"});
38+
var message = person.intro.call({ name : "Frank"});
3939
equal(message, "Hello, my name is Frank", "What does 'this' refer to when you use the 'call()' method?");
4040
});
4141

0 commit comments

Comments
 (0)