Reformatted test file to test file plus test data file.

Author: BethanyG

exercises/concept/mecha-munch-management/dict_methods.py

@@ -1,3 +1,70 @@
+# """Functions to manage a users shopping cart items."""
+#
+#
+# def add_item(current_cart, items_to_add):
+#     """Add items to shopping cart.
+#
+#     :param current_cart: dict - the current shopping cart.
+#     :param items_to_add: iterable - items to add to the cart.
+#     :return: dict - the updated user cart dictionary.
+#     """
+#
+#     pass
+#
+#
+# def read_notes(notes):
+#     """Create user cart from an iterable notes entry.
+#
+#     :param notes: iterable of items to add to cart.
+#     :return: dict - a user shopping cart dictionary.
+#     """
+#
+#     pass
+#
+#
+# def update_recipes(ideas, recipe_updates):
+#     """Update the recipe ideas dictionary.
+#
+#     :param ideas: dict - The "recipe ideas" dict.
+#     :param recipe_updates: dict - dictionary with updates for the ideas section.
+#     :return: dict - updated "recipe ideas" dict.
+#     """
+#
+#     pass
+#
+#
+# def sort_entries(cart):
+#     """Sort a users shopping cart in alphabetically order.
+#
+#     :param cart: dict - a users shopping cart dictionary.
+#     :return: dict - users shopping cart sorted in alphabetical order.
+#     """
+#
+#     pass
+#
+#
+# def send_to_store(cart, aisle_mapping):
+#     """Combine users order to aisle and refrigeration information.
+#
+#     :param cart: dict - users shopping cart dictionary.
+#     :param aisle_mapping: dict - aisle and refrigeration information dictionary.
+#     :return: dict - fulfillment dictionary ready to send to store.
+#     """
+#
+#     pass
+#
+#
+# def update_store_inventory(fulfillment_cart, store_inventory):
+#     """Update store inventory levels with user order.
+#
+#     :param fulfillment cart: dict - fulfillment cart to send to store.
+#     :param store_inventory: dict - store available inventory
+#     :return: dict - store_inventory updated.
+#     """
+#
+#     pass
+"""Functions to manage a users shopping cart items."""
+
 """Functions to manage a users shopping cart items."""
 
 
@@ -9,7 +76,11 @@ def add_item(current_cart, items_to_add):
     :return: dict - the updated user cart dictionary.
     """
 
-    pass
+    for item in items_to_add:
+        current_cart.setdefault(item, 0)
+        current_cart[item] += 1
+
+    return current_cart
 
 
 def read_notes(notes):
@@ -19,7 +90,7 @@ def read_notes(notes):
     :return: dict - a user shopping cart dictionary.
     """
 
-    pass
+    return dict.fromkeys(notes, 1)
 
 
 def update_recipes(ideas, recipe_updates):
@@ -30,7 +101,8 @@ def update_recipes(ideas, recipe_updates):
     :return: dict - updated "recipe ideas" dict.
     """
 
-    pass
+    ideas.update(recipe_updates)
+    return ideas
 
 
 def sort_entries(cart):
@@ -40,7 +112,7 @@ def sort_entries(cart):
     :return: dict - users shopping cart sorted in alphabetical order.
     """
 
-    pass
+    return dict(sorted(cart.items()))
 
 
 def send_to_store(cart, aisle_mapping):
@@ -50,8 +122,12 @@ def send_to_store(cart, aisle_mapping):
     :param aisle_mapping: dict - aisle and refrigeration information dictionary.
     :return: dict - fulfillment dictionary ready to send to store.
     """
+    fulfillment_cart = {}
 
-    pass
+    for key in cart.keys():
+        fulfillment_cart[key] = [cart[key]] + aisle_mapping[key]
+
+    return dict(sorted(fulfillment_cart.items(), reverse=True))
 
 
 def update_store_inventory(fulfillment_cart, store_inventory):
@@ -62,4 +138,9 @@ def update_store_inventory(fulfillment_cart, store_inventory):
     :return: dict - store_inventory updated.
     """
 
-    pass
+    for key, values in fulfillment_cart.items():
+        store_inventory[key][0] = store_inventory[key][0] - values[0]
+        if store_inventory[key][0] == 0:
+            store_inventory[key][0] = 'Out of Stock'
+
+    return store_inventory

exercises/concept/mecha-munch-management/dict_methods_test.py

@@ -1,29 +1,29 @@
 import unittest
 import pytest
 from collections import OrderedDict
-from dict_methods import (add_item,
-                          read_notes,
-                          update_recipes,
-                          sort_entries,
-                          send_to_store,
-                          update_store_inventory)
-
+from dict_methods import (
+    add_item,
+    read_notes,
+    update_recipes,
+    sort_entries,
+    send_to_store,
+    update_store_inventory,
+)
+
+from dict_methods_test_data import (
+    add_item_data,
+    read_notes_data,
+    update_recipes_data,
+    sort_entries_data,
+    send_to_store_data,
+    update_store_inventory_data,
+)
 
 class MechaMunchManagementTest(unittest.TestCase):
 
     @pytest.mark.task(taskno=1)
     def test_add_item(self):
-        input_data = [
-                      ({'Apple': 1, 'Banana': 4 }, ('Apple', 'Banana', 'Orange')),
-                      ({'Orange': 1, 'Raspberry': 1, 'Blueberries': 10}, ['Raspberry', 'Blueberries', 'Raspberry']),
-                      ({'Broccoli': 1, 'Banana': 1}, ('Broccoli', 'Kiwi', 'Kiwi', 'Kiwi', 'Melon', 'Apple', 'Banana', 'Banana'))
-                      ]
-        
-        output_data = [{'Apple': 2, 'Banana': 5, 'Orange': 1},
-                       {'Orange': 1, 'Raspberry': 3, 'Blueberries': 11},
-                       {'Broccoli': 2, 'Banana': 3, 'Kiwi': 3, 'Melon': 1, 'Apple': 1}]
-
-        for variant, (input_data, expected) in enumerate(zip(input_data, output_data), start=1):
+        for variant, (input_data, expected) in enumerate(add_item_data, start=1):
             with self.subTest(f'variation #{variant}', input_data=input_data, expected=expected):
                 actual_result = add_item(input_data[0], input_data[1])
                 error_msg= (f'Called add_item({input_data[0]}, {input_data[1]}). '
@@ -34,13 +34,7 @@ def test_add_item(self):
 
     @pytest.mark.task(taskno=2)
     def test_read_notes(self):
-        input_data = [('Apple', "Banana"), ('Orange', 'Raspberry', 'Blueberries'),
-                      ['Broccoli', 'Kiwi', 'Melon', 'Apple', 'Banana']]
-
-        output_data = [{'Apple': 1, 'Banana': 1}, {'Orange': 1, 'Raspberry': 1, 'Blueberries': 1},
-                       {'Broccoli': 1, 'Kiwi': 1, 'Melon': 1, 'Apple': 1, 'Banana': 1}]
-
-        for variant, (input_data, expected) in enumerate(zip(input_data, output_data), start=1):
+        for variant, (input_data, expected) in enumerate(read_notes_data, start=1):
             with self.subTest(f'variation #{variant}', input_data=input_data, expected=expected):
                 actual_result = read_notes(input_data)
                 error_msg = (f'Called read_notes({input_data}). '
@@ -51,36 +45,7 @@ def test_read_notes(self):
 
     @pytest.mark.task(taskno=3)
     def test_update_recipes(self):
-        input_data = [
-                        ({'Banana Bread' : {'Banana': 1, 'Apple': 1, 'Walnuts': 1, 'Flour': 1, 'Eggs': 2, 'Butter': 1},
-                          'Raspberry Pie' : {'Raspberry': 1, 'Orange': 1, 'Pie Crust': 1, 'Cream Custard': 1}},
-                        (('Banana Bread', {'Banana': 4,  'Walnuts': 2, 'Flour': 1, 'Butter': 1, 'Milk': 2, 'Eggs': 3}),)),
-
-                        ({'Apple Pie': {'Apple': 1, 'Pie Crust': 1, 'Cream Custard': 1},
-                          'Blueberry Pie': {'Blueberries': 1, 'Pie Crust': 1, 'Cream Custard': 1}},
-                        (('Blueberry Pie', {'Blueberries': 2, 'Pie Crust': 1, 'Cream Custard': 1}),
-                         ('Apple Pie', {'Apple': 1, 'Pie Crust': 1, 'Cream Custard': 1}))),
-
-                        ({'Banana Bread' : {'Banana': 1, 'Apple': 1, 'Walnuts': 1, 'Flour': 1, 'Eggs': 2, 'Butter': 1},
-                          'Raspberry Pie' : {'Raspberry': 1, 'Orange': 1, 'Pie Crust': 1, 'Cream Custard': 1},
-                          'Pasta Primavera': {'Eggs': 1, 'Carrots': 1, 'Spinach': 2, 'Tomatoes': 3, 'Parmesan': 2, 'Milk': 1, 'Onion': 1}},
-                        (('Raspberry Pie', {'Raspberry': 3, 'Orange': 1, 'Pie Crust': 1, 'Cream Custard': 1, 'Whipped Cream': 2}),
-                         ('Pasta Primavera', {'Eggs': 1, 'Mixed Veggies': 2, 'Parmesan': 2, 'Milk': 1, 'Spinach': 1, 'Bread Crumbs': 1}),
-                         ('Blueberry Crumble', {'Blueberries': 2, 'Whipped Creme': 2, 'Granola Topping': 2, 'Yogurt': 3})))
-                     ]
-
-        output_data = [
-                        {'Banana Bread': {'Banana': 4,  'Walnuts': 2, 'Flour': 1, 'Butter': 1, 'Milk': 2, 'Eggs': 3},
-                         'Raspberry Pie': {'Raspberry': 1, 'Orange': 1, 'Pie Crust': 1, 'Cream Custard': 1}},
-                        {'Apple Pie': {'Apple': 1, 'Pie Crust': 1, 'Cream Custard': 1},
-                        'Blueberry Pie': {'Blueberries': 2, 'Pie Crust': 1, 'Cream Custard': 1}},
-                        {'Banana Bread': {'Banana': 1, 'Apple': 1, 'Walnuts': 1, 'Flour': 1, 'Eggs': 2, 'Butter': 1},
-                        'Raspberry Pie': {'Raspberry': 3, 'Orange': 1, 'Pie Crust': 1, 'Cream Custard': 1, 'Whipped Cream': 2},
-                        'Pasta Primavera': {'Eggs': 1, 'Mixed Veggies': 2, 'Parmesan': 2, 'Milk': 1, 'Spinach': 1, 'Bread Crumbs': 1},
-                        'Blueberry Crumble': {'Blueberries': 2, 'Whipped Creme': 2, 'Granola Topping': 2, 'Yogurt': 3}}
-                     ]
-
-        for variant, (input_data, expected) in enumerate(zip(input_data, output_data), start=1):
+        for variant, (input_data, expected) in enumerate(update_recipes_data, start=1):
             with self.subTest(f'variation #{variant}', input_data=input_data, expected=expected):
                 actual_result = update_recipes(input_data[0], input_data[1])
                 error_msg = (f'Called update_recipes({input_data[0]}, {input_data[1]}). '
@@ -91,21 +56,7 @@ def test_update_recipes(self):
 
     @pytest.mark.task(taskno=4)
     def test_sort_entries(self):
-        input_data = [
-                      {'Banana': 4, 'Apple': 2, 'Orange': 1, 'Pear': 12},
-                      {'Apple': 3, 'Orange': 5, 'Banana': 1, 'Avocado': 2},
-                      {'Orange': 3, 'Banana': 2, 'Apple': 1},
-                      {'Apple': 2, 'Raspberry': 2, 'Blueberries': 5, 'Broccoli' : 2, 'Kiwi': 1, 'Melon': 4}
-                     ]
-
-        output_data = [
-                        {'Apple': 2, 'Banana': 4, 'Orange': 1, 'Pear': 12},
-                        {'Apple': 3, 'Avocado': 2, 'Banana': 1, 'Orange': 5},
-                        {'Apple': 1, 'Banana': 2, 'Orange': 3},
-                        {'Apple' : 2, 'Blueberries': 5, 'Broccoli': 2, 'Kiwi': 1, 'Melon': 4, 'Raspberry': 2}
-                      ]
-
-        for variant, (input_data, expected) in enumerate(zip(input_data, output_data), start=1):
+        for variant, (input_data, expected) in enumerate(sort_entries_data, start=1):
             with self.subTest(f'variation #{variant}', input_data=input_data, expecred=expected):
                 actual_result = sort_entries(input_data)
                 error_msg = (f'Called sort_entries({input_data}). '
@@ -119,49 +70,7 @@ def test_sort_entries(self):
 
     @pytest.mark.task(taskno=5)
     def test_send_to_store(self):
-        input_data = [
-                        ({'Banana': 3, 'Apple': 2, 'Orange': 1, 'Milk': 2},
-                         {'Banana': ['Aisle 5', False], 'Apple': ['Aisle 4', False],
-                          'Orange': ['Aisle 4', False], 'Milk': ['Aisle 2', True]}),
-
-                        ({'Kiwi': 3, 'Juice': 5, 'Yoghurt': 2, 'Milk': 5},
-                         {'Kiwi': ['Aisle 6', False], 'Juice': ['Aisle 5', False],
-                          'Yoghurt': ['Aisle 2', True], 'Milk': ['Aisle 2', True]}),
-
-                        ({'Apple': 2, 'Raspberry': 2, 'Blueberries': 5,
-                          'Broccoli': 2, 'Kiwi': 1, 'Melon': 4},
-
-                         {'Apple': ['Aisle 1', False], 'Raspberry': ['Aisle 6', False],
-                          'Blueberries': ['Aisle 6', False], 'Broccoli': ['Aisle 3', False],
-                          'Kiwi': ['Aisle 6', False], 'Melon': ['Aisle 6', False]}),
-
-                        ({'Orange': 1},
-                         {'Banana': ['Aisle 5', False], 'Apple': ['Aisle 4', False],
-                          'Orange': ['Aisle 4', False], 'Milk': ['Aisle 2', True]}),
-
-                        ({'Banana': 3, 'Apple': 2, 'Orange': 1},
-                         {'Banana': ['Aisle 5', False], 'Apple': ['Aisle 4', False],
-                          'Orange': ['Aisle 4', False], 'Milk': ['Aisle 2', True]}),
-                      ]
-
-        output_data = [
-                        {'Orange': [1, 'Aisle 4', False], 'Milk': [2, 'Aisle 2', True],
-                         'Banana': [3, 'Aisle 5', False], 'Apple': [2, 'Aisle 4', False]},
-
-                        {'Yoghurt': [2, 'Aisle 2', True], 'Milk': [5, 'Aisle 2', True],
-                         'Kiwi': [3, 'Aisle 6', False], 'Juice': [5, 'Aisle 5', False]},
-
-                        {'Raspberry': [2, 'Aisle 6', False], 'Melon': [4, 'Aisle 6', False],
-                         'Kiwi': [1, 'Aisle 6', False], 'Broccoli': [2, 'Aisle 3', False],
-                         'Blueberries': [5, 'Aisle 6', False], 'Apple': [2, 'Aisle 1', False]},
-
-                        {'Orange': [1, 'Aisle 4', False]},
-
-                        {'Orange': [1, 'Aisle 4', False], 'Banana': [3, 'Aisle 5', False],
-                         'Apple': [2, 'Aisle 4', False]},
-                      ]
-
-        for variant, (input_data, expected) in enumerate(zip(input_data, output_data), start=1):
+        for variant, (input_data, expected) in enumerate(send_to_store_data, start=1):
             with self.subTest(f'variation #{variant}', input_data=input_data, expected=expected):
                 actual_result = send_to_store(input_data[0], input_data[1])
                 error_msg = (f'Called send_to_store({input_data[0]}, {input_data[1]}). '
@@ -175,36 +84,7 @@ def test_send_to_store(self):
 
     @pytest.mark.task(taskno=6)
     def test_update_store_inventory(self):
-        input_data = [
-                        ({'Orange': [1, 'Aisle 4', False], 'Milk': [2, 'Aisle 2', True],
-                          'Banana': [3, 'Aisle 5', False], 'Apple': [2, 'Aisle 4', False]},
-                         {'Banana': [15, 'Aisle 5', False], 'Apple': [12, 'Aisle 4', False],
-                          'Orange': [1, 'Aisle 4', False], 'Milk': [4, 'Aisle 2', True]}),
-
-                        ({'Kiwi': [3, 'Aisle 6', False]},{'Kiwi': [3, 'Aisle 6', False], 'Juice': [5, 'Aisle 5', False],
-                          'Yoghurt': [2, 'Aisle 2', True], 'Milk': [5, 'Aisle 2', True]}),
-
-                        ({'Kiwi': [1, 'Aisle 6', False], 'Melon': [4, 'Aisle 6', False], 'Apple': [2, 'Aisle 1', False],
-                          'Raspberry': [2, 'Aisle 6', False], 'Blueberries': [5, 'Aisle 6', False],
-                          'Broccoli': [1, 'Aisle 3', False]},
-                         {'Apple': [2, 'Aisle 1', False], 'Raspberry': [5, 'Aisle 6', False],
-                          'Blueberries': [10, 'Aisle 6', False], 'Broccoli': [4, 'Aisle 3', False],
-                          'Kiwi': [1, 'Aisle 6', False], 'Melon': [8, 'Aisle 6', False]})
-                      ]
-
-        output_data = [
-                        {'Banana': [12, 'Aisle 5', False], 'Apple': [10, 'Aisle 4', False],
-                         'Orange': ['Out of Stock', 'Aisle 4', False], 'Milk': [2, 'Aisle 2', True]},
-
-                        {'Juice': [5, 'Aisle 5', False], 'Yoghurt': [2, 'Aisle 2', True],
-                         'Milk': [5, 'Aisle 2', True], 'Kiwi': ["Out of Stock", 'Aisle 6', False]},
-
-                        {'Kiwi': ['Out of Stock', 'Aisle 6', False], 'Melon': [4, 'Aisle 6', False],
-                         'Apple': ['Out of Stock', 'Aisle 1', False], 'Raspberry': [3, 'Aisle 6', False],
-                         'Blueberries': [5, 'Aisle 6', False], 'Broccoli': [3, 'Aisle 3', False]}
-                      ]
-
-        for variant, (input_data, expected) in enumerate(zip(input_data, output_data), start=1):
+        for variant, (input_data, expected) in enumerate(update_store_inventory_data, start=1):
             with self.subTest(f'variation #{variant}', input_data=input_data, expected=expected):
                 actual_result = update_store_inventory(input_data[0], input_data[1])
                 error_msg = (f'Called update_store_inventory({input_data[0]}, {input_data[1]}). '