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

Tigers - Sunny Muniz #172

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

Tigers - Sunny Muniz #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cd6b57e
added a function to party.py to pass wave_01 test_create_successful_m…
sunnybysunny Sep 18, 2022
f0ae0da
added to creat_movie function to pass test_create_no_title_movie
sunnybysunny Sep 18, 2022
e9b7722
added a genre check to function create_movie to pass test create_no_g…
sunnybysunny Sep 18, 2022
97313fa
added a rating check to function create_movie to pass test_create_no_…
sunnybysunny Sep 18, 2022
d398944
added function add_to_watched to pass test_adds_movie_to_user_watched
sunnybysunny Sep 19, 2022
d35e16d
added function add_to_watchlist to pass test_adds_movie_to_user_watch…
sunnybysunny Sep 19, 2022
753d6a8
created a function called watch_movie to pass test wave 1, test_moves…
sunnybysunny Sep 20, 2022
c358e02
updated the function watch_movie with entirely new function
sunnybysunny Sep 21, 2022
d98af1a
changed function watch_movie, now passes tests 7-8
sunnybysunny Sep 21, 2022
2d0bbaa
created function _get_watched_avg_rating, passes test wave 2, test 1
sunnybysunny Sep 21, 2022
b856017
modified get_watched_avg_rating to test for an empty list with no val…
sunnybysunny Sep 21, 2022
bf213fa
created function get_most_watched_genre, passes wave 02 test 3 and 4
sunnybysunny Sep 21, 2022
5bcec4f
created function get_unique_watched, passed test 1, and 2 in test_wav…
sunnybysunny Sep 21, 2022
0aad519
created function get_friends_unique_watched passes test wave 03, test…
sunnybysunny Sep 22, 2022
3a09167
created function get_available_recs, all tests in wave 4 passed
sunnybysunny Sep 22, 2022
02f5686
created function get_available_recs all tests in wave 4 pass
sunnybysunny Sep 23, 2022
a01f1ce
created function get_rec_from_favorites tests 3-6 pass in wave 5
sunnybysunny Sep 23, 2022
02fcb34
created function get_new_rec_by_genre test 1-3 in wave 5 pass
sunnybysunny Sep 23, 2022
a585488
modified function watch_movie to pass the test 7 and 8 in wave 01, al…
sunnybysunny Sep 23, 2022
338e5e7
Added my name and class to README.md
sunnybysunny Sep 23, 2022
614b525
deleted all decorators that were used for skippinng tests to make cod…
sunnybysunny Oct 17, 2022
46368d6
deleted all raise exception/complete tests comments for cleaner code
sunnybysunny Oct 17, 2022
3486902
addressed all issues in waves 01, and 02 as per Jayce's recommendations
sunnybysunny Oct 17, 2022
4a832bd
have continued to refactor as per Jayce's recommendations, now on lin…
sunnybysunny Oct 17, 2022
b765471
refactored and applied all of Jayce's suggestions to make code more s…
sunnybysunny Oct 18, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Viewing Party
# Viewing Party Tigers - Sunny Muniz

## Skills Assessed

Expand Down
14 changes: 7 additions & 7 deletions play_tester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
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())

#print("\n-----Wave 03 user_data-----")
#pp.pprint(clean_wave_3_data())
# print("\n-----Wave 03 user_data-----")
# pp.pprint(clean_wave_3_data())

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

# Wave 05 user data
#print("\n-----Wave 05 user_data-----")
Expand Down
33 changes: 15 additions & 18 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,7 @@
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 +19,7 @@ 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 +32,7 @@ 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 +45,7 @@ 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,7 +58,7 @@ def test_create_no_rating_movie():
# Assert
assert new_movie is None

@pytest.mark.skip()

def test_adds_movie_to_user_watched():
# Arrange
movie = {
Expand All @@ -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()

def test_adds_movie_to_user_watchlist():
# Arrange
movie = {
Expand All @@ -100,12 +100,12 @@ 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_moves_movie_from_watchlist_to_empty_watched():
# Arrange
janes_data = {
"watchlist": [{
"title": MOVIE_TITLE_1,
"title": MOVIE_TITLE_1,
"genre": GENRE_1,
"rating": RATING_1
}],
Expand All @@ -118,13 +118,11 @@ def test_moves_movie_from_watchlist_to_empty_watched():
# Assert
assert len(updated_data["watchlist"]) == 0
assert len(updated_data["watched"]) == 1
assert updated_data["watched"][0] == HORROR_1


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

@pytest.mark.skip()

def test_moves_movie_from_watchlist_to_watched():
# Arrange
movie_to_watch = HORROR_1
Expand All @@ -142,13 +140,12 @@ def test_moves_movie_from_watchlist_to_watched():
# Assert
assert len(updated_data["watchlist"]) == 1
assert len(updated_data["watched"]) == 2
assert updated_data["watched"][0] == FANTASY_2
assert updated_data["watched"][1] == movie_to_watch

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



@pytest.mark.skip()
def test_does_nothing_if_movie_not_in_watchlist():
# Arrange
movie_to_watch = HORROR_1
Expand Down
8 changes: 4 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,7 @@
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 +14,7 @@ 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 +27,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 +39,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: 9 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()

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

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

def test_friends_unique_movies():
# Arrange
amandas_data = clean_wave_3_data()
Expand All @@ -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()

def test_friends_unique_movies_not_duplicated():
# Arrange
amandas_data = clean_wave_3_data()
Expand All @@ -54,13 +54,13 @@ def test_friends_unique_movies_not_duplicated():

# Assert
assert len(friends_unique_movies) == 3
assert HORROR_1 in friends_unique_movies
assert INTRIGUE_3 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
22 changes: 12 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 @@ -52,13 +52,15 @@ def test_new_genre_rec_from_empty_friends():
}
]
}
# Act
recommendations = get_new_rec_by_genre(sonyas_data)

# Assert
assert len(recommendations) == 0



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

@pytest.mark.skip()
def test_unique_rec_from_favorites():
# Arrange
sonyas_data = clean_wave_5_data()
Expand All @@ -72,7 +74,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 +96,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