diff --git a/swap_meet/clothing.py b/swap_meet/clothing.py index b8afdeb1e..6f74b23af 100644 --- a/swap_meet/clothing.py +++ b/swap_meet/clothing.py @@ -1,2 +1,9 @@ -class Clothing: - pass \ No newline at end of file +from swap_meet.item import Item + +class Clothing(Item): + + def __init__(self, condition=0, age=0): + super().__init__("Clothing", condition, age) + + def __str__(self): + return "The finest clothing you could wear." diff --git a/swap_meet/decor.py b/swap_meet/decor.py index eab7a9dbe..fd9f318ae 100644 --- a/swap_meet/decor.py +++ b/swap_meet/decor.py @@ -1,2 +1,9 @@ -class Decor: - pass \ No newline at end of file +from swap_meet.item import Item + +class Decor(Item): + + def __init__(self, condition=0, age=0): + super().__init__("Decor", condition, age) + + 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..1c7bb6317 100644 --- a/swap_meet/electronics.py +++ b/swap_meet/electronics.py @@ -1,2 +1,9 @@ -class Electronics: - pass +from swap_meet.item import Item + +class Electronics(Item): + + def __init__(self, condition=0, age=0): + super().__init__("Electronics", condition, age) + + 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..b98ed5bdc 100644 --- a/swap_meet/item.py +++ b/swap_meet/item.py @@ -1,2 +1,23 @@ +CONDITION_DESC = { + 0: "you might as well buy a new one", + 1: "barely hanging on", + 2: "pretty used", + 3: "kinda used", + 4: "newish", + 5: "mint" +} + class Item: - pass \ No newline at end of file + + def __init__(self, category='', condition=0, age=0): + self.category = category + self.condition = condition + self.age = age + + def __str__(self): + return "Hello World!" + +######################################## WAVE 5 ######################################### + + def condition_description(self): + return CONDITION_DESC[int(self.condition)] diff --git a/swap_meet/vendor.py b/swap_meet/vendor.py index 87302c056..2747e882f 100644 --- a/swap_meet/vendor.py +++ b/swap_meet/vendor.py @@ -1,2 +1,83 @@ +from swap_meet.item import Item + class Vendor: - pass \ No newline at end of file + +######################################## WAVE 1 ######################################### + + def __init__(self, inventory=None, modifier=None): + if inventory is None: + inventory = [] + self.inventory = inventory + self.modifier = modifier + + + def add(self, item): + self.inventory.append(item) + return item + + + def remove(self, item): + try: + self.inventory.remove(item) + return item + except: + return False + + +######################################## WAVE 2 ######################################### + + def get_by_category(self, category): + category_items = [item for item in self.inventory if item.category == category] + return category_items + + +######################################## WAVE 3 ######################################### + + def swap_items(self, other, my_item, their_item): + if my_item in self.inventory and their_item in other.inventory: + self.add(other.remove(their_item)) + other.add(self.remove(my_item)) + return True + else: + return False + + +######################################## WAVE 4 ######################################### + + def swap_first_item(self, other): + try: + return self.swap_items(other, self.inventory[0],other.inventory[0]) + except: + return False + + +######################################## WAVE 6 ######################################### + + def get_best_by_category(self, category): + try: + best_item = max(self.get_by_category(category), key=lambda item:item.condition) + return best_item + except: + return None + + + def swap_best_by_category(self, other, my_priority, their_priority): + my_offer = self.get_best_by_category(their_priority) + their_offer = other.get_best_by_category(my_priority) + return self.swap_items(other, my_offer, their_offer) + + +######################################## WAVE 7 ######################################### + + def get_newest(self): + try: + newest_item = min(self.inventory, key=lambda item:item.age) + return newest_item + except: + return None + + def swap_by_newest(self, other): + my_offer = self.get_newest() + their_offer = other.get_newest() + return self.swap_items(other, my_offer, their_offer) + diff --git a/tests/integration_tests/test_wave_01_02_03.py b/tests/integration_tests/test_wave_01_02_03.py index 9912414da..34d042fdd 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() diff --git a/tests/integration_tests/test_wave_04_05_06.py b/tests/integration_tests/test_wave_04_05_06.py index 4d0be9909..cb3b346a2 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() diff --git a/tests/unit_tests/test_wave_01.py b/tests/unit_tests/test_wave_01.py index 58478ccf9..6fb4e5349 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,10 @@ def test_removing_not_found_is_false(): result = vendor.remove(item) - raise Exception("Complete this test according to comments below.") + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** + assert len(vendor.inventory) == 3 + assert item not in vendor.inventory + assert result == False # ********************************************************************* diff --git a/tests/unit_tests/test_wave_02.py b/tests/unit_tests/test_wave_02.py index 3d7060d7c..1f530c8e0 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.") + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** + assert len(items) == 0 + assert item_a not in items + assert item_c not in items + assert item_b not in items # ********************************************************************* 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") 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..ba81f89f1 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,16 +76,21 @@ def test_swap_best_by_category(): their_priority="Decor" ) - raise Exception("Complete this test according to comments below.") + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** + assert result == True + assert len(tai.inventory) == 3 + assert len(jesse.inventory) == 3 + assert tai.inventory == [item_a, item_b, item_f] + assert jesse.inventory == [item_d, item_e, item_c] # ********************************************************************* # Assertions should check: # - That the results is truthy # - 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) @@ -109,16 +114,21 @@ def test_swap_best_by_category_reordered(): their_priority="Decor" ) - raise Exception("Complete this test according to comments below.") + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** + assert result == True + assert len(tai.inventory) == 3 + assert len(jesse.inventory) == 3 + assert tai.inventory == [item_b, item_a, item_f] + assert jesse.inventory == [item_e, item_d, item_c] # ********************************************************************* # Assertions should check: # - That result is truthy # - 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 +154,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 +180,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) @@ -194,16 +204,21 @@ def test_swap_best_by_category_no_match_is_false(): their_priority="Clothing" ) - raise Exception("Complete this test according to comments below.") + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** + assert result == False + assert len(tai.inventory) == 3 + assert len(jesse.inventory) == 3 + assert tai.inventory == [item_a, item_b, item_c] + assert jesse.inventory == [item_d, item_e, item_f] # ********************************************************************* # Assertions should check: # - That result is falsy # - 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) @@ -227,9 +242,14 @@ def test_swap_best_by_category_no_other_match_is_false(): their_priority="Decor" ) - raise Exception("Complete this test according to comments below.") + # raise Exception("Complete this test according to comments below.") # ********************************************************************* # ****** Complete Assert Portion of this test ********** + assert result == False + assert len(tai.inventory) == 3 + assert len(jesse.inventory) == 3 + assert tai.inventory == [item_c, item_b, item_a] + assert jesse.inventory == [item_f, item_e, item_d] # ********************************************************************* # Assertions should check: # - That result is falsy diff --git a/tests/unit_tests/test_wave_07.py b/tests/unit_tests/test_wave_07.py new file mode 100644 index 000000000..29e7a72e8 --- /dev/null +++ b/tests/unit_tests/test_wave_07.py @@ -0,0 +1,159 @@ +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 +def test_newest(): + item_a = Clothing(age=1.0) + item_b = Decor(age=2.0) + item_c = Clothing(age=4.0) + item_d = Decor(age=5.0) + item_e = Clothing(age=3.0) + tai = Vendor( + inventory=[item_a, item_b, item_c, item_d, item_e] + ) + + newest_item = tai.get_newest() + + assert newest_item.age == pytest.approx(1.0) + +# @pytest.mark.skip +def test_newest_with_duplicates(): + # Arrange + item_a = Clothing(age=2.0) + item_b = Decor(age=2.0) + item_c = Clothing(age=4.0) + tai = Vendor( + inventory=[item_a, item_b, item_c] + ) + + # Act + newest_item = tai.get_newest() + + # Assert + assert newest_item.category == "Clothing" + assert newest_item.age == pytest.approx(2.0) + +# @pytest.mark.skip +def test_swap_newest(): + # Arrange + # me + item_a = Decor(age=2.0) + item_b = Electronics(age=4.0) + item_c = Decor(age=4.0) + tai = Vendor( + inventory=[item_a, item_b, item_c] + ) + + # them + item_d = Clothing(age=2.0) + item_e = Decor(age=4.0) + item_f = Clothing(age=4.0) + jesse = Vendor( + inventory=[item_d, item_e, item_f] + ) + + # Act + result = tai.swap_by_newest( + other=jesse + ) + + # raise Exception("Complete this test according to comments below.") + # ********************************************************************* + # ****** Complete Assert Portion of this test ********** + assert result == True + assert len(tai.inventory) == 3 + assert len(jesse.inventory) == 3 + assert tai.inventory == [item_b, item_c, item_d] + assert jesse.inventory == [item_e, item_f, item_a] + # ********************************************************************* + # Assertions should check: + # - That the results is truthy + # - 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 +def test_swap_newest_reordered(): + # Arrange + item_a = Decor(age=2.0) + item_b = Electronics(age=4.0) + item_c = Decor(age=4.0) + tai = Vendor( + inventory=[item_c, item_b, item_a] + ) + + item_d = Clothing(age=2.0) + item_e = Decor(age=4.0) + item_f = Clothing(age=4.0) + jesse = Vendor( + inventory=[item_f, item_e, item_d] + ) + + # Act + result = tai.swap_by_newest( + other=jesse + ) + + # raise Exception("Complete this test according to comments below.") + # ********************************************************************* + # ****** Complete Assert Portion of this test ********** + assert result == True + assert len(tai.inventory) == 3 + assert len(jesse.inventory) == 3 + assert tai.inventory == [item_c, item_b, item_d] + assert jesse.inventory == [item_f, item_e, item_a] + # ********************************************************************* + # Assertions should check: + # - That result is truthy + # - 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 +def test_swap_newest_no_inventory_is_false(): + tai = Vendor( + inventory=[] + ) + + item_a = Clothing(age=2.0) + item_b = Decor(age=4.0) + item_c = Clothing(age=4.0) + jesse = Vendor( + inventory=[item_a, item_b, item_c] + ) + + result = tai.swap_by_newest( + other=jesse + ) + + assert not result + assert len(tai.inventory) == 0 + assert len(jesse.inventory) == 3 + assert item_a in jesse.inventory + assert item_b in jesse.inventory + assert item_c in jesse.inventory + +# @pytest.mark.skip +def test_swap_newest_no_other_inventory_is_false(): + item_a = Clothing(age=2.0) + item_b = Decor(age=4.0) + item_c = Clothing(age=4.0) + tai = Vendor( + inventory=[item_a, item_b, item_c] + ) + + jesse = Vendor( + inventory=[] + ) + + result = tai.swap_by_newest( + other=jesse + ) + + assert not result + assert len(tai.inventory) == 3 + assert len(jesse.inventory) == 0 + assert item_a in tai.inventory + assert item_b in tai.inventory + assert item_c in tai.inventory \ No newline at end of file