Fixes all tests

objects.py

@@ -5,40 +5,53 @@
 
 
 class Dessert(object):
-
-    def __init__():
+    def __init__(self, price, calories=None):
         # Edit me!
         # You need to be able to initialize a Dessert object with arguments:
         # price - required
         # calories - optional
 
         # This should set the object's price and calories, accessible by
         # .price and .calories respectively.
+        """ For creating desserts """
+        self.price = price
+        self.calories = calories
         pass
 
     # Add a calories_per_dollar method that returns the calories per dollar
     # for the dessert.
+    def calories_per_dollar(self):
+        if self.calories != None:
+            cal_per_dollar = self.calories / self.price
+            return cal_per_dollar
+        else:
+            return None
 
     # Define a method is_a_cake on Dessert that returns False
+    def is_a_cake(self):
+        return False
 
 
 class Cake(Dessert):
-
-    def __init__():
+    price = 5
+    calories = 200
+    def __init__(self, kind):
         # Edit me!
         # Cakes all cost the same amount and have the same calories, so their
         # price and calories can be set at the class-level, not during init.
         # However, we need to be able to tell cakes apart. Accept argument:
         # kind - required
-
+        self.kind = kind
         pass
 
     # Define a method is_a_cake on Cake that returns True
     # (This will override the one on Dessert)
+    def is_a_cake(self):
+        if self.price == 5 and self.calories == 200:
+            return True
 
 
 class Menu(object):
-
     def __init__(self, items):
         self.items = items
 
@@ -49,3 +62,18 @@ def desserts(self):
             if isinstance(item, Dessert):
                 desserts.append(item)
         return desserts
+
+    def cakes(self):
+        cakes = []
+        for item in self.items:
+            if isinstance(item, Cake):
+                cakes.append(item)
+        return cakes
+
+
+
+
+
+
+
+

test_objects.py

@@ -79,17 +79,19 @@ def test_object_relationships():
     # NOTE: To test that it really works, you probably want to create a Menu
     # with a list that includes things that *aren't* desserts, like integers.
 
-    assert False  # Take this line out, it forces the test to fail
+    # assert False  # Take this line out, it forces the test to fail
 
     # Create a cakes() method that does the same thing.
     # This code is the test for cakes():
 
     dessert1 = Dessert(price=10)
     dessert2 = Dessert(price=12)
     dessert3 = Dessert(price=13)
+    dessert4 = 5
+    dessert5 = 'cat'
     cake1 = Cake(kind='sponge')
     cake2 = Cake(kind='birthday')
-    my_desserts = [dessert1, dessert2, dessert3, cake1, cake2]
+    my_desserts = [dessert1, dessert2, dessert3, dessert4, dessert5, cake1, cake2]
     my_menu = Menu(my_desserts)
     cakes = my_menu.cakes()
     # There should only be two items in cakes!