add additional tests and methods from L2 slides

Author: hoffm386

Lesson2-Exercise1-Categories/solution/src/tracker.py

@@ -1,14 +1,19 @@
 class ExpenseTracker:
     def __init__(self):
         self.expenses = []
+        self.total = 0
 
     def add_expense(self, amount, category=None):
+        if amount <= 0:
+            raise ValueError("Expense amount must be positive.")
+
         # The dictionary is updated to include the category
         expense = {
             "amount": amount,
             "category": category
         }
         self.expenses.append(expense)
+        self.total += amount
 
     def list_expenses_by_category(self, category):
         # Loop over the expenses and return expenses with the appropriate category

Lesson2-Exercise1-Categories/solution/tests/test_tracker.py

@@ -2,14 +2,53 @@
 from src.tracker import ExpenseTracker
 
 def test_add_expense_stores_amount():
+    # Arrange
     tracker = ExpenseTracker()
+
+    # Act
     tracker.add_expense(50)
+
+    # Assert
     assert tracker.expenses[0]['amount'] == 50
 
-def test_add_expense_with_category():    
+def test_add_expense_updates_total():
+    # Arrange
+    tracker = ExpenseTracker()
+
+    # Act
+    tracker.add_expense(10)
+
+    # Assert
+    assert tracker.total == 10
+
+def test_add_multiple_expenses():
+    # Arrange
+    tracker = ExpenseTracker()
+
+    # Act
+    tracker.add_expense(10)
+    tracker.add_expense(5)
+
+    # Assert
+    assert tracker.total == 15
+
+def test_add_expense_with_negative_amount_fails():
+    # Arrange
+    tracker = ExpenseTracker()
+
+    # Act and Assert
+    with pytest.raises(ValueError):
+        tracker.add_expense(-10)
+
+def test_add_expense_can_store_category():
+    # Arrange
     tracker = ExpenseTracker()    
+
+    # Act
     # This call now includes the category argument
     tracker.add_expense(10, category="food")    
+
+    # Assert
     # Asserts that the internal dictionary contains the category key
     assert tracker.expenses[0]['category'] == "food"
 

Lesson2-Exercise1-Categories/starter/src/tracker.py

@@ -2,8 +2,12 @@ class ExpenseTracker:
     def __init__(self):
         # The tracker stores records in a list
         self.expenses = []
+        self.total = 0
 
     def add_expense(self, amount):
+        if amount <= 0:
+            raise ValueError("Expense amount must be positive.")
         # Current implementation only handles amount
         expense = {"amount": amount}
         self.expenses.append(expense)
+        self.total += amount

Lesson2-Exercise1-Categories/starter/tests/test_tracker.py

@@ -2,10 +2,44 @@
 from src.tracker import ExpenseTracker
 
 def test_add_expense_stores_amount():
+    # Arrange
     tracker = ExpenseTracker()
+
+    # Act
     tracker.add_expense(50)
+
+    # Assert
     assert tracker.expenses[0]['amount'] == 50
 
+def test_add_expense_updates_total():
+    # Arrange
+    tracker = ExpenseTracker()
+
+    # Act
+    tracker.add_expense(10)
+
+    # Assert
+    assert tracker.total == 10
+
+def test_add_multiple_expenses():
+    # Arrange
+    tracker = ExpenseTracker()
+
+    # Act
+    tracker.add_expense(10)
+    tracker.add_expense(5)
+
+    # Assert
+    assert tracker.total == 15
+
+def test_add_expense_with_negative_amount_fails():
+    # Arrange
+    tracker = ExpenseTracker()
+
+    # Act and Assert
+    with pytest.raises(ValueError):
+        tracker.add_expense(-10)
+
 # TODO: Write test_add_expense_can_store_category here
 
 

Lesson2-Exercise2-Delete/solution/src/tracker.py

@@ -10,6 +10,8 @@ def total(self):
 
     # ------------- Create -------------
     def add_expense(self, amount, category=None):
+        if amount <= 0:
+            raise ValueError("Expense amount must be positive.")
         expense_id = str(uuid.uuid4())
         expense = {"id": expense_id, "amount": amount, "category": category}
         self.expenses.append(expense)
@@ -22,6 +24,15 @@ def list_expenses_by_category(self, category):
     def get_expense(self, expense_id):
         return next((e for e in self.expenses if e["id"] == expense_id), None)
 
+    # ------------- Update -------------
+    def edit_expense(self, expense_id, new_amount=None, new_category=None):
+        expense = self.get_expense(expense_id)
+        if expense:
+            if new_amount is not None:
+                expense["amount"] = amount
+            if new_category is not None:
+                expense["category"] = new_category
+
     # ------------- Delete -------------
     def delete_expense(self, expense_id):
         expense_to_delete = self.get_expense(expense_id)

Lesson2-Exercise2-Delete/solution/tests/test_tracker.py

@@ -6,29 +6,57 @@ def tracker():
     return ExpenseTracker()
 
 def test_add_expense_stores_amount(tracker):
+    # Act
     tracker.add_expense(50)
+    # Assert
     assert tracker.expenses[0]['amount'] == 50
 
-def test_add_expense_with_category(tracker):
+def test_add_expense_updates_total(tracker):
+    # Act
+    tracker.add_expense(10)
+    # Assert
+    assert tracker.total == 10
+
+def test_add_multiple_expenses(tracker):
+    # Act
+    tracker.add_expense(10)
+    tracker.add_expense(5)
+    # Assert
+    assert tracker.total == 15
+
+def test_add_expense_with_negative_amount_fails(tracker):
+    # Act and Assert
+    with pytest.raises(ValueError):
+        tracker.add_expense(-10)
+
+def test_add_expense_can_store_category(tracker):
+    # Act
     tracker.add_expense(10, category="food")
+    # Assert
     assert tracker.expenses[0]['category'] == "food"
 
 def test_list_expenses_by_category_returns_only_requested_category(tracker):
     # Arrange
     tracker.add_expense(10.00, category="food")
     tracker.add_expense(20.00, category="travel")
     tracker.add_expense(5.00,  category="food")
-
     # Act
     results = tracker.list_expenses_by_category("food")
-
     # Assert
     assert isinstance(results, list)
-    # Only "food" expenses should be returned
     assert all(item["category"] == "food" for item in results)
-    # Amounts for the returned items should match the two "food" entries
     assert sorted(item["amount"] for item in results) == [5.00, 10.00]
 
+def test_edit_expense(tracker):
+    # Arrange
+    expense_id = tracker.add_expense(10, category="food")
+    # Act
+    tracker.edit_expense(expense_id, new_amount=12.50, new_category="dining")
+    edited_expense = tracker.get_expense(expense_id)
+    # Assert
+    assert tracker.total == 12.50
+    assert edit_expense["category"] == "dining"
+
 def test_delete_expense(tracker):    
     # Arrange: Add an expense to delete
     expense_id = tracker.add_expense(20, "entertainment")

Lesson2-Exercise2-Delete/starter/src/tracker.py

@@ -10,6 +10,8 @@ def total(self):
 
     # ------------- Create -------------
     def add_expense(self, amount, category=None):
+        if amount <= 0:
+            raise ValueError("Expense amount must be positive.")
         expense_id = str(uuid.uuid4())
         expense = {"id": expense_id, "amount": amount, "category": category}
         self.expenses.append(expense)
@@ -22,5 +24,13 @@ def list_expenses_by_category(self, category):
     def get_expense(self, expense_id):
         return next((e for e in self.expenses if e["id"] == expense_id), None)
 
+    # ------------- Update -------------
+    def edit_expense(self, expense_id, new_amount=None, new_category=None):
+        expense = self.get_expense(expense_id)
+        if expense:
+            if new_amount is not None:
+                expense["amount"] = amount
+            if new_category is not None:
+                expense["category"] = new_category
 
     # ------------- Delete -------------

Lesson2-Exercise2-Delete/starter/tests/test_tracker.py

@@ -10,27 +10,55 @@ def tracker():
     return ExpenseTracker()
 
 def test_add_expense_stores_amount(tracker):
+    # Act
     tracker.add_expense(50)
+    # Assert
     assert tracker.expenses[0]['amount'] == 50
 
-def test_add_expense_with_category(tracker):
+def test_add_expense_updates_total(tracker):
+    # Act
+    tracker.add_expense(10)
+    # Assert
+    assert tracker.total == 10
+
+def test_add_multiple_expenses(tracker):
+    # Act
+    tracker.add_expense(10)
+    tracker.add_expense(5)
+    # Assert
+    assert tracker.total == 15
+
+def test_add_expense_with_negative_amount_fails(tracker):
+    # Act and Assert
+    with pytest.raises(ValueError):
+        tracker.add_expense(-10)
+
+def test_add_expense_can_store_category(tracker):
+    # Act
     tracker.add_expense(10, category="food")
+    # Assert
     assert tracker.expenses[0]['category'] == "food"
 
+def test_edit_expense(tracker):
+    # Arrange
+    expense_id = tracker.add_expense(10, category="food")
+    # Act
+    tracker.edit_expense(expense_id, new_amount=12.50, new_category="dining")
+    edited_expense = tracker.get_expense(expense_id)
+    # Assert
+    assert tracker.total == 12.50
+    assert edit_expense["category"] == "dining"
+
 def test_list_expenses_by_category_returns_only_requested_category(tracker):
     # Arrange
     tracker.add_expense(10.00, category="food")
     tracker.add_expense(20.00, category="travel")
     tracker.add_expense(5.00,  category="food")
-
     # Act
     results = tracker.list_expenses_by_category("food")
-
     # Assert
     assert isinstance(results, list)
-    # Only "food" expenses should be returned
     assert all(item["category"] == "food" for item in results)
-    # Amounts for the returned items should match the two "food" entries
     assert sorted(item["amount"] for item in results) == [5.00, 10.00]
 
 # TODO: Write test_delete_expense(tracker) here