Skip to content

C22, sphinx, Priyanka and Maybellene #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mayboolean wants to merge 17 commits into
base: main
Choose a base branch
from
Open

C22, sphinx, Priyanka and Maybellene #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
02ab0a6
writes functions for wave 01 and test_wave_01
Sep 23, 2024
8913d72
Priyanka wave1 version
PriyankaKaramchandani Sep 23, 2024
e344113
Priyanka wave 1 version
PriyankaKaramchandani Sep 23, 2024
d0705de
wave 2 push by Priyanka
PriyankaKaramchandani Sep 24, 2024
8ac62c5
wave 2 fn
Sep 24, 2024
d2b05ef
Merge branch 'main' of https://github.com/mayboolean/viewing-party
Sep 24, 2024
a5c6632
renaming wave 1 func, implements wave 3 first func
Sep 24, 2024
3918e2c
renaming wave 2 functions
Sep 24, 2024
07bfa2c
renames wave 3 function 01 (get_unique_watched). creates get_unique_w…
Sep 24, 2024
bdc22f6
make changes to wave 3 functions, both pass
Sep 24, 2024
68fda17
finishes wave 3 and adds assert in test
Sep 24, 2024
64fe1a1
wave 3 commit
PriyankaKaramchandani Sep 24, 2024
b0aaae6
merges wave 3
PriyankaKaramchandani Sep 24, 2024
d38aa87
wave 4 first try
PriyankaKaramchandani Sep 25, 2024
fce26b2
wave 4 function 1
Sep 25, 2024
e1487d5
finishes wave 4 and passes all test
Sep 25, 2024
4da53bd
finishes wave 5 both functions, passes all tests, add assertion for a…
Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions play_tester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
pp = pprint.PrettyPrinter(indent=4)

# play testing section
print("\n-----Wave 01 test data-----")
pp.pprint(HORROR_1)
pp.pprint(FANTASY_1)
pp.pprint(FANTASY_2)
# print("\n-----Wave 01 test data-----")
# pp.pprint(HORROR_1)
# pp.pprint(FANTASY_1)
# pp.pprint(FANTASY_2)

# print("\n-----Wave 02 user_data-----")
# pp.pprint(clean_wave_2_data())
Expand All @@ -21,8 +21,11 @@
#pp.pprint(clean_wave_3_data())

# Wave 04 user data
#print("\n-----Wave 04 user_data-----")
print("\n-----Wave 04 user_data-----")
#pp.pprint(clean_wave_4_data())
get_available_recs(clean_wave_4_data())



# Wave 05 user data
#print("\n-----Wave 05 user_data-----")
Expand Down
49 changes: 28 additions & 21 deletions tests/test_wave_01.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import pytest

# NOTE: In production code, we developers should change import * to something more specific. Due to some constraints of this project, we will import * in our test files.
# from viewing_party.main import *
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
Expand All @@ -19,7 +20,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
Expand All @@ -28,11 +29,11 @@ def test_create_no_title_movie():

# Act
new_movie = create_movie(movie_title, genre, rating)

print(new_movie)

@yangashley yangashley Oct 1, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove debugging print statements before committing code for review

# Assert
assert new_movie is None

@pytest.mark.skip()
# @pytest.mark.skip()
def test_create_no_genre_movie():
# Arrange
movie_title = "Title A"
Expand All @@ -45,7 +46,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"
Expand All @@ -58,7 +59,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 = {
Expand All @@ -79,7 +80,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 = {
Expand All @@ -99,7 +100,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 = {
Expand All @@ -120,7 +121,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 = {
Expand All @@ -140,7 +141,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 = {
Expand All @@ -159,12 +160,17 @@ 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.")
# *******************************************************************************************
# ****** Add assertions here to test that the correct movie was added to "watched" **********
# *******************************************************************************************
# ADDED ASSERTIONS
assert updated_data["watchlist"] == []
assert updated_data["watched"] == [{
"title": MOVIE_TITLE_1,
"genre": GENRE_1,
"rating": RATING_1
}]
Comment on lines +165 to +169

@yangashley yangashley Oct 1, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍




@pytest.mark.skip()
# @pytest.mark.skip()
def test_moves_movie_from_watchlist_to_watched():
# Arrange
movie_to_watch = HORROR_1
Expand All @@ -182,13 +188,14 @@ def test_moves_movie_from_watchlist_to_watched():
# Assert
assert len(updated_data["watchlist"]) == 1
assert len(updated_data["watched"]) == 2

raise Exception("Test needs to be completed.")
# *******************************************************************************************
# ****** Add assertions here to test that the correct movie was added to "watched" **********
# *******************************************************************************************

@pytest.mark.skip()
# ADDED ASSERTIONS
assert updated_data["watchlist"] == [FANTASY_1]
assert updated_data["watched"] == [FANTASY_2, movie_to_watch]
Comment on lines +193 to +194

@yangashley yangashley Oct 1, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of putting FANTASY_1 in a list and checking that it's equal to updated_data["watchlist"], we could write the assertion on line 193 like:

assert FANTASY_1 in updated_data["watchlist"]

How could you write line 194 using the in operator? Also, if the order of the movies in updated_data["watched"] was movie_to_watch and then FANTASY_2, this test would fail. Since we're not concerned with order, using in is a sufficient check.

@mayboolean mayboolean Oct 2, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be:
assert FANTASY2 in updated_data[watched] and movie_to_watch in updated_data[watched]

or
assert for movie in [FANTASY_2, movie_to_watch] if movie in updated_data["watched"]

@yangashley yangashley Oct 2, 2024 •
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah more like your first assertion, but I would break em up on two lines instead of using the and for readability.

assert FANTASY_2 in updated_data["watched"] 
assert movie_to_watch in updated_data["watched"]




# @pytest.mark.skip()
def test_does_nothing_if_movie_not_in_watchlist():
# Arrange
movie_to_watch = HORROR_1
Expand Down
10 changes: 5 additions & 5 deletions tests/test_wave_02.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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 = {
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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 = {
Expand Down
45 changes: 36 additions & 9 deletions tests/test_wave_03.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -43,24 +43,51 @@ 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()
amandas_data["friends"][0]["watched"].append(INTRIGUE_3)

expected_movies = [{

@yangashley yangashley Oct 1, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

expected_movies is created and then isn't accessed in the test so we should remove it from it to keep the test concise.

"title": "The Lord of the Functions: The Fellowship of the Function",
"genre": "Fantasy",
"rating": 4.8
},
{
"title": "The Lord of the Functions: The Return of the Value",
"genre": "Fantasy",
"rating": 4.0
},
{
"title": "The Programmer: An Unexpected Stack Trace",
"genre": "Fantasy",
"rating": 4.0
},
{
"title": "It Came from the Stack Trace",
"genre": "Horror",
"rating": 3.5
},
{
"title": "Recursion",
"genre": "Intrigue",
"rating": 2.0
}]
# Act
friends_unique_movies = get_friends_unique_watched(amandas_data)

# Assert
assert len(friends_unique_movies) == 3
assert INTRIGUE_3 in friends_unique_movies

@yangashley yangashley Oct 1, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You check that INTRIGUE_3 is in friends_unique_movies. How about explicitly checking that the other two movies that are a part of the movies only watched by friends are also in friends_unique_movies?

# #check for duplicates
unique_titles = set()
for movie in friends_unique_movies:
unique_titles.add(movie["title"])
assert len(unique_titles) == len(friends_unique_movies)
Comment on lines +84 to +87

@yangashley yangashley Oct 1, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the scenario that you're testing for in lines 84-87? Trying to understand if the code on lines 84-87 are actually testing what we want to test.

The assertion on line 87 isn't testing the logic in the function you wrote get_friends_unique_watched. It is creating a set, and then adding movies to the set. If there were duplicates in friends_unique_movies we wouldn't know it because they're not getting added to the unique_titles set.

To make this test more robust, we could check that all the movies that are supposed to be in friends_unique_movies are there and we could also check that all the movies that are not supposed to be in amandas_data["watched"] are not there.


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 = {
Expand Down
6 changes: 3 additions & 3 deletions tests/test_wave_04.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from viewing_party.party import *
from tests.test_constants import *

@pytest.mark.skip()
# @pytest.mark.skip()
def test_get_available_friend_rec():
# Arrange
amandas_data = clean_wave_4_data()
Expand All @@ -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()
# @pytest.mark.skip()
def test_no_available_friend_recs():
# Arrange
amandas_data = {
Expand All @@ -38,7 +38,7 @@ def test_no_available_friend_recs():
# Assert
assert len(recommendations) == 0

@pytest.mark.skip()
# @pytest.mark.skip()
def test_no_available_friend_recs_watched_all():
# Arrange
amandas_data = {
Expand Down
15 changes: 9 additions & 6 deletions tests/test_wave_05.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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 = {
Expand All @@ -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 = {
Expand All @@ -52,13 +52,16 @@ def test_new_genre_rec_from_empty_friends():
}
]
}
recommendations = get_new_rec_by_genre(sonyas_data)
assert recommendations == []
assert len(recommendations) == 0
Comment on lines +56 to +57

@yangashley yangashley Oct 1, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Notice that these two assertions are testing the same thing. One of them can be removed to make this test more concise.

The most specific is assert recommendations == [] since it guarantees the thing in recommendations is actually a list (and it's empty). The len(recommendations) == 0 only enforces that recommendations is something we can get the length of (and it's empty).

If we're writing tests that enforce the specified behavior, I'd tend towards the first (since we're really looking for an empty list).


raise Exception("Test needs to be completed.")
# raise Exception("Test needs to be completed.")
# *********************************************************************
# ****** 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()
Expand All @@ -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 = {
Expand Down
Loading