Sapphire - Mel M. & Jen T.

README.md

@@ -1,4 +1,15 @@
 # Viewing Party
+## MEL & JEN
+
+#Pair Plan:
+Access needs - In Person and then if needed zoom/liveshare. (Possibly evening works for both of us for zoom)
+
+Your learning style - Getting errors and failed tests, also making print tests. Comments to help catch what the code is doing behind the scenes. 
+
+How you prefer to receive feedback - Communicating ideas to each other and finding common ground or compromise for ideas that we are split on. 
+
+One team communication skill you want to improve with this experience - New to team collaboration so we want to see what we might need to improve and what we excel at. 
+
 
 ## Skills Assessed
 

tests/test_constants.py

@@ -91,6 +91,16 @@
 
 #-----WAVE 3--------
 USER_DATA_3 = copy.deepcopy(USER_DATA_2)
+# USER_DATA_2 = {
+# "watched": [
+# FANTASY_1, 
+# FANTASY_2, 
+# FANTASY_3, 
+# ACTION_1, 
+# INTRIGUE_1, 
+# INTRIGUE_2
+# ], 
+# }
 USER_DATA_3["friends"] = [
  {
  "watched": [

tests/test_wave_01.py

@@ -4,7 +4,7 @@
 from viewing_party.party import *
 from tests.test_constants import *
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_create_successful_movie():
  # Arrange
  movie_title = MOVIE_TITLE_1
@@ -19,7 +19,7 @@ def test_create_successful_movie():
  assert new_movie["genre"] == GENRE_1
  assert new_movie["rating"] == pytest.approx(RATING_1)
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_create_no_title_movie():
  # Arrange
  movie_title = None
@@ -32,7 +32,7 @@ def test_create_no_title_movie():
  # Assert
  assert new_movie is None
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_create_no_genre_movie():
  # Arrange
  movie_title = "Title A"
@@ -45,7 +45,7 @@ def test_create_no_genre_movie():
  # Assert
  assert new_movie is None
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_create_no_rating_movie():
  # Arrange
  movie_title = "Title A"
@@ -58,7 +58,7 @@ def test_create_no_rating_movie():
  # Assert
  assert new_movie is None
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_adds_movie_to_user_watched():
  # Arrange
  movie = {
@@ -79,7 +79,7 @@ def test_adds_movie_to_user_watched():
  assert updated_data["watched"][0]["genre"] == GENRE_1
  assert updated_data["watched"][0]["rating"] == RATING_1
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_adds_movie_to_non_empty_user_watched():
  # Arrange
  movie = {
@@ -99,7 +99,7 @@ def test_adds_movie_to_non_empty_user_watched():
  assert movie in updated_data["watched"]
  assert FANTASY_2 in updated_data["watched"]
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_adds_movie_to_user_watchlist():
  # Arrange
  movie = {
@@ -120,7 +120,7 @@ def test_adds_movie_to_user_watchlist():
  assert updated_data["watchlist"][0]["genre"] == GENRE_1
  assert updated_data["watchlist"][0]["rating"] == RATING_1
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_adds_movie_to_non_empty_user_watchlist():
  # Arrange
  movie = {
@@ -140,7 +140,7 @@ def test_adds_movie_to_non_empty_user_watchlist():
  assert movie in updated_data["watchlist"]
  assert FANTASY_2 in updated_data["watchlist"]
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_moves_movie_from_watchlist_to_empty_watched():
  # Arrange
  janes_data = {
@@ -159,12 +159,14 @@ def test_moves_movie_from_watchlist_to_empty_watched():
  assert len(updated_data["watchlist"]) == 0
  assert len(updated_data["watched"]) == 1
 
- raise Exception("Test needs to be completed.")
+ assert updated_data["watched"][0]["title"] == MOVIE_TITLE_1
+ assert updated_data["watched"][0]["genre"] == GENRE_1
+ assert updated_data["watched"][0]["rating"] == RATING_1
  # *******************************************************************************************
  # ****** Add assertions here to test that the correct movie was added to "watched" **********
  # *******************************************************************************************
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_moves_movie_from_watchlist_to_watched():
  # Arrange
  movie_to_watch = HORROR_1
@@ -182,13 +184,20 @@ def test_moves_movie_from_watchlist_to_watched():
  # Assert
  assert len(updated_data["watchlist"]) == 1
  assert len(updated_data["watched"]) == 2
+
+ # Had to fix the assertions 
+ assert updated_data["watchlist"][0] == FANTASY_1
+ assert movie_to_watch in updated_data["watched"]
 
- raise Exception("Test needs to be completed.")
+ # Old assertions 
+ #assert watchlist in updated_data["watched"]
+ # assert FANTASY_1 in updated_data["watchlist"]
+
  # *******************************************************************************************
  # ****** Add assertions here to test that the correct movie was added to "watched" **********
  # *******************************************************************************************
 
-@pytest.mark.skip()
+#@pytest.mark.skip()
 def test_does_nothing_if_movie_not_in_watchlist():
  # Arrange
  movie_to_watch = HORROR_1

tests/test_wave_02.py

@@ -2,7 +2,7 @@
 from viewing_party.party import *
 from tests.test_constants import *
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_calculates_watched_average_rating():
  # Arrange
  janes_data = clean_wave_2_data()
@@ -14,7 +14,7 @@ def test_calculates_watched_average_rating():
  assert average == pytest.approx(3.58333)
  assert janes_data == clean_wave_2_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_empty_watched_average_rating_is_zero():
  # Arrange
  janes_data = {
@@ -27,7 +27,7 @@ def test_empty_watched_average_rating_is_zero():
  # Assert
  assert average == pytest.approx(0.0)
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_most_watched_genre():
  # Arrange
  janes_data = clean_wave_2_data()
@@ -39,7 +39,7 @@ def test_most_watched_genre():
  assert popular_genre == "Fantasy"
  assert janes_data == clean_wave_2_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_most_watched_genre_order_mixed():
  # Arrange
  janes_data = clean_wave_2b_data()
@@ -51,7 +51,7 @@ def test_most_watched_genre_order_mixed():
  assert popular_genre == "Fantasy"
  assert janes_data == clean_wave_2b_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_genre_is_None_if_empty_watched():
  # Arrange
  janes_data = {

tests/test_wave_03.py

@@ -2,7 +2,7 @@
 from viewing_party.party import *
 from tests.test_constants import *
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_my_unique_movies():
  # Arrange
  amandas_data = clean_wave_3_data()
@@ -16,7 +16,7 @@ def test_my_unique_movies():
  assert INTRIGUE_2 in amandas_unique_movies
  assert amandas_data == clean_wave_3_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_my_not_unique_movies():
  # Arrange
  amandas_data = clean_wave_3_data()
@@ -28,7 +28,7 @@ def test_my_not_unique_movies():
  # Assert
  assert len(amandas_unique_movies) == 0
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_friends_unique_movies():
  # Arrange
  amandas_data = clean_wave_3_data()
@@ -43,7 +43,7 @@ def test_friends_unique_movies():
  assert FANTASY_4 in friends_unique_movies
  assert amandas_data == clean_wave_3_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_friends_unique_movies_not_duplicated():
  # Arrange
  amandas_data = clean_wave_3_data()
@@ -54,13 +54,15 @@ def test_friends_unique_movies_not_duplicated():
 
  # Assert
  assert len(friends_unique_movies) == 3
+ assert INTRIGUE_3 in friends_unique_movies
+ assert HORROR_1 in friends_unique_movies
+ assert FANTASY_4 in friends_unique_movies
 
- raise Exception("Test needs to be completed.")
  # *************************************************************************************************
  # ****** Add assertions here to test that the correct movies are in friends_unique_movies **********
  # **************************************************************************************************
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_friends_not_unique_movies():
  # Arrange
  amandas_data = {

tests/test_wave_04.py

@@ -2,7 +2,7 @@
 from viewing_party.party import *
 from tests.test_constants import *
 
-@pytest.mark.skip()
+
 def test_get_available_friend_rec():
  # Arrange
  amandas_data = clean_wave_4_data()
@@ -16,7 +16,7 @@ def test_get_available_friend_rec():
  assert FANTASY_4b in recommendations
  assert amandas_data == clean_wave_4_data()
 
-@pytest.mark.skip()
+
 def test_no_available_friend_recs():
  # Arrange
  amandas_data = {
@@ -38,7 +38,7 @@ def test_no_available_friend_recs():
  # Assert
  assert len(recommendations) == 0
 
-@pytest.mark.skip()
+
 def test_no_available_friend_recs_watched_all():
  # Arrange
  amandas_data = {

tests/test_wave_05.py

@@ -2,7 +2,7 @@
 from viewing_party.party import *
 from tests.test_constants import *
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_new_genre_rec():
  # Arrange
  sonyas_data = clean_wave_5_data()
@@ -17,7 +17,7 @@ def test_new_genre_rec():
  assert FANTASY_4b in recommendations
  assert sonyas_data == clean_wave_5_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_new_genre_rec_from_empty_watched():
  # Arrange
  sonyas_data = {
@@ -38,7 +38,7 @@ def test_new_genre_rec_from_empty_watched():
  # Assert
  assert len(recommendations) == 0
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_new_genre_rec_from_empty_friends():
  # Arrange
  sonyas_data = {
@@ -53,12 +53,15 @@ def test_new_genre_rec_from_empty_friends():
  ]
  }
 
- raise Exception("Test needs to be completed.")
+ recommendations = get_new_rec_by_genre(sonyas_data)
+
+ assert len(recommendations) == 0
+
  # *********************************************************************
  # ****** Complete the Act and Assert Portions of these tests **********
  # *********************************************************************
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_unique_rec_from_favorites():
  # Arrange
  sonyas_data = clean_wave_5_data()
@@ -72,7 +75,7 @@ def test_unique_rec_from_favorites():
  assert INTRIGUE_2b in recommendations
  assert sonyas_data == clean_wave_5_data()
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_unique_from_empty_favorites():
  # Arrange
  sonyas_data = {
@@ -94,7 +97,7 @@ def test_unique_from_empty_favorites():
  # Assert
  assert len(recommendations) == 0
 
-@pytest.mark.skip()
+# @pytest.mark.skip()
 def test_new_rec_from_empty_friends():
  # Arrange
  sonyas_data = {