Resolve the conflict in test wave 5

momofAnAl · Sep 25, 2024 · ff12375 · ff12375
1 parent e1c2291
commit ff12375
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 33 deletions.
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
@@ -2,11 +2,7 @@
 from viewing_party.party import *
 from tests.test_constants import *
 
-<<<<<<< HEAD
-# #@pytest.mark.skip()
-=======
 # @pytest.mark.skip()
->>>>>>> de81018a4094d695fdbbdecb9f0b773cc1c41680
 def test_new_genre_rec():
     # Arrange
     sonyas_data = clean_wave_5_data()
@@ -21,11 +17,7 @@ def test_new_genre_rec():
     assert FANTASY_4b in recommendations
     assert sonyas_data == clean_wave_5_data()
 
-<<<<<<< HEAD
-# #@pytest.mark.skip()
-=======
 # @pytest.mark.skip()
->>>>>>> de81018a4094d695fdbbdecb9f0b773cc1c41680
 def test_new_genre_rec_from_empty_watched():
     # Arrange
     sonyas_data = {
@@ -46,11 +38,7 @@ def test_new_genre_rec_from_empty_watched():
     # Assert
     assert len(recommendations) == 0
 
-<<<<<<< HEAD
 #@pytest.mark.skip()
-=======
-# @pytest.mark.skip()
->>>>>>> de81018a4094d695fdbbdecb9f0b773cc1c41680
 def test_new_genre_rec_from_empty_friends():
     # Arrange
     sonyas_data = {
@@ -65,30 +53,18 @@ def test_new_genre_rec_from_empty_friends():
         ]
     }
     # Act
-<<<<<<< HEAD
-    recommendations = get_new_rec_by_genre(sonyas_data)   
-
-=======
 
     empty_list = get_new_rec_by_genre(sonyas_data)
 
     # Assert
     assert empty_list == []
 
->>>>>>> de81018a4094d695fdbbdecb9f0b773cc1c41680
     # raise Exception("Test needs to be completed.")
     # *********************************************************************
     # ****** Complete the Act and Assert Portions of these tests **********
     # *********************************************************************
-<<<<<<< HEAD
-    assert recommendations == []
-
-
-# #@pytest.mark.skip()
-=======
 
 # @pytest.mark.skip()
->>>>>>> de81018a4094d695fdbbdecb9f0b773cc1c41680
 def test_unique_rec_from_favorites():
     # Arrange
     sonyas_data = clean_wave_5_data()
@@ -102,11 +78,7 @@ def test_unique_rec_from_favorites():
     assert INTRIGUE_2b in recommendations
     assert sonyas_data == clean_wave_5_data()
 
-<<<<<<< HEAD
-#@pytest.mark.skip()
-=======
 # @pytest.mark.skip()
->>>>>>> de81018a4094d695fdbbdecb9f0b773cc1c41680
 def test_unique_from_empty_favorites():
     # Arrange
     sonyas_data = {
@@ -128,11 +100,7 @@ def test_unique_from_empty_favorites():
     # Assert
     assert len(recommendations) == 0
 
-<<<<<<< HEAD
-#@pytest.mark.skip()
-=======
 # @pytest.mark.skip()
->>>>>>> de81018a4094d695fdbbdecb9f0b773cc1c41680
 def test_new_rec_from_empty_friends():
     # Arrange
     sonyas_data = {

diff --git a/viewing_party/party.py b/viewing_party/party.py
@@ -167,7 +167,6 @@ def get_most_watched_genre(user_data):
 
 def get_friends_watched(user_data):
     friends_watched= []
-    #[HORROR_1,FANTASY_1]
 
     for friend in user_data["friends"]:
         friends_watched.extend(friend["watched"])