Skip to content
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

Ocelots - Diana A. #20

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Ocelots - Diana A. #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4d53f98
Add fixture for wave1
diarreola Nov 7, 2022
f4c2b62
Add tests for wave1 add_to_watched func
diarreola Nov 7, 2022
897a6d4
Add wave1 create_movie and add_to_watched
diarreola Nov 7, 2022
44839a0
revert wave1 fixture
diarreola Nov 7, 2022
279a955
Add and update tests for add_to_watchlist func
diarreola Nov 7, 2022
7baddec
Add add_to_watchlist func
diarreola Nov 7, 2022
dd41815
Updated wave 1 watch_movie tests
diarreola Nov 7, 2022
263755a
Add watch_movie func
diarreola Nov 7, 2022
71db575
Add wave 2 functions
diarreola Nov 7, 2022
8d38f54
Add wave 3 get_unique_watched func
diarreola Nov 8, 2022
eec0982
Wave 3 complete
diarreola Nov 11, 2022
d2cfc8f
Update wave3 functions
diarreola Nov 11, 2022
c56ac14
Completed wave 4
diarreola Nov 11, 2022
d6e1148
Add wave5 function1
diarreola Nov 13, 2022
b36fc81
WIP neeed to finish last function, will finish on monday
diarreola Nov 14, 2022
32205da
Complete wave 5
diarreola Nov 14, 2022
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
4 changes: 4 additions & 0 deletions tests/test_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
GENRE_1 = "Horror"
RATING_1 = 3.5

MOVIE_TITLE_2 = "Ratatouille"
Copy link

Choose a reason for hiding this comment

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

Way to go, even adding additional testing data!

GENRE_2 = "Comedy"
RATING_2 = 4.3

#----------WAVE02-------------
HORROR_1 = {
"title": MOVIE_TITLE_1,
Expand Down
105 changes: 84 additions & 21 deletions tests/test_wave_01.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from viewing_party.party import *
from tests.test_constants import *

@pytest.mark.skip()
def test_create_successful_movie():
# Arrange
movie_title = MOVIE_TITLE_1
Expand All @@ -19,7 +18,6 @@ def test_create_successful_movie():
assert new_movie["genre"] == GENRE_1
assert new_movie["rating"] == pytest.approx(RATING_1)

@pytest.mark.skip()
def test_create_no_title_movie():
# Arrange
movie_title = None
Expand All @@ -32,7 +30,6 @@ def test_create_no_title_movie():
# Assert
assert new_movie is None

@pytest.mark.skip()
def test_create_no_genre_movie():
# Arrange
movie_title = "Title A"
Expand All @@ -45,7 +42,6 @@ def test_create_no_genre_movie():
# Assert
assert new_movie is None

@pytest.mark.skip()
def test_create_no_rating_movie():
# Arrange
movie_title = "Title A"
Expand All @@ -58,8 +54,20 @@ def test_create_no_rating_movie():
# Assert
assert new_movie is None

@pytest.mark.skip()
def test_adds_movie_to_user_watched():
def test_adds_no_movie_to_user_watched():
# Arrange
movie = {}
user_data = {
"watched": []
}

# Act
updated_data = add_to_watched(user_data, movie)

# Assert
assert len(updated_data["watched"]) == 0

def test_adds_movie_to_empty_user_watched_list():
# Arrange
movie = {
"title": MOVIE_TITLE_1,
Expand All @@ -79,8 +87,45 @@ 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()
def test_adds_movie_to_user_watchlist():
def test_adds_movie_to_user_watched():
# Arrange
movie = {
"title": MOVIE_TITLE_1,
"genre": GENRE_1,
"rating": RATING_1
}
movie_watched = {
"title": MOVIE_TITLE_2,
"genre": GENRE_2,
"rating": RATING_2
}
user_data = {
"watched": [movie_watched]
}

# Act
updated_data = add_to_watched(user_data, movie)

# Assert
assert len(updated_data["watched"]) == 2
assert updated_data["watched"][1]["title"] == MOVIE_TITLE_1
Copy link

Choose a reason for hiding this comment

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

Excellent thoroughness, testing all of the attributes here for completeness

assert updated_data["watched"][1]["genre"] == GENRE_1
assert updated_data["watched"][1]["rating"] == RATING_1

def test_adds_no_movie_to_user_watchlist():
# Arrange
movie = {}
user_data = {
"watchlist": []
}

# Act
updated_data = add_to_watchlist(user_data, movie)

# Assert
assert len(updated_data["watchlist"]) == 0

def test_adds_movie_to_empty_user_watchlist():
# Arrange
movie = {
"title": MOVIE_TITLE_1,
Expand All @@ -100,7 +145,31 @@ 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()
def test_adds_movie_to_user_watchlist():
# Arrange
movie = {
"title": MOVIE_TITLE_1,
"genre": GENRE_1,
"rating": RATING_1
}
movie_watched = {
"title": MOVIE_TITLE_2,
"genre": GENRE_2,
"rating": RATING_2
}
user_data = {
"watchlist": [movie_watched]
}

# Act
updated_data = add_to_watchlist(user_data, movie)

# Assert
assert len(updated_data["watchlist"]) == 2
assert updated_data["watchlist"][1]["title"] == MOVIE_TITLE_1
assert updated_data["watchlist"][1]["genre"] == GENRE_1
assert updated_data["watchlist"][1]["rating"] == RATING_1

def test_moves_movie_from_watchlist_to_empty_watched():
# Arrange
janes_data = {
Expand All @@ -118,13 +187,10 @@ def test_moves_movie_from_watchlist_to_empty_watched():
# Assert
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" **********
# *******************************************************************************************
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

@pytest.mark.skip()
def test_moves_movie_from_watchlist_to_watched():
# Arrange
movie_to_watch = HORROR_1
Expand All @@ -142,13 +208,10 @@ 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" **********
# *******************************************************************************************
assert updated_data["watched"][1]["title"] == movie_to_watch["title"]
assert updated_data["watched"][1]["genre"] == movie_to_watch["genre"]
assert updated_data["watched"][1]["rating"] == movie_to_watch["rating"]

@pytest.mark.skip()
def test_does_nothing_if_movie_not_in_watchlist():
# Arrange
movie_to_watch = HORROR_1
Expand Down
6 changes: 2 additions & 4 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,6 @@
from viewing_party.party import *
from tests.test_constants import *

@pytest.mark.skip()
def test_calculates_watched_average_rating():
# Arrange
janes_data = clean_wave_2_data()
Expand All @@ -14,7 +13,6 @@ def test_calculates_watched_average_rating():
assert average == pytest.approx(3.58333)
assert janes_data == clean_wave_2_data()

@pytest.mark.skip()
def test_empty_watched_average_rating_is_zero():
# Arrange
janes_data = {
Expand All @@ -27,7 +25,7 @@ def test_empty_watched_average_rating_is_zero():
# Assert
assert average == pytest.approx(0.0)

@pytest.mark.skip()

def test_most_watched_genre():
# Arrange
janes_data = clean_wave_2_data()
Expand All @@ -39,7 +37,7 @@ def test_most_watched_genre():
assert popular_genre == "Fantasy"
assert janes_data == clean_wave_2_data()

@pytest.mark.skip()

def test_genre_is_None_if_empty_watched():
# Arrange
janes_data = {
Expand Down
18 changes: 8 additions & 10 deletions tests/test_wave_03.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@
from viewing_party.party import *
from tests.test_constants import *

@pytest.mark.skip()

def test_my_unique_movies():
# Arrange
amandas_data = clean_wave_3_data()

# Act
amandas_unique_movies = get_unique_watched(amandas_data)

# Assert
assert len(amandas_unique_movies) == 2
assert FANTASY_2 in amandas_unique_movies
assert INTRIGUE_2 in amandas_unique_movies
assert amandas_data == clean_wave_3_data()

@pytest.mark.skip()

def test_my_not_unique_movies():
# Arrange
amandas_data = clean_wave_3_data()
Expand All @@ -28,7 +27,7 @@ def test_my_not_unique_movies():
# Assert
assert len(amandas_unique_movies) == 0

@pytest.mark.skip()

def test_friends_unique_movies():
# Arrange
amandas_data = clean_wave_3_data()
Expand All @@ -43,24 +42,23 @@ def test_friends_unique_movies():
assert FANTASY_4 in friends_unique_movies
assert amandas_data == clean_wave_3_data()

@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)


# Act
friends_unique_movies = get_friends_unique_watched(amandas_data)

# 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()
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()

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()

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()

def test_no_available_friend_recs_watched_all():
# Arrange
amandas_data = {
Expand Down
21 changes: 11 additions & 10 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()

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()

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()

def test_new_genre_rec_from_empty_friends():
# Arrange
sonyas_data = {
Expand All @@ -53,12 +53,13 @@ def test_new_genre_rec_from_empty_friends():
]
}

raise Exception("Test needs to be completed.")
# *********************************************************************
# ****** Complete the Act and Assert Portions of theis tests **********
# *********************************************************************
# Act
recommendations = get_new_rec_by_genre(sonyas_data)

# Assert
assert len(recommendations) == 0


@pytest.mark.skip()
def test_unique_rec_from_favorites():
# Arrange
sonyas_data = clean_wave_5_data()
Expand All @@ -72,7 +73,7 @@ def test_unique_rec_from_favorites():
assert INTRIGUE_2b in recommendations
assert sonyas_data == clean_wave_5_data()

@pytest.mark.skip()

def test_unique_from_empty_favorites():
# Arrange
sonyas_data = {
Expand All @@ -94,7 +95,7 @@ def test_unique_from_empty_favorites():
# Assert
assert len(recommendations) == 0

@pytest.mark.skip()

def test_new_rec_from_empty_friends():
# Arrange
sonyas_data = {
Expand Down
Loading