From 7f42967f0ca08f840e3992fd776e9cf0264c424c Mon Sep 17 00:00:00 2001 From: Ashley Benson Date: Wed, 13 Apr 2022 12:23:29 -0700 Subject: [PATCH] Your message hereFinal --- swap_meet/clothing.py | 12 ++++- swap_meet/decor.py | 12 ++++- swap_meet/electronics.py | 14 +++++- swap_meet/item.py | 26 +++++++++- swap_meet/vendor.py | 81 +++++++++++++++++++++++++++++++- tests/unit_tests/test_wave_01.py | 18 ++++--- tests/unit_tests/test_wave_02.py | 10 ++-- tests/unit_tests/test_wave_03.py | 12 ++--- tests/unit_tests/test_wave_04.py | 6 +-- tests/unit_tests/test_wave_05.py | 10 ++-- tests/unit_tests/test_wave_06.py | 52 +++++++++++++------- 11 files changed, 202 insertions(+), 51 deletions(-) diff --git a/swap_meet/clothing.py b/swap_meet/clothing.py index b8afdeb1e..9dd7f6c6d 100644 --- a/swap_meet/clothing.py +++ b/swap_meet/clothing.py @@ -1,2 +1,10 @@ -class Clothing: - pass \ No newline at end of file +#from unicodedata import category +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..ef0ac16f2 100644 --- a/swap_meet/decor.py +++ b/swap_meet/decor.py @@ -1,2 +1,10 @@ -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." + \ No newline at end of file diff --git a/swap_meet/electronics.py b/swap_meet/electronics.py index 2f9dff68a..8c4999e98 100644 --- a/swap_meet/electronics.py +++ b/swap_meet/electronics.py @@ -1,2 +1,12 @@ -class Electronics: - pass +from multiprocessing import Condition +from swap_meet.item import Item + +class Electronics(Item): + + def __init__(self, condition = 0 ): + super().__init__(condition = condition, category = "Electronics") + + def __str__(self): + return "A gadget full of buttons and secrets." + + \ No newline at end of file diff --git a/swap_meet/item.py b/swap_meet/item.py index 560d759c2..784ce4e46 100644 --- a/swap_meet/item.py +++ b/swap_meet/item.py @@ -1,2 +1,26 @@ class Item: - pass \ No newline at end of file + def __init__(self, category=None, condition = 0.0): + if not category: + category = "" + self.condition = condition + self.category = category + + + def __str__(self): + return "Hello World!" + + def condition_description(self): + #if else 1-5 + if self.condition == 1.0: + return "Horrid" + elif self.condition == 2.0: + return "Ugly" + elif self.condition == 3.0: + return "getting warmer" + elif self.condition == 4.0: + return "almost...doesnt count" + elif self.condition == 5.0: + return "winner winner chicken dinner" + + + \ No newline at end of file diff --git a/swap_meet/vendor.py b/swap_meet/vendor.py index 87302c056..4ef42fddd 100644 --- a/swap_meet/vendor.py +++ b/swap_meet/vendor.py @@ -1,2 +1,81 @@ class Vendor: - pass \ No newline at end of file + def __init__(self, inventory=None): #define class + if not inventory: #return empty list, if none + self.inventory = [] #attribute set-up + + else: + self.inventory = inventory #if inv data present + + def add(self, item): # a instance method + self.inventory.append(item) + return item + + def remove(self, item): + if item in self.inventory: + self.inventory.remove(item) + return item + + else: + return False + + #a instance method + def get_by_category(self, cat_name): + cat_list = [] + for item in self.inventory: + if item.category == cat_name: + cat_list.append(item) + return cat_list + + def swap_items(self, friend, my_item, friend_item): + if my_item in self.inventory and friend_item in friend.inventory: + friend.inventory.append(my_item) + self.inventory.append(friend_item) + friend.inventory.remove(friend_item) + self.inventory.remove(my_item) + return True + return False + + def swap_first_item(self, friend): + if not self.inventory or not friend.inventory: + return False + else: + + self.inventory.append(friend.inventory[0]) + friend.inventory.append(self.inventory[0]) + + self.inventory.remove(self.inventory[0]) + friend.inventory.remove(friend.inventory[0]) + return True + + def get_best_by_category(self, category): + if not self.inventory: + return None + else: + items = self.get_by_category(category) + if items: return max( items, key=lambda item: item.condition ) + + + + def swap_best_by_category(self, other, my_priority, their_priority): + + + friend_swap = other.get_best_by_category(my_priority) + my_swap = self.get_best_by_category(their_priority) + + if not friend_swap: + return False + if not my_swap: + return False + + self.swap_items(other, my_swap, friend_swap) + return True + + + # if their_priority not in self.inventory: + # return False + # elif my_priority not in other.inventory: + # return False + + + + diff --git a/tests/unit_tests/test_wave_01.py b/tests/unit_tests/test_wave_01.py index 58478ccf9..1c3d9c51a 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,11 +27,11 @@ 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( - inventory=["a", "b", "c", item] + inventory=["a", "b", "c", "item"] ) result = vendor.remove(item) @@ -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,11 @@ def test_removing_not_found_is_false(): result = vendor.remove(item) - raise Exception("Complete this test according to comments below.") + assert len(vendor.inventory) == 3 + assert item not in vendor.inventory + 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..7c3036208 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") @@ -33,8 +33,8 @@ 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 + #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..e100c48dc 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") diff --git a/tests/unit_tests/test_wave_04.py b/tests/unit_tests/test_wave_04.py index 8190a4ebb..f3c91e846 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..8dedc9e28 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..168862df9 100644 --- a/tests/unit_tests/test_wave_06.py +++ b/tests/unit_tests/test_wave_06.py @@ -1,10 +1,11 @@ +from unittest import result import pytest from swap_meet.vendor import Vendor from swap_meet.clothing import Clothing 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 +21,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 +34,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 +51,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 @@ -75,8 +76,12 @@ def test_swap_best_by_category(): my_priority="Clothing", their_priority="Decor" ) - - raise Exception("Complete this test according to comments below.") + #assert result == True + assert len(jesse.inventory) == 3 + assert len(tai.inventory) == 3 + assert item_c not in tai.inventory + assert item_f not in jesse.inventory + #raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** # ********************************************************************* @@ -85,7 +90,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 +113,12 @@ def test_swap_best_by_category_reordered(): my_priority="Clothing", their_priority="Decor" ) - - raise Exception("Complete this test according to comments below.") + assert len(jesse.inventory) == 3 + assert len(tai.inventory) == 3 + assert item_e not in tai.inventory + assert item_f not in jesse.inventory + + #raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** # ********************************************************************* @@ -118,7 +127,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 +153,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 +179,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 +202,13 @@ 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 result == False + assert len(jesse.inventory) == 3 + assert len(tai.inventory) == 3 + assert item_e not in tai.inventory + assert item_a not in jesse.inventory + + #raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** # ********************************************************************* @@ -203,7 +217,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 +240,12 @@ 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 result == False + assert len(tai.inventory) == 3 + assert item_e not in tai.inventory + assert item_c not in jesse.inventory + + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** # *********************************************************************