implemented objects

ggerritsen · ggerritsen · commit 93c15585fc37 · 2013-03-09T09:42:45.000-05:00
diff --git a/topics/about_objects.js b/topics/about_objects.js
@@ -3,30 +3,30 @@ module("About Objects (topics/about_objects.js)");
 
 test("object type", function() {
     var empty_object = {};
-    equals(typeof(empty_object), __, 'what is the type of an object?');
+    equals(typeof(empty_object), "object", 'what is the type of an object?');
 });
 
 test("object literal notation", function() {
     var person = {
-        __:__,
-        __:__
+        name : "Amory Blaine",
+        age : 102
     };		
     equals(person.name, "Amory Blaine", 'what is the person\'s name?');
     equals(person.age, 102, 'what is the person\'s age?');
 });
 
 test("dynamically adding properties", function() {
     var person = {};
-    person.__ = "Amory Blaine";
-    person.__ = 102;
+    person.name = "Amory Blaine";
+    person.age = 102;
     equals(person.name, "Amory Blaine", 'what is the person\'s name?');
     equals(person.age, 102, 'what is the person\'s age?');
 }); 
 
 test("adding properties from strings", function() {
     var person = {};
-    person["__"] = "Amory Blaine";
-    person["__"] = 102;
+    person["name"] = "Amory Blaine";
+    person["age"] = 102;
     equals(person.name, "Amory Blaine", 'what is the person\'s name?');
     equals(person.age, 102, 'what is the person\'s age?');
 });
@@ -36,7 +36,7 @@ test("adding functions", function() {
         name: "Amory Blaine",
         age: 102,
         toString: function() {
-            return __;  // HINT: use the 'this' keyword to refer to the person object.
+            return "I " + this.name + " am " + this.age + " years old.;  // HINT: use the 'this' keyword to refer to the person object.
         }
     };
     equals(person.toString(), "I Amory Blaine am 102 years old.", 'what should the toString function be?');
