From 20ffe4737b8977d46fbcfe33a84eec81a2d60a86 Mon Sep 17 00:00:00 2001 From: Shannon Bellemore Date: Thu, 7 Apr 2022 18:13:23 -0500 Subject: [PATCH 1/2] wave 1, 2, 3 passing --- main.py | 7 ++++++ swap_meet/item.py | 16 +++++++++++- swap_meet/vendor.py | 42 +++++++++++++++++++++++++++++++- tests/unit_tests/test_wave_01.py | 13 +++++----- tests/unit_tests/test_wave_02.py | 12 ++++++--- tests/unit_tests/test_wave_03.py | 12 ++++----- 6 files changed, 84 insertions(+), 18 deletions(-) create mode 100644 main.py diff --git a/main.py b/main.py new file mode 100644 index 000000000..b301282fa --- /dev/null +++ b/main.py @@ -0,0 +1,7 @@ +# ***************************************** +# DELETE LATER +# ***************************************** +# COMPLETE TESTS FOR WAVES 1, 2 and 6!!! +# ***************************************** +# ADD DOC STRINGS FOR FUNCTIONS +# ***************************************** diff --git a/swap_meet/item.py b/swap_meet/item.py index 560d759c2..9dd4298a7 100644 --- a/swap_meet/item.py +++ b/swap_meet/item.py @@ -1,2 +1,16 @@ class Item: - pass \ No newline at end of file + def __init__(self, category=None): + if category is None: + self.category = "" + else: + self.category = category + + def __str__(self): + return "Hello World!" + +# ******************************** +# DELETE LATER +# ******************************** + +# ******************************** +# ******************************** \ No newline at end of file diff --git a/swap_meet/vendor.py b/swap_meet/vendor.py index 87302c056..83b86372f 100644 --- a/swap_meet/vendor.py +++ b/swap_meet/vendor.py @@ -1,2 +1,42 @@ +from swap_meet.item import Item + class Vendor: - pass \ No newline at end of file + def __init__(self, inventory=None): + if inventory is None: + self.inventory = [] + else: + self.inventory = inventory + + def add(self, item): + self.inventory.append(item) + return item + + def remove(self, item): + if item in self.inventory: + self.inventory.remove(item) + return item + else: + return False + + def get_by_category(self, category): + items = [] + for item in self.inventory: + if item.category == category: + items.append(item) + return items + + def swap_items(self, friend, given_item, received_item): + if given_item in self.inventory and received_item in friend.inventory: + friend.add(given_item) + self.remove(given_item) + self.add(received_item) + friend.remove(received_item) + return True + return False + +# ******************************** +# DELETE LATER +# ******************************** + +# ******************************** +# ******************************** \ No newline at end of file diff --git a/tests/unit_tests/test_wave_01.py b/tests/unit_tests/test_wave_01.py index 58478ccf9..25a3a94ba 100644 --- a/tests/unit_tests/test_wave_01.py +++ b/tests/unit_tests/test_wave_01.py @@ -2,12 +2,12 @@ import pytest from swap_meet.vendor import Vendor -@pytest.mark.skip +# @pytest.mark.skip def test_vendor_has_inventory(): vendor = Vendor() assert len(vendor.inventory) == 0 -@pytest.mark.skip +# @pytest.mark.skip def test_vendor_takes_optional_inventory(): inventory = ["a", "b", "c"] vendor = Vendor(inventory=inventory) @@ -16,7 +16,7 @@ def test_vendor_takes_optional_inventory(): assert "b" in vendor.inventory assert "c" in vendor.inventory -@pytest.mark.skip +# @pytest.mark.skip def test_adding_to_inventory(): vendor = Vendor() item = "new item" @@ -27,7 +27,7 @@ def test_adding_to_inventory(): assert item in vendor.inventory assert result == item -@pytest.mark.skip +# @pytest.mark.skip def test_removing_from_inventory_returns_item(): item = "item to remove" vendor = Vendor( @@ -40,7 +40,7 @@ def test_removing_from_inventory_returns_item(): assert item not in vendor.inventory assert result == item -@pytest.mark.skip +# @pytest.mark.skip def test_removing_not_found_is_false(): item = "item to remove" vendor = Vendor( @@ -49,7 +49,8 @@ def test_removing_not_found_is_false(): result = vendor.remove(item) - raise Exception("Complete this test according to comments below.") + assert result == False + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** # ********************************************************************* diff --git a/tests/unit_tests/test_wave_02.py b/tests/unit_tests/test_wave_02.py index 3d7060d7c..625a956ec 100644 --- a/tests/unit_tests/test_wave_02.py +++ b/tests/unit_tests/test_wave_02.py @@ -2,12 +2,12 @@ from swap_meet.vendor import Vendor from swap_meet.item import Item -@pytest.mark.skip +# @pytest.mark.skip def test_items_have_blank_default_category(): item = Item() assert item.category == "" -@pytest.mark.skip +# @pytest.mark.skip def test_get_items_by_category(): item_a = Item(category="clothing") item_b = Item(category="electronics") @@ -23,7 +23,7 @@ def test_get_items_by_category(): assert item_c in items assert item_b not in items -@pytest.mark.skip +# @pytest.mark.skip def test_get_no_matching_items_by_category(): item_a = Item(category="clothing") item_b = Item(category="clothing") @@ -34,7 +34,11 @@ def test_get_no_matching_items_by_category(): items = vendor.get_by_category("electronics") - raise Exception("Complete this test according to comments below.") + assert len(items) == 0 + assert item_a not in items + assert item_b not in items + assert item_c not in items + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** # ********************************************************************* diff --git a/tests/unit_tests/test_wave_03.py b/tests/unit_tests/test_wave_03.py index 0300b638f..2d573fa52 100644 --- a/tests/unit_tests/test_wave_03.py +++ b/tests/unit_tests/test_wave_03.py @@ -2,7 +2,7 @@ from swap_meet.vendor import Vendor from swap_meet.item import Item -@pytest.mark.skip +# @pytest.mark.skip def test_item_overrides_to_string(): item = Item() @@ -10,7 +10,7 @@ def test_item_overrides_to_string(): assert stringified_item == "Hello World!" -@pytest.mark.skip +# @pytest.mark.skip def test_swap_items_returns_true(): item_a = Item(category="clothing") item_b = Item(category="clothing") @@ -38,7 +38,7 @@ def test_swap_items_returns_true(): assert item_b in jolie.inventory assert result -@pytest.mark.skip +# @pytest.mark.skip def test_swap_items_when_my_item_is_missing_returns_false(): item_a = Item(category="clothing") item_b = Item(category="clothing") @@ -65,7 +65,7 @@ def test_swap_items_when_my_item_is_missing_returns_false(): assert item_e in jolie.inventory assert not result -@pytest.mark.skip +# @pytest.mark.skip def test_swap_items_when_their_item_is_missing_returns_false(): item_a = Item(category="clothing") item_b = Item(category="clothing") @@ -92,7 +92,7 @@ def test_swap_items_when_their_item_is_missing_returns_false(): assert item_e in jolie.inventory assert not result -@pytest.mark.skip +# @pytest.mark.skip def test_swap_items_from_my_empty_returns_false(): fatimah = Vendor( inventory=[] @@ -112,7 +112,7 @@ def test_swap_items_from_my_empty_returns_false(): assert len(jolie.inventory) == 2 assert not result -@pytest.mark.skip +# @pytest.mark.skip def test_swap_items_from_their_empty_returns_false(): item_a = Item(category="clothing") item_b = Item(category="clothing") From 88dd8a9ca827a2df8b1ca3ed648dac43c7b751bd Mon Sep 17 00:00:00 2001 From: Shannon Bellemore Date: Fri, 8 Apr 2022 09:59:12 -0500 Subject: [PATCH 2/2] passing all waves --- main.py | 7 -- swap_meet/clothing.py | 10 ++- swap_meet/decor.py | 10 ++- swap_meet/electronics.py | 10 ++- swap_meet/item.py | 28 ++++--- swap_meet/vendor.py | 44 ++++++++--- tests/integration_tests/test_wave_01_02_03.py | 6 +- tests/integration_tests/test_wave_04_05_06.py | 7 +- tests/unit_tests/test_wave_04.py | 6 +- tests/unit_tests/test_wave_05.py | 10 +-- tests/unit_tests/test_wave_06.py | 73 +++++++++++++++---- 11 files changed, 141 insertions(+), 70 deletions(-) delete mode 100644 main.py diff --git a/main.py b/main.py deleted file mode 100644 index b301282fa..000000000 --- a/main.py +++ /dev/null @@ -1,7 +0,0 @@ -# ***************************************** -# DELETE LATER -# ***************************************** -# COMPLETE TESTS FOR WAVES 1, 2 and 6!!! -# ***************************************** -# ADD DOC STRINGS FOR FUNCTIONS -# ***************************************** diff --git a/swap_meet/clothing.py b/swap_meet/clothing.py index b8afdeb1e..f3c47192a 100644 --- a/swap_meet/clothing.py +++ b/swap_meet/clothing.py @@ -1,2 +1,8 @@ -class Clothing: - pass \ No newline at end of file +from swap_meet.item import Item + +class Clothing(Item): + def __init__(self, condition=0.0): + super().__init__(condition=condition, category="Clothing") + + def __str__(self): + return "The finest clothing you could wear." diff --git a/swap_meet/decor.py b/swap_meet/decor.py index eab7a9dbe..9cd0e384c 100644 --- a/swap_meet/decor.py +++ b/swap_meet/decor.py @@ -1,2 +1,8 @@ -class Decor: - pass \ No newline at end of file +from swap_meet.item import Item + +class Decor(Item): + def __init__(self, condition=0.0): + super().__init__(condition=condition, category="Decor") + + def __str__(self): + return "Something to decorate your space." diff --git a/swap_meet/electronics.py b/swap_meet/electronics.py index 2f9dff68a..2f3e52ad5 100644 --- a/swap_meet/electronics.py +++ b/swap_meet/electronics.py @@ -1,2 +1,8 @@ -class Electronics: - pass +from swap_meet.item import Item + +class Electronics(Item): + def __init__(self, condition=0.0): + super().__init__(condition=condition, category="Electronics") + + def __str__(self): + return "A gadget full of buttons and secrets." diff --git a/swap_meet/item.py b/swap_meet/item.py index 9dd4298a7..3b4b210da 100644 --- a/swap_meet/item.py +++ b/swap_meet/item.py @@ -1,16 +1,20 @@ class Item: - def __init__(self, category=None): - if category is None: - self.category = "" - else: - self.category = category - + def __init__(self, category="", condition=0.0): + self.category = category + self.condition = condition + def __str__(self): return "Hello World!" -# ******************************** -# DELETE LATER -# ******************************** - -# ******************************** -# ******************************** \ No newline at end of file + def condition_description(self): + if self.condition <= 1: + return "Belongs in the trash." + elif self.condition <= 2: + return "Oof...bad idea." + elif self.condition <= 3: + return "Is it really worth it?" + elif self.condition <= 4: + return "Heyyyy, this is pretty good~" + elif self.condition <= 5: + return "Brilliant, incredible, amazing, show stopping, spectacular item!" + \ No newline at end of file diff --git a/swap_meet/vendor.py b/swap_meet/vendor.py index 83b86372f..3ce7c3c6b 100644 --- a/swap_meet/vendor.py +++ b/swap_meet/vendor.py @@ -25,18 +25,38 @@ def get_by_category(self, category): items.append(item) return items - def swap_items(self, friend, given_item, received_item): - if given_item in self.inventory and received_item in friend.inventory: - friend.add(given_item) - self.remove(given_item) - self.add(received_item) - friend.remove(received_item) + def swap_items(self, friend, my_item, their_item): + if my_item in self.inventory and their_item in friend.inventory: + friend.add(my_item) + self.remove(my_item) + self.add(their_item) + friend.remove(their_item) return True - return False + else: + return False -# ******************************** -# DELETE LATER -# ******************************** + def swap_first_item(self, friend): + if not self.inventory or not friend.inventory: + return False + else: + self.swap_items(friend, self.inventory[0], friend.inventory[0]) + return True -# ******************************** -# ******************************** \ No newline at end of file + def get_best_by_category(self, category=""): + current_best_condition = 0 + best_item = None + if self.get_by_category is None: + return None + for item in self.get_by_category(category): + if item.condition > current_best_condition: + current_best_condition = item.condition + best_item = item + return best_item + + def swap_best_by_category(self, other, my_priority, their_priority): + other_best = other.get_best_by_category(my_priority) + vendor_best = self.get_best_by_category(their_priority) + if not other_best or not vendor_best: + return False + else: + return self.swap_items(other, vendor_best, other_best) diff --git a/tests/integration_tests/test_wave_01_02_03.py b/tests/integration_tests/test_wave_01_02_03.py index 9912414da..e20856696 100644 --- a/tests/integration_tests/test_wave_01_02_03.py +++ b/tests/integration_tests/test_wave_01_02_03.py @@ -2,8 +2,8 @@ from swap_meet.vendor import Vendor from swap_meet.item import Item -@pytest.mark.skip -@pytest.mark.integration_test +# @pytest.mark.skip +# @pytest.mark.integration_test def test_integration_wave_01_02_03(): # make a vendor vendor = Vendor() @@ -50,5 +50,3 @@ def test_integration_wave_01_02_03(): assert len(other_vendor.inventory) == 1 assert item2 in other_vendor.inventory assert item3 in vendor.inventory - - diff --git a/tests/integration_tests/test_wave_04_05_06.py b/tests/integration_tests/test_wave_04_05_06.py index 4d0be9909..dcb6905c3 100644 --- a/tests/integration_tests/test_wave_04_05_06.py +++ b/tests/integration_tests/test_wave_04_05_06.py @@ -4,8 +4,8 @@ from swap_meet.decor import Decor from swap_meet.electronics import Electronics -@pytest.mark.skip -@pytest.mark.integration_test +# @pytest.mark.skip +# @pytest.mark.integration_test def test_integration_wave_04_05_06(): camila = Vendor() valentina = Vendor() @@ -67,6 +67,3 @@ def test_integration_wave_04_05_06(): assert item_electronics1 in valentina.inventory assert item_decor1 in valentina.inventory assert item_clothing2 in valentina.inventory - - - diff --git a/tests/unit_tests/test_wave_04.py b/tests/unit_tests/test_wave_04.py index 8190a4ebb..4ef21ff8e 100644 --- a/tests/unit_tests/test_wave_04.py +++ b/tests/unit_tests/test_wave_04.py @@ -2,7 +2,7 @@ from swap_meet.vendor import Vendor from swap_meet.item import Item -@pytest.mark.skip +# @pytest.mark.skip def test_swap_first_item_returns_true(): item_a = Item(category="clothing") item_b = Item(category="clothing") @@ -30,7 +30,7 @@ def test_swap_first_item_returns_true(): assert item_a in jolie.inventory assert result -@pytest.mark.skip +# @pytest.mark.skip def test_swap_first_item_from_my_empty_returns_false(): fatimah = Vendor( inventory=[] @@ -48,7 +48,7 @@ def test_swap_first_item_from_my_empty_returns_false(): assert len(jolie.inventory) == 2 assert not result -@pytest.mark.skip +# @pytest.mark.skip def test_swap_first_item_from_their_empty_returns_false(): item_a = Item(category="clothing") item_b = Item(category="clothing") diff --git a/tests/unit_tests/test_wave_05.py b/tests/unit_tests/test_wave_05.py index 7abea06cd..fdeb063a9 100644 --- a/tests/unit_tests/test_wave_05.py +++ b/tests/unit_tests/test_wave_05.py @@ -3,25 +3,25 @@ from swap_meet.decor import Decor from swap_meet.electronics import Electronics -@pytest.mark.skip +# @pytest.mark.skip def test_clothing_has_default_category_and_to_str(): cloth = Clothing() assert cloth.category == "Clothing" assert str(cloth) == "The finest clothing you could wear." -@pytest.mark.skip +# @pytest.mark.skip def test_decor_has_default_category_and_to_str(): decor = Decor() assert decor.category == "Decor" assert str(decor) == "Something to decorate your space." -@pytest.mark.skip +# @pytest.mark.skip def test_electronics_has_default_category_and_to_str(): electronics = Electronics() assert electronics.category == "Electronics" assert str(electronics) == "A gadget full of buttons and secrets." -@pytest.mark.skip +# @pytest.mark.skip def test_items_have_condition_as_float(): items = [ Clothing(condition=3.5), @@ -31,7 +31,7 @@ def test_items_have_condition_as_float(): for item in items: assert item.condition == pytest.approx(3.5) -@pytest.mark.skip +# @pytest.mark.skip def test_items_have_condition_descriptions_that_are_the_same_regardless_of_type(): items = [ Clothing(condition=5), diff --git a/tests/unit_tests/test_wave_06.py b/tests/unit_tests/test_wave_06.py index 1f7065ab4..b1bb2bd3f 100644 --- a/tests/unit_tests/test_wave_06.py +++ b/tests/unit_tests/test_wave_06.py @@ -4,7 +4,7 @@ from swap_meet.decor import Decor from swap_meet.electronics import Electronics -@pytest.mark.skip +# @pytest.mark.skip def test_best_by_category(): item_a = Clothing(condition=2.0) item_b = Decor(condition=2.0) @@ -20,7 +20,7 @@ def test_best_by_category(): assert best_item.category == "Clothing" assert best_item.condition == pytest.approx(4.0) -@pytest.mark.skip +# @pytest.mark.skip def test_best_by_category_no_matches_is_none(): item_a = Decor(condition=2.0) item_b = Decor(condition=2.0) @@ -33,7 +33,7 @@ def test_best_by_category_no_matches_is_none(): assert best_item is None -@pytest.mark.skip +# @pytest.mark.skip def test_best_by_category_with_duplicates(): # Arrange item_a = Clothing(condition=2.0) @@ -50,7 +50,7 @@ def test_best_by_category_with_duplicates(): assert best_item.category == "Clothing" assert best_item.condition == pytest.approx(4.0) -@pytest.mark.skip +# @pytest.mark.skip def test_swap_best_by_category(): # Arrange # me @@ -76,7 +76,19 @@ def test_swap_best_by_category(): their_priority="Decor" ) - raise Exception("Complete this test according to comments below.") + #Assert + assert result + assert len(tai.inventory) == 3 + assert len(jesse.inventory) == 3 + assert item_f not in jesse.inventory + assert item_f in tai.inventory + assert item_c not in tai.inventory + assert item_c in jesse.inventory + assert item_d in jesse.inventory + assert item_e in jesse.inventory + assert item_a in tai.inventory + assert item_b in tai.inventory + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** # ********************************************************************* @@ -85,7 +97,7 @@ def test_swap_best_by_category(): # - That tai and jesse's inventories are the correct length # - That all the correct items are in tai and jesse's inventories, including the items which were swapped from one vendor to the other -@pytest.mark.skip +# @pytest.mark.skip def test_swap_best_by_category_reordered(): # Arrange item_a = Decor(condition=2.0) @@ -108,8 +120,19 @@ def test_swap_best_by_category_reordered(): my_priority="Clothing", their_priority="Decor" ) - - raise Exception("Complete this test according to comments below.") + # Assert + assert result + assert len(tai.inventory) == 3 + assert len(jesse.inventory) == 3 + assert item_f not in jesse.inventory + assert item_f in tai.inventory + assert item_c not in tai.inventory + assert item_c in jesse.inventory + assert item_d in jesse.inventory + assert item_e in jesse.inventory + assert item_a in tai.inventory + assert item_b in tai.inventory + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** # ********************************************************************* @@ -118,7 +141,7 @@ def test_swap_best_by_category_reordered(): # - That tai and jesse's inventories are the correct length # - That all the correct items are in tai and jesse's inventories, and that the items that were swapped are not there -@pytest.mark.skip +# @pytest.mark.skip def test_swap_best_by_category_no_inventory_is_false(): tai = Vendor( inventory=[] @@ -144,7 +167,7 @@ def test_swap_best_by_category_no_inventory_is_false(): assert item_b in jesse.inventory assert item_c in jesse.inventory -@pytest.mark.skip +# @pytest.mark.skip def test_swap_best_by_category_no_other_inventory_is_false(): item_a = Clothing(condition=2.0) item_b = Decor(condition=4.0) @@ -170,7 +193,7 @@ def test_swap_best_by_category_no_other_inventory_is_false(): assert item_b in tai.inventory assert item_c in tai.inventory -@pytest.mark.skip +# @pytest.mark.skip def test_swap_best_by_category_no_match_is_false(): # Arrange item_a = Decor(condition=2.0) @@ -193,8 +216,17 @@ def test_swap_best_by_category_no_match_is_false(): my_priority="Clothing", their_priority="Clothing" ) - - raise Exception("Complete this test according to comments below.") + # Assert + assert not result + assert len(tai.inventory) == 3 + assert len(jesse.inventory) == 3 + assert item_d in jesse.inventory + assert item_e in jesse.inventory + assert item_f in jesse.inventory + assert item_a in tai.inventory + assert item_b in tai.inventory + assert item_c in tai.inventory + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** # ********************************************************************* @@ -203,7 +235,7 @@ def test_swap_best_by_category_no_match_is_false(): # - That tai and jesse's inventories are the correct length # - That all the correct items are in tai and jesse's inventories -@pytest.mark.skip +# @pytest.mark.skip def test_swap_best_by_category_no_other_match_is_false(): # Arrange item_a = Decor(condition=2.0) @@ -226,8 +258,17 @@ def test_swap_best_by_category_no_other_match_is_false(): my_priority="Electronics", their_priority="Decor" ) - - raise Exception("Complete this test according to comments below.") + # Assert + assert not result + assert len(tai.inventory) == 3 + assert len(jesse.inventory) == 3 + assert item_d in jesse.inventory + assert item_e in jesse.inventory + assert item_f in jesse.inventory + assert item_a in tai.inventory + assert item_b in tai.inventory + assert item_c in tai.inventory + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** # *********************************************************************