Merge pull request #34 from nqulizada835/main

Feed the cat specified by the "Cat" parameter.

Author: khider

pyCatSim/api/__init__.py

@@ -2,6 +2,6 @@
 Definition of the various Classes and in which Modules they may be found.
 """
 
-from .cat import Cat
-from .cat import Clowder
+from .cat import Cat, Clowder
 from .human import Owner
+

pyCatSim/api/human.py

@@ -7,6 +7,7 @@
 from ..api.cat import Cat
 from ..utils import facts
 
+
 class Owner:
     """
     Represents a cat owner who can care for one or more cats
@@ -71,7 +72,6 @@ def give_fact(self):
         return facts.random_facts()
 
     def __init__(self, name, cats_owned):
-
         if isinstance(cats_owned, Cat):
             cats_owned = [cats_owned]
         elif isinstance(cats_owned, list):
@@ -83,6 +83,30 @@ def __init__(self, name, cats_owned):
         self.name = name
         self.cats_owned = cats_owned
 
+    def feed(self, cat):
+        """
+        Feed the specified cat owned by this Owner.
+
+        Parameters
+        ----------
+        cat : Cat
+            The cat to feed. Must be owned by this owner.
+
+        Raises
+        ------
+        ValueError
+            If the specified cat is not owned by this owner.
+        AttributeError
+            If the cat does not have 'hunger_level' or 'mood' attributes.
+        """
+        if cat not in self.cats_owned:
+            raise ValueError("This owner does not own the specified cat.")
+        if not hasattr(cat, 'hunger_level') or not hasattr(cat, 'mood'):
+            raise AttributeError("Cat must have 'hunger_level' and 'mood' attributes.")
+
+        cat.hunger_level = max(0, cat.hunger_level - 1)
+        cat.mood += 1
+
     def adopt(self, cats_object):
 
         """
@@ -161,5 +185,4 @@ def groom(self,Cat):
         """
 
         Cat.mood += 1
-        
-        
+ 

pyCatSim/tests/__init__.py

@@ -1 +1,9 @@
-#Test
+class Owner:
+    def __init__(self, name, cats_owned):
+        if isinstance(cats_owned, Cat):
+            self.cats_owned = [cats_owned]
+        elif isinstance(cats_owned, list):
+            self.cats_owned = cats_owned
+        else:
+            raise TypeError("Must provide Cat or list of Cats")
+        self.name = name

pyCatSim/tests/test_api_Cat.py

@@ -198,4 +198,4 @@ def test_give_fact_t0(self):
         "Cats use their whiskers to detect changes in their surroundings.",
         "The average house cat can run at speeds up to 30 mph.",
         "Cats meow only to communicate with humans."
-    ]
+    ]

pyCatSim/tests/test_api_Owner.py

@@ -19,24 +19,24 @@
 '''
 
 import pytest
-from pyCatSim import Cat, Owner
+import pyCatSim as cat
 
 class TesthumanOwnerInit:
     ''' Test for Owner instantiation '''
 
     def test_init_t0(self):
-         cat1 = Cat(name="Whiskers")
-         owner1 = Owner(name="Sasha", cats_owned=cat1)
+         cat1 = cat.Cat(name="Whiskers")
+         owner1 = cat.Owner(name="Sasha", cats_owned=cat1)
 
          assert owner1.name == 'Sasha'
          assert type(owner1.cats_owned) is list
          assert len(owner1.cats_owned) == 1
 
     def test_init_t1(self):
-        cat1 = Cat(name="Whiskers")
-        cat2 = Cat(name="Boots", color="tabby")
+        cat1 = cat.Cat(name="Whiskers")
+        cat2 = cat.Cat(name="Boots", color="tabby")
         # Multiple cats
-        owner1 = Owner(name="Liam", cats_owned=[cat1, cat2])
+        owner1 = cat.Owner(name="Liam", cats_owned=[cat1, cat2])
 
         assert owner1.name == 'Liam'
         assert type(owner1.cats_owned) is list
@@ -47,10 +47,29 @@ class TesthumanOwnerFact:
     ''' Test for the give_fact function'''
 
     def test_give_fact_t0(self):
-        cat1 = Cat(name="Whiskers")
-        owner1 = Owner(name="Sasha", cats_owned=cat1)
-        
+        cat1 = cat.Cat(name="Whiskers")
+        owner1 = cat.Owner(name="Sasha", cats_owned=cat1)
+        # Test that the fact is given correctly
         owner1.give_fact()
+
+
+
+class TesthumanOwnerAdopt:
+    def test_adopt_t0(self):
+        cat1 = cat.Cat(name="Whiskers")
+        cat2 = cat.Cat(name="Boots", color="tabby")
+        owner1 = cat.Owner(name="Sasha", cats_owned=cat1)
+        owner2 = cat.Owner(name="Liam", cats_owned=[cat1, cat2])
+        chestnut = cat.Cat(name='Chestnut', age=4, color='tabby')
+        nutmeg = cat.Cat(name='Nutmeg', age=3, color='tortoiseshell')
+
+        new_cat = chestnut
+        owner1.adopt(new_cat)
+        assert owner1.cats_owned[-1] == new_cat
+
+        new_cat = [chestnut, nutmeg]
+        owner2.adopt(new_cat)
+        assert owner2.cats_owned[-len(new_cat):] == new_cat
 
 
 class TesthumanOwnerAdopt:
@@ -70,17 +89,24 @@ def test_adopt_t0(self):
         new_cat=[chestnut,nutmeg]
         owner2.adopt(new_cat)
         assert owner2.cats_owned[-len(new_cat):]==new_cat
-        
-class TesthumanActions:
+
+class TesthumanGroom:
     ''' Test for Owner action success '''
 
     def test_groom_t0(self):
-         cat1 = Cat(name="Whiskers",mood=7)
-         owner1 = Owner(name="Sasha", cats_owned=cat1)
+        cat1 = cat.Cat(name="Whiskers", mood=7)
+        owner1 = cat.Owner(name="Sasha", cats_owned=cat1)
 
-         owner1.groom(cat1)
+        owner1.groom(cat1)
+        assert cat1.mood == 8
 
-         assert cat1.mood == 8
-   
-        
-     
+class TesthumanOwnerFeed:
+    def test_feed_t0(self):
+        """
+        Test that feeding a cat decreases hunger_level by 1 and increases mood by 1.
+        """
+        test_cat = cat.Cat(name="Fluffy", hunger_level=5, mood=4)
+        test_owner = cat.Owner(name="Jordan", cats_owned=test_cat)
+        test_owner.feed(test_cat)
+        assert test_cat.hunger_level == 4
+        assert test_cat.mood == 5