GH-452: Add additional argument checks

henrikfroehling · Jul 28, 2023 · e8cc6a0 · e8cc6a0
1 parent 43c3f9d
commit e8cc6a0
Show file tree

Hide file tree

Showing 64 changed files with 192 additions and 0 deletions.
diff --git a/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisode.cs b/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisode.cs
@@ -105,6 +105,9 @@ public Task<TraktResponse<ITraktEpisode>> GetEpisodeAsync(ITraktShowIds showIds,
             if (showIds == null)
                 throw new ArgumentNullException(nameof(showIds));
 
+            if (!showIds.HasAnyId)
+                throw new ArgumentException($"{nameof(showIds)} has not any ids set", nameof(showIds));
+
             return GetEpisodeImplementationAsync(false, showIds.GetBestId(), seasonNumber, episodeNumber, extendedInfo, cancellationToken);
         }
 

diff --git a/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodeComments.cs b/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodeComments.cs
@@ -146,6 +146,9 @@ public Task<TraktPagedResponse<ITraktComment>> GetEpisodeCommentsAsync(ITraktSho
             if (showIds == null)
                 throw new ArgumentNullException(nameof(showIds));
 
+            if (!showIds.HasAnyId)
+                throw new ArgumentException($"{nameof(showIds)} has not any ids set", nameof(showIds));
+
             return GetEpisodeCommentsAsync(showIds.GetBestId(), seasonNumber, episodeNumber, commentSortOrder,
                                            extendedInfo, pagedParameters, cancellationToken);
         }

diff --git a/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodeLists.cs b/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodeLists.cs
@@ -150,6 +150,9 @@ public Task<TraktPagedResponse<ITraktList>> GetEpisodeListsAsync(ITraktShowIds s
             if (showIds == null)
                 throw new ArgumentNullException(nameof(showIds));
 
+            if (!showIds.HasAnyId)
+                throw new ArgumentException($"{nameof(showIds)} has not any ids set", nameof(showIds));
+
             return GetEpisodeListsAsync(showIds.GetBestId(), seasonNumber, episodeNumber, listType, listSortOrder,
                                         extendedInfo, pagedParameters, cancellationToken);
         }

diff --git a/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodePeople.cs b/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodePeople.cs
@@ -111,6 +111,9 @@ public Task<TraktResponse<ITraktShowCastAndCrew>> GetEpisodePeopleAsync(ITraktSh
             if (showIds == null)
                 throw new ArgumentNullException(nameof(showIds));
 
+            if (!showIds.HasAnyId)
+                throw new ArgumentException($"{nameof(showIds)} has not any ids set", nameof(showIds));
+
             return GetEpisodePeopleAsync(showIds.GetBestId(), seasonNumber, episodeNumber, extendedInfo, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodeRatings.cs b/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodeRatings.cs
@@ -95,6 +95,9 @@ public Task<TraktResponse<ITraktRating>> GetEpisodeRatingsAsync(ITraktShowIds sh
             if (showIds == null)
                 throw new ArgumentNullException(nameof(showIds));
 
+            if (!showIds.HasAnyId)
+                throw new ArgumentException($"{nameof(showIds)} has not any ids set", nameof(showIds));
+
             return GetEpisodeRatingsAsync(showIds.GetBestId(), seasonNumber, episodeNumber, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodeStatistics.cs b/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodeStatistics.cs
@@ -95,6 +95,9 @@ public Task<TraktResponse<ITraktStatistics>> GetEpisodeStatisticsAsync(ITraktSho
             if (showIds == null)
                 throw new ArgumentNullException(nameof(showIds));
 
+            if (!showIds.HasAnyId)
+                throw new ArgumentException($"{nameof(showIds)} has not any ids set", nameof(showIds));
+
             return GetEpisodeStatisticsAsync(showIds.GetBestId(), seasonNumber, episodeNumber, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodeTranslations.cs b/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodeTranslations.cs
@@ -101,6 +101,9 @@ public Task<TraktListResponse<ITraktEpisodeTranslation>> GetEpisodeTranslationsA
             if (showIds == null)
                 throw new ArgumentNullException(nameof(showIds));
 
+            if (!showIds.HasAnyId)
+                throw new ArgumentException($"{nameof(showIds)} has not any ids set", nameof(showIds));
+
             return GetEpisodeTranslationsAsync(showIds.GetBestId(), seasonNumber, episodeNumber, languageCode, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodeWatchingUsers.cs b/Source/Lib/Trakt.NET/Modules/Episodes/TraktEpisodesModule_GetEpisodeWatchingUsers.cs
@@ -112,6 +112,9 @@ public Task<TraktListResponse<ITraktUser>> GetEpisodeWatchingUsersAsync(ITraktSh
             if (showIds == null)
                 throw new ArgumentNullException(nameof(showIds));
 
+            if (!showIds.HasAnyId)
+                throw new ArgumentException($"{nameof(showIds)} has not any ids set", nameof(showIds));
+
             return GetEpisodeWatchingUsersAsync(showIds.GetBestId(), seasonNumber, episodeNumber, extendedInfo, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Lists/TraktListsComment_GetListComments.cs b/Source/Lib/Trakt.NET/Modules/Lists/TraktListsComment_GetListComments.cs
@@ -127,6 +127,9 @@ public Task<TraktPagedResponse<ITraktComment>> GetListCommentsAsync(ITraktListId
             if (listIds == null)
                 throw new ArgumentNullException(nameof(listIds));
 
+            if (!listIds.HasAnyId)
+                throw new ArgumentException($"{nameof(listIds)} has not any ids set", nameof(listIds));
+
             return GetListCommentsAsync(listIds.GetBestId(), commentSortOrder, extendedInfo, pagedParameters, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Lists/TraktListsModule_GetList.cs b/Source/Lib/Trakt.NET/Modules/Lists/TraktListsModule_GetList.cs
@@ -99,6 +99,9 @@ public Task<TraktResponse<ITraktList>> GetListAsync(ITraktListIds listIds, Trakt
             if (listIds == null)
                 throw new ArgumentNullException(nameof(listIds));
 
+            if (!listIds.HasAnyId)
+                throw new ArgumentException($"{nameof(listIds)} has not any ids set", nameof(listIds));
+
             return GetListAsync(listIds.GetBestId(), extendedInfo, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Lists/TraktListsModule_GetListItems.cs b/Source/Lib/Trakt.NET/Modules/Lists/TraktListsModule_GetListItems.cs
@@ -108,6 +108,9 @@ public Task<TraktPagedResponse<ITraktListItem>> GetListItemsAsync(ITraktListIds
             if (listIds == null)
                 throw new ArgumentNullException(nameof(listIds));
 
+            if (!listIds.HasAnyId)
+                throw new ArgumentException($"{nameof(listIds)} has not any ids set", nameof(listIds));
+
             return GetListItemsAsync(listIds.GetBestId(), listItemType, extendedInfo, pagedParameters, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Lists/TraktListsModule_GetListLikes.cs b/Source/Lib/Trakt.NET/Modules/Lists/TraktListsModule_GetListLikes.cs
@@ -103,6 +103,9 @@ public Task<TraktPagedResponse<ITraktListLike>> GetListLikesAsync(ITraktListIds
             if (listIds == null)
                 throw new ArgumentNullException(nameof(listIds));
 
+            if (!listIds.HasAnyId)
+                throw new ArgumentException($"{nameof(listIds)} has not any ids set", nameof(listIds));
+
             return GetListLikesAsync(listIds.GetBestId(), extendedInfo, pagedParameters, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Lists/TraktListsModule_LikeList.cs b/Source/Lib/Trakt.NET/Modules/Lists/TraktListsModule_LikeList.cs
@@ -79,6 +79,9 @@ public Task<TraktNoContentResponse> LikeListAsync(ITraktListIds listIds, Cancell
             if (listIds == null)
                 throw new ArgumentNullException(nameof(listIds));
 
+            if (!listIds.HasAnyId)
+                throw new ArgumentException($"{nameof(listIds)} has not any ids set", nameof(listIds));
+
             return LikeListAsync(listIds.GetBestId(), cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Lists/TraktListsModule_UnlikeList.cs b/Source/Lib/Trakt.NET/Modules/Lists/TraktListsModule_UnlikeList.cs
@@ -79,6 +79,9 @@ public Task<TraktNoContentResponse> UnlikeListAsync(ITraktListIds listIds, Cance
             if (listIds == null)
                 throw new ArgumentNullException(nameof(listIds));
 
+            if (!listIds.HasAnyId)
+                throw new ArgumentException($"{nameof(listIds)} has not any ids set", nameof(listIds));
+
             return UnlikeListAsync(listIds.GetBestId(), cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovie.cs b/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovie.cs
@@ -95,6 +95,9 @@ public Task<TraktResponse<ITraktMovie>> GetMovieAsync(ITraktMovieIds movieIds, T
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return GetMovieImplementationAsync(false, movieIds.GetBestId(), extendedInfo, cancellationToken);
         }
 

diff --git a/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieAliases.cs b/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieAliases.cs
@@ -85,6 +85,9 @@ public Task<TraktListResponse<ITraktMovieAlias>> GetMovieAliasesAsync(ITraktMovi
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return GetMovieAliasesAsync(movieIds.GetBestId(), cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieComments.cs b/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieComments.cs
@@ -136,6 +136,9 @@ public Task<TraktPagedResponse<ITraktComment>> GetMovieCommentsAsync(ITraktMovie
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return GetMovieCommentsAsync(movieIds.GetBestId(), commentSortOrder, extendedInfo, pagedParameters, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieLists.cs b/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieLists.cs
@@ -140,6 +140,9 @@ public Task<TraktPagedResponse<ITraktList>> GetMovieListsAsync(ITraktMovieIds mo
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return GetMovieListsAsync(movieIds.GetBestId(), listType, listSortOrder, extendedInfo, pagedParameters, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMoviePeople.cs b/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMoviePeople.cs
@@ -100,6 +100,9 @@ public Task<TraktResponse<ITraktCastAndCrew>> GetMoviePeopleAsync(ITraktMovieIds
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return GetMoviePeopleAsync(movieIds.GetBestId(), extendedInfo, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieRatings.cs b/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieRatings.cs
@@ -83,6 +83,9 @@ public Task<TraktResponse<ITraktRating>> GetMovieRatingsAsync(ITraktMovieIds mov
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return GetMovieRatingsAsync(movieIds.GetBestId(), cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieRelatedMovies.cs b/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieRelatedMovies.cs
@@ -124,6 +124,9 @@ public Task<TraktPagedResponse<ITraktMovie>> GetMovieRelatedMoviesAsync(ITraktMo
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return GetMovieRelatedMoviesAsync(movieIds.GetBestId(), extendedInfo, pagedParameters, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieReleases.cs b/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieReleases.cs
@@ -89,6 +89,9 @@ public Task<TraktListResponse<ITraktMovieRelease>> GetMovieReleasesAsync(ITraktM
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return GetMovieReleasesAsync(movieIds.GetBestId(), countryCode, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieStatistics.cs b/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieStatistics.cs
@@ -83,6 +83,9 @@ public Task<TraktResponse<ITraktStatistics>> GetMovieStatisticsAsync(ITraktMovie
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return GetMovieStatisticsAsync(movieIds.GetBestId(), cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieStudios.cs b/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieStudios.cs
@@ -83,6 +83,9 @@ public Task<TraktListResponse<ITraktStudio>> GetMovieStudiosAsync(ITraktMovieIds
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return GetMovieStudiosAsync(movieIds.GetBestId(), cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieTranslations.cs b/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieTranslations.cs
@@ -89,6 +89,9 @@ public Task<TraktListResponse<ITraktMovieTranslation>> GetMovieTranslationsAsync
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return GetMovieTranslationsAsync(movieIds.GetBestId(), languageCode, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieWatchingUsers.cs b/Source/Lib/Trakt.NET/Modules/Movies/TraktMoviesModule_GetMovieWatchingUsers.cs
@@ -100,6 +100,9 @@ public Task<TraktListResponse<ITraktUser>> GetMovieWatchingUsersAsync(ITraktMovi
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return GetMovieWatchingUsersAsync(movieIds.GetBestId(), extendedInfo, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/People/TraktPeopleModule_GetPerson.cs b/Source/Lib/Trakt.NET/Modules/People/TraktPeopleModule_GetPerson.cs
@@ -95,6 +95,9 @@ public Task<TraktResponse<ITraktPerson>> GetPersonAsync(ITraktPersonIds personId
             if (personIds == null)
                 throw new ArgumentNullException(nameof(personIds));
 
+            if (!personIds.HasAnyId)
+                throw new ArgumentException($"{nameof(personIds)} has not any ids set", nameof(personIds));
+
             return GetPersoImplementationAsync(false, personIds.GetBestId(), extendedInfo, cancellationToken);
         }
 

diff --git a/Source/Lib/Trakt.NET/Modules/People/TraktPeopleModule_GetPersonLists.cs b/Source/Lib/Trakt.NET/Modules/People/TraktPeopleModule_GetPersonLists.cs
@@ -140,6 +140,9 @@ public Task<TraktPagedResponse<ITraktList>> GetPersonListsAsync(ITraktPersonIds
             if (personIds == null)
                 throw new ArgumentNullException(nameof(personIds));
 
+            if (!personIds.HasAnyId)
+                throw new ArgumentException($"{nameof(personIds)} has not any ids set", nameof(personIds));
+
             return GetPersonListsAsync(personIds.GetBestId(), listType, listSortOrder, extendedInfo, pagedParameters, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/People/TraktPeopleModule_GetPersonMovieCredits.cs b/Source/Lib/Trakt.NET/Modules/People/TraktPeopleModule_GetPersonMovieCredits.cs
@@ -100,6 +100,9 @@ public Task<TraktResponse<ITraktPersonMovieCredits>> GetPersonMovieCreditsAsync(
             if (personIds == null)
                 throw new ArgumentNullException(nameof(personIds));
 
+            if (!personIds.HasAnyId)
+                throw new ArgumentException($"{nameof(personIds)} has not any ids set", nameof(personIds));
+
             return GetPersonMovieCreditsAsync(personIds.GetBestId(), extendedInfo, cancellationToken);
         }
     }

diff --git a/Source/Lib/Trakt.NET/Modules/People/TraktPeopleModule_GetPersonShowCredits.cs b/Source/Lib/Trakt.NET/Modules/People/TraktPeopleModule_GetPersonShowCredits.cs
@@ -100,6 +100,9 @@ public Task<TraktResponse<ITraktPersonShowCredits>> GetPersonShowCreditsAsync(IT
             if (personIds == null)
                 throw new ArgumentNullException(nameof(personIds));
 
+            if (!personIds.HasAnyId)
+                throw new ArgumentException($"{nameof(personIds)} has not any ids set", nameof(personIds));
+
             return GetPersonShowCreditsAsync(personIds.GetBestId(), extendedInfo, cancellationToken);
         }
     }

diff --git a/...b/Trakt.NET/Modules/Recommendations/TraktRecommendationsModule_HideMovieRecommendation.cs b/...b/Trakt.NET/Modules/Recommendations/TraktRecommendationsModule_HideMovieRecommendation.cs
@@ -79,6 +79,9 @@ public Task<TraktNoContentResponse> HideMovieRecommendationAsync(ITraktMovieIds
             if (movieIds == null)
                 throw new ArgumentNullException(nameof(movieIds));
 
+            if (!movieIds.HasAnyId)
+                throw new ArgumentException($"{nameof(movieIds)} has not any ids set", nameof(movieIds));
+
             return HideMovieRecommendationAsync(movieIds.GetBestId(), cancellationToken);
         }
     }

diff --git a/...ib/Trakt.NET/Modules/Recommendations/TraktRecommendationsModule_HideShowRecommendation.cs b/...ib/Trakt.NET/Modules/Recommendations/TraktRecommendationsModule_HideShowRecommendation.cs
@@ -79,6 +79,9 @@ public Task<TraktNoContentResponse> HideShowRecommendationAsync(ITraktShowIds sh
             if (showIds == null)
                 throw new ArgumentNullException(nameof(showIds));
 
+            if (!showIds.HasAnyId)
+                throw new ArgumentException($"{nameof(showIds)} has not any ids set", nameof(showIds));
+
             return HideShowRecommendationAsync(showIds.GetBestId(), cancellationToken);
         }
     }

diff --git a/...akt.NET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodeComments_Tests.cs b/...akt.NET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodeComments_Tests.cs
@@ -571,6 +571,9 @@ public async Task Test_TraktEpisodesModule_GetEpisodeComments_Throws_ArgumentExc
             Func<Task<TraktPagedResponse<ITraktComment>>> act = () => client.Episodes.GetEpisodeCommentsAsync(default(ITraktShowIds), SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentNullException>();
 
+            act = () => client.Episodes.GetEpisodeCommentsAsync(new TraktShowIds(), SEASON_NR, EPISODE_NR);
+            await act.Should().ThrowAsync<ArgumentException>();
+
             act = () => client.Episodes.GetEpisodeCommentsAsync(0, SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentException>();
         }

diff --git a/.../Trakt.NET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodeLists_Tests.cs b/.../Trakt.NET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodeLists_Tests.cs
@@ -806,6 +806,9 @@ public async Task Test_TraktEpisodesModule_GetEpisodeLists_Throws_ArgumentExcept
             Func<Task<TraktPagedResponse<ITraktList>>> act = () => client.Episodes.GetEpisodeListsAsync(default(ITraktShowIds), SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentNullException>();
 
+            act = () => client.Episodes.GetEpisodeListsAsync(new TraktShowIds(), SEASON_NR, EPISODE_NR);
+            await act.Should().ThrowAsync<ArgumentException>();
+
             act = () => client.Episodes.GetEpisodeListsAsync(0, SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentException>();
         }

diff --git a/...Trakt.NET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodePeople_Tests.cs b/...Trakt.NET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodePeople_Tests.cs
@@ -187,6 +187,9 @@ public async Task Test_TraktEpisodesModule_GetEpisodePeople_Throws_ArgumentExcep
             Func<Task<TraktResponse<ITraktShowCastAndCrew>>> act = () => client.Episodes.GetEpisodePeopleAsync(default(ITraktShowIds), SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentNullException>();
 
+            act = () => client.Episodes.GetEpisodePeopleAsync(new TraktShowIds(), SEASON_NR, EPISODE_NR);
+            await act.Should().ThrowAsync<ArgumentException>();
+
             act = () => client.Episodes.GetEpisodePeopleAsync(0, SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentException>();
         }

diff --git a/...rakt.NET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodeRatings_Tests.cs b/...rakt.NET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodeRatings_Tests.cs
@@ -155,6 +155,9 @@ public async Task Test_TraktEpisodesModule_GetEpisodeRatings_Throws_ArgumentExce
             Func<Task<TraktResponse<ITraktRating>>> act = () => client.Episodes.GetEpisodeRatingsAsync(default(ITraktShowIds), SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentNullException>();
 
+            act = () => client.Episodes.GetEpisodeRatingsAsync(new TraktShowIds(), SEASON_NR, EPISODE_NR);
+            await act.Should().ThrowAsync<ArgumentException>();
+
             act = () => client.Episodes.GetEpisodeRatingsAsync(0, SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentException>();
         }

diff --git a/...t.NET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodeStatistics_Tests.cs b/...t.NET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodeStatistics_Tests.cs
@@ -151,6 +151,9 @@ public async Task Test_TraktEpisodesModule_GetEpisodeStatistics_Throws_ArgumentE
             Func<Task<TraktResponse<ITraktStatistics>>> act = () => client.Episodes.GetEpisodeStatisticsAsync(default(ITraktShowIds), SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentNullException>();
 
+            act = () => client.Episodes.GetEpisodeStatisticsAsync(new TraktShowIds(), SEASON_NR, EPISODE_NR);
+            await act.Should().ThrowAsync<ArgumentException>();
+
             act = () => client.Episodes.GetEpisodeStatisticsAsync(0, SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentException>();
         }

diff --git a/...NET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodeTranslations_Tests.cs b/...NET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodeTranslations_Tests.cs
@@ -141,6 +141,9 @@ public async Task Test_TraktEpisodesModule_GetEpisodeTranslations_Throws_Argumen
             Func<Task<TraktListResponse<ITraktEpisodeTranslation>>> act = () => client.Episodes.GetEpisodeTranslationsAsync(default(ITraktShowIds), SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentNullException>();
 
+            act = () => client.Episodes.GetEpisodeTranslationsAsync(new TraktShowIds(), SEASON_NR, EPISODE_NR);
+            await act.Should().ThrowAsync<ArgumentException>();
+
             act = () => client.Episodes.GetEpisodeTranslationsAsync(0, SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentException>();
         }

diff --git a/...ET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodeWatchingUsers_Tests.cs b/...ET.Modules.Tests/TraktEpisodesModule/TraktEpisodesModule_GetEpisodeWatchingUsers_Tests.cs
@@ -155,6 +155,9 @@ public async Task Test_TraktEpisodesModule_GetEpisodeWatchingUsers_Throws_Argume
             Func<Task<TraktListResponse<ITraktUser>>> act = () => client.Episodes.GetEpisodeWatchingUsersAsync(default(ITraktShowIds), SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentNullException>();
 
+            act = () => client.Episodes.GetEpisodeWatchingUsersAsync(new TraktShowIds(), SEASON_NR, EPISODE_NR);
+            await act.Should().ThrowAsync<ArgumentException>();
+
             act = () => client.Episodes.GetEpisodeWatchingUsersAsync(0, SEASON_NR, EPISODE_NR);
             await act.Should().ThrowAsync<ArgumentException>();
         }