diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java index e0c6ac6c3..55e5f8129 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java @@ -28,6 +28,7 @@ import com.omertron.themoviedbapi.tools.Param; import com.omertron.themoviedbapi.tools.TmdbParameters; import java.io.IOException; import java.net.URL; +import org.slf4j.LoggerFactory; import org.yamj.api.common.exception.ApiExceptionType; /** @@ -77,6 +78,7 @@ public class TmdbCredits extends AbstractMethod { try { return MAPPER.readValue(webpage, CreditInfo.class); } catch (IOException ex) { + LoggerFactory.getLogger("test").info("{}",ex); throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get credit info", url, ex); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/person/CreditInfo.java b/src/main/java/com/omertron/themoviedbapi/model/person/CreditInfo.java index b3a139f0d..c8022df9c 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/person/CreditInfo.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/CreditInfo.java @@ -21,18 +21,17 @@ package com.omertron.themoviedbapi.model.person; import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.interfaces.IIdentification; import com.omertron.themoviedbapi.model.tv.TVCredit; /** * @author stuart.boston */ -public class CreditInfo extends AbstractJsonMapping implements IIdentification { +public class CreditInfo extends AbstractJsonMapping { private static final long serialVersionUID = 1L; @JsonProperty("id") - private int id; + private String id; @JsonProperty("credit_type") private String creditType; @JsonProperty("department") @@ -46,13 +45,11 @@ public class CreditInfo extends AbstractJsonMapping implements IIdentification { @JsonProperty("media") private TVCredit media; - @Override - public int getId() { + public String getId() { return id; } - @Override - public void setId(int id) { + public void setId(String id) { this.id = id; } diff --git a/src/test/java/com/omertron/themoviedbapi/TestSuite.java b/src/test/java/com/omertron/themoviedbapi/TestSuite.java index d2a8d40bb..8ade40568 100644 --- a/src/test/java/com/omertron/themoviedbapi/TestSuite.java +++ b/src/test/java/com/omertron/themoviedbapi/TestSuite.java @@ -46,64 +46,71 @@ public class TestSuite { return new Random().nextInt(10) + 1; } - public static void test(ResultList result) { - assertNotNull("Null result list", result); - assertFalse("Empty result list", result.isEmpty()); - test(result.getResults()); + public static void test(ResultList result, String message) { + assertNotNull(message + ": Null result list", result); + assertFalse(message + ": Empty result list", result.isEmpty()); + test(result.getResults(), message); } - public static void test(List result) { - assertNotNull("Null results", result); - assertFalse("Empty results", result.isEmpty()); + public static void test(List result, String message) { + assertNotNull(message + ": Null results", result); + assertFalse(message + ": Empty results", result.isEmpty()); } public static void test(MovieBasic test) { - assertTrue("No title", isNotBlank(test.getTitle())); - assertTrue("No poster", isNotBlank(test.getPosterPath())); - assertTrue("No release date", isNotBlank(test.getReleaseDate())); + String message = test.getClass().getSimpleName(); + assertTrue(message + ": Missing title", isNotBlank(test.getTitle())); + assertTrue(message + ": Missing poster", isNotBlank(test.getPosterPath())); + assertTrue(message + ": Missing release date", isNotBlank(test.getReleaseDate())); } public static void test(UserList test) { - assertTrue("No ID", isNotBlank(test.getId())); - assertTrue("No Description", isNotBlank(test.getDescription())); + String message = test.getClass().getSimpleName(); + assertTrue(message + ": Missing ID", isNotBlank(test.getId())); + assertTrue(message + ": Missing Description", isNotBlank(test.getDescription())); } public static void test(TVBasic test) { - assertTrue("No name", isNotBlank(test.getName())); - assertTrue("No poster", isNotBlank(test.getPosterPath())); - assertTrue("No first air date", isNotBlank(test.getFirstAirDate())); + String message = test.getClass().getSimpleName(); + assertTrue(message + ": Missing name", isNotBlank(test.getName())); + assertTrue(message + ": Missing poster", isNotBlank(test.getPosterPath())); + assertTrue(message + ": Missing first air date", isNotBlank(test.getFirstAirDate())); } public static void test(TVInfo test) { - assertTrue("No ID", test.getId() > 0); - assertFalse("No runtime", test.getEpisodeRunTime().isEmpty()); - assertFalse("No genres", test.getGenres().isEmpty()); - assertTrue("No season count", test.getNumberOfSeasons() > 0); - assertTrue("No episode count", test.getNumberOfEpisodes() > 0); + String message = test.getClass().getSimpleName(); + assertTrue(message + ": Missing ID", test.getId() > 0); + assertFalse(message + ": Missing runtime", test.getEpisodeRunTime().isEmpty()); + assertFalse(message + ": Missing genres", test.getGenres().isEmpty()); + assertTrue(message + ": Missing season count", test.getNumberOfSeasons() > 0); + assertTrue(message + ": Missing episode count", test.getNumberOfEpisodes() > 0); } public static void test(TVEpisodeInfo test) { - assertTrue("No ID", test.getId() > 0); - assertTrue("No name", StringUtils.isNotBlank(test.getName())); - assertTrue("No crew", test.getCrew().size() > 0); - assertTrue("No guest stars", test.getGuestStars().size() > 0); + String message = test.getClass().getSimpleName(); + assertTrue(message + ": Missing ID", test.getId() > 0); + assertTrue(message + ": Missing name", StringUtils.isNotBlank(test.getName())); + assertTrue(message + ": Missing crew", test.getCrew().size() > 0); + assertTrue(message + ": Missing guest stars", test.getGuestStars().size() > 0); } public static void test(Person test) { - assertTrue("Missing bio", StringUtils.isNotBlank(test.getBiography())); - assertTrue("Missing birthday", StringUtils.isNotBlank(test.getBirthday())); - assertTrue("Missing homepage", StringUtils.isNotBlank(test.getHomepage())); - assertTrue("Missing name", StringUtils.isNotBlank(test.getName())); - assertTrue("Missing birth place", StringUtils.isNotBlank(test.getPlaceOfBirth())); - assertTrue("Missing artwork", StringUtils.isNotBlank(test.getProfilePath())); - assertTrue("Missing bio", test.getPopularity() > 0F); + String message = test.getClass().getSimpleName(); + assertTrue(message + ": Missing bio", StringUtils.isNotBlank(test.getBiography())); + assertTrue(message + ": Missing birthday", StringUtils.isNotBlank(test.getBirthday())); + assertTrue(message + ": Missing homepage", StringUtils.isNotBlank(test.getHomepage())); + assertTrue(message + ": Missing name", StringUtils.isNotBlank(test.getName())); + assertTrue(message + ": Missing birth place", StringUtils.isNotBlank(test.getPlaceOfBirth())); + assertTrue(message + ": Missing artwork", StringUtils.isNotBlank(test.getProfilePath())); + assertTrue(message + ": Missing bio", test.getPopularity() > 0F); } public static void test(TVSeasonInfo test) { - assertTrue("No ID", test.getId() > 0); - assertTrue("No name", StringUtils.isNotBlank(test.getName())); - assertTrue("No overview", StringUtils.isNotBlank(test.getOverview())); - assertTrue("No episodes", test.getEpisodes().size() > 0); + String message = test.getClass().getSimpleName(); + assertTrue(message + ": Missing ID", test.getId() > 0); + assertTrue(message + ": Missing name", StringUtils.isNotBlank(test.getName())); + assertTrue(message + ": Missing overview", StringUtils.isNotBlank(test.getOverview())); + assertTrue(message + ": Missing episodes", test.getEpisodes().size() > 0); } public static void testId(ResultList result, int id, String message) { diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java index 98f4019bf..6bcf27fdf 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java @@ -95,7 +95,7 @@ public class TmdbAccountTest extends AbstractTests { public void testGetUserLists() throws MovieDbException { LOG.info("getUserLists"); ResultList results = instance.getUserLists(getSessionId(), getAccountId()); - TestSuite.test(results); + TestSuite.test(results,"UserLists"); for (UserList result : results.getResults()) { TestSuite.test(result); @@ -111,7 +111,7 @@ public class TmdbAccountTest extends AbstractTests { public void testGetFavoriteMovies() throws MovieDbException { LOG.info("getFavoriteMovies"); ResultList results = instance.getFavoriteMovies(getSessionId(), getAccountId()); - TestSuite.test(results); + TestSuite.test(results,"Fav Movies"); for (MovieBasic result : results.getResults()) { TestSuite.test(result); @@ -127,7 +127,7 @@ public class TmdbAccountTest extends AbstractTests { public void testGetFavoriteTv() throws MovieDbException { LOG.info("getFavoriteTv"); ResultList results = instance.getFavoriteTv(getSessionId(), getAccountId()); - TestSuite.test(results); + TestSuite.test(results,"Fav TV"); for (TVBasic result : results.getResults()) { TestSuite.test(result); @@ -173,7 +173,7 @@ public class TmdbAccountTest extends AbstractTests { public void testGetRatedMovies() throws MovieDbException { LOG.info("getRatedMovies"); ResultList results = instance.getRatedMovies(getSessionId(), getAccountId(), null, null, null); - TestSuite.test(results); + TestSuite.test(results,"Rated Movies"); } /** @@ -185,7 +185,7 @@ public class TmdbAccountTest extends AbstractTests { public void testGetRatedTV() throws MovieDbException { LOG.info("getRatedTV"); ResultList results = instance.getRatedTV(getSessionId(), getAccountId(), null, null, null); - TestSuite.test(results); + TestSuite.test(results,"Rated TV"); for (TVBasic result : results.getResults()) { TestSuite.test(result); } @@ -200,7 +200,7 @@ public class TmdbAccountTest extends AbstractTests { public void testGetWatchListMovie() throws MovieDbException { LOG.info("getWatchListMovie"); ResultList results = instance.getWatchListMovie(getSessionId(), getAccountId(), null, null, null); - TestSuite.test(results); + TestSuite.test(results,"Watch List Movie"); for (MovieBasic result : results.getResults()) { TestSuite.test(result); } @@ -215,7 +215,7 @@ public class TmdbAccountTest extends AbstractTests { public void testGetWatchListTV() throws MovieDbException { LOG.info("getWatchListTV"); ResultList results = instance.getWatchListTV(getSessionId(), getAccountId(), null, null, null); - TestSuite.test(results); + TestSuite.test(results,"Watch List TV"); for (TVBasic result : results.getResults()) { TestSuite.test(result); } @@ -284,7 +284,7 @@ public class TmdbAccountTest extends AbstractTests { result = instance.getGuestRatedMovies(guestSession, language, page, sortBy); } - TestSuite.test(result); + TestSuite.test(result,"Guest Reated Movies"); } private void postGuestRating(String guestSessionId, int movieId) throws MovieDbException { diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java index 98ca8dd4f..1026802a4 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java @@ -59,7 +59,7 @@ public class TmdbChangesTest extends AbstractTests { public void testGetMovieChangesList() throws MovieDbException { LOG.info("getMovieChangesList"); ResultList result = instance.getChangeList(MethodBase.MOVIE, null, null, null); - TestSuite.test(result); + TestSuite.test(result, "Movie Changes"); } /** @@ -71,7 +71,7 @@ public class TmdbChangesTest extends AbstractTests { public void testGetPersonChangesList() throws MovieDbException { LOG.info("getPersonChangesList"); ResultList result = instance.getChangeList(MethodBase.PERSON, null, null, null); - TestSuite.test(result); + TestSuite.test(result, "Person Changes"); } /** @@ -83,6 +83,6 @@ public class TmdbChangesTest extends AbstractTests { public void testGetTVChangesList() throws MovieDbException { LOG.info("getTVChangesList"); ResultList result = instance.getChangeList(MethodBase.TV, null, null, null); - TestSuite.test(result); + TestSuite.test(result, "TV Changes"); } } diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbCollectionsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbCollectionsTest.java index 78d5a8ccf..04b888b98 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbCollectionsTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbCollectionsTest.java @@ -74,7 +74,7 @@ public class TmdbCollectionsTest extends AbstractTests { public void testGetCollectionImages() throws MovieDbException { LOG.info("getCollectionImages"); ResultList result = instance.getCollectionImages(ID_COLLECTION_STAR_WARS, LANGUAGE_DEFAULT); - TestSuite.test(result); + TestSuite.test(result,"Collection Images"); } } diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbCompaniesTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbCompaniesTest.java index 7c6765f2d..483ab4e7b 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbCompaniesTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbCompaniesTest.java @@ -85,6 +85,6 @@ public class TmdbCompaniesTest extends AbstractTests { public void testGetCompanyMovies() throws MovieDbException { LOG.info("getCompanyMovies"); ResultList result = instance.getCompanyMovies(ID_COMPANY, LANGUAGE_DEFAULT, 0); - TestSuite.test(result); + TestSuite.test(result,"Company Movies"); } } diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java index c634294a1..a1c2e46cc 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java @@ -107,7 +107,7 @@ public class TmdbConfigurationTest extends AbstractTests { public void testGetJobs() throws MovieDbException { LOG.info("getJobs"); ResultList result = instance.getJobs(); - TestSuite.test(result); + TestSuite.test(result, "Jobs"); } /** diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java index 6c0511fde..47f9b565e 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java @@ -73,7 +73,7 @@ public class TmdbDiscoverTest extends AbstractTests { discover.year(2013).language(LANGUAGE_ENGLISH); ResultList result = instance.getDiscoverMovies(discover); - TestSuite.test(result); + TestSuite.test(result, "Disc Movie"); } /** @@ -88,7 +88,7 @@ public class TmdbDiscoverTest extends AbstractTests { discover.year(2013).language(LANGUAGE_ENGLISH); ResultList result = instance.getDiscoverTV(discover); - TestSuite.test(result); + TestSuite.test(result, "Disc TV"); } } diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbFindTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbFindTest.java index 4eb606136..857676e5a 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbFindTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbFindTest.java @@ -89,7 +89,7 @@ public class TmdbFindTest extends AbstractTests { for (TestID test : FILM_IDS) { LOG.info("Testing {}", test); result = instance.find(test.getImdb(), ExternalSource.IMDB_ID, LANGUAGE_DEFAULT); - TestSuite.test(result.getMovieResults()); + TestSuite.test(result.getMovieResults(), "Movies IMDB"); TestSuite.testId(result.getMovieResults(), test.getTmdb(), "Movie"); } } @@ -108,7 +108,7 @@ public class TmdbFindTest extends AbstractTests { for (TestID test : PERSON_IDS) { LOG.info("Testing {}", test); result = instance.find(test.getImdb(), ExternalSource.IMDB_ID, LANGUAGE_DEFAULT); - TestSuite.test(result.getPersonResults()); + TestSuite.test(result.getPersonResults(), "Person IMDB"); TestSuite.testId(result.getPersonResults(), test.getTmdb(), "Person"); } } @@ -126,7 +126,7 @@ public class TmdbFindTest extends AbstractTests { for (TestID test : TV_IDS) { LOG.info("Testing {}", test); result = instance.find(test.getImdb(), ExternalSource.IMDB_ID, LANGUAGE_DEFAULT); - TestSuite.test(result.getTvResults()); + TestSuite.test(result.getTvResults(), "TV IMDB"); TestSuite.testId(result.getTvResults(), test.getTmdb(), "TV"); } } diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbKeywordsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbKeywordsTest.java index 237f621ef..b398d7112 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbKeywordsTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbKeywordsTest.java @@ -84,7 +84,7 @@ public class TmdbKeywordsTest extends AbstractTests { LOG.info("getKeywordMovies"); int page = 0; ResultList result = tmdb.getKeywordMovies(ID_KEYWORD, LANGUAGE_DEFAULT, page); - TestSuite.test(result); + TestSuite.test(result, "Keyword"); } } diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java index 1eaf78a06..f045a7a64 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java @@ -146,7 +146,7 @@ public class TmdbMoviesTest extends AbstractTests { for (TestID test : FILM_IDS) { ResultList result = instance.getMovieAlternativeTitles(test.getTmdb(), country, appendToResponse); - TestSuite.test(result); + TestSuite.test(result, "Alt Titles"); } } @@ -165,8 +165,8 @@ public class TmdbMoviesTest extends AbstractTests { MediaCreditList result = instance.getMovieCredits(test.getTmdb(), appendToResponse); assertNotNull(result); assertFalse(result.getCast().isEmpty()); - TestSuite.test(result.getCast()); - TestSuite.test(result.getCrew()); + TestSuite.test(result.getCast(), "Cast"); + TestSuite.test(result.getCrew(), "Crew"); boolean found = false; for (MediaCreditCast p : result.getCast()) { @@ -220,7 +220,7 @@ public class TmdbMoviesTest extends AbstractTests { for (TestID test : FILM_IDS) { ResultList result = instance.getMovieKeywords(test.getTmdb(), appendToResponse); - TestSuite.test(result); + TestSuite.test(result, "Keywords"); } } @@ -238,7 +238,7 @@ public class TmdbMoviesTest extends AbstractTests { for (TestID test : FILM_IDS) { ResultList result = instance.getMovieReleaseInfo(test.getTmdb(), language, appendToResponse); - TestSuite.test(result); + TestSuite.test(result, "Rel Info"); } } @@ -275,7 +275,7 @@ public class TmdbMoviesTest extends AbstractTests { for (TestID test : FILM_IDS) { ResultList result = instance.getMovieTranslations(test.getTmdb(), appendToResponse); - TestSuite.test(result); + TestSuite.test(result, "Translations"); } } @@ -294,7 +294,7 @@ public class TmdbMoviesTest extends AbstractTests { for (TestID test : FILM_IDS) { ResultList result = instance.getSimilarMovies(test.getTmdb(), page, language, appendToResponse); - TestSuite.test(result); + TestSuite.test(result, "Similar"); } } @@ -317,7 +317,7 @@ public class TmdbMoviesTest extends AbstractTests { continue; } ResultList result = instance.getMovieReviews(test.getTmdb(), page, language, appendToResponse); - TestSuite.test(result); + TestSuite.test(result, "Reviews"); } } @@ -336,7 +336,7 @@ public class TmdbMoviesTest extends AbstractTests { for (TestID test : FILM_IDS) { ResultList result = instance.getMovieLists(test.getTmdb(), page, language, appendToResponse); - TestSuite.test(result); + TestSuite.test(result, "Lists"); } } @@ -429,7 +429,7 @@ public class TmdbMoviesTest extends AbstractTests { String language = LANGUAGE_DEFAULT; ResultList result = instance.getNowPlayingMovies(page, language); - TestSuite.test(result); + TestSuite.test(result, "Now Playing"); } /** @@ -444,7 +444,7 @@ public class TmdbMoviesTest extends AbstractTests { String language = LANGUAGE_DEFAULT; ResultList result = instance.getPopularMovieList(page, language); - TestSuite.test(result); + TestSuite.test(result, "Popular"); } /** @@ -459,7 +459,7 @@ public class TmdbMoviesTest extends AbstractTests { String language = LANGUAGE_DEFAULT; ResultList result = instance.getTopRatedMovies(page, language); - TestSuite.test(result); + TestSuite.test(result, "Top Rated"); } } diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java index 71d489022..f5a58b78d 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java @@ -119,8 +119,8 @@ public class TmdbPeopleTest extends AbstractTests { PersonCredits result = instance.getPersonMovieCredits(test.getTmdb(), language, appendToResponse); LOG.info("ID: {}, # Cast: {}, # Crew: {}", result.getId(), result.getCast().size(), result.getCrew().size()); assertEquals("Incorrect ID", test.getTmdb(), result.getId()); - TestSuite.test(result.getCast()); - TestSuite.test(result.getCrew()); + TestSuite.test(result.getCast(), "Cast"); + TestSuite.test(result.getCrew(), "Crew"); // Check that we have the movie specific fields assertTrue("No title", StringUtils.isNotBlank(result.getCast().get(0).getTitle())); @@ -143,8 +143,8 @@ public class TmdbPeopleTest extends AbstractTests { PersonCredits result = instance.getPersonTVCredits(test.getTmdb(), language, appendToResponse); LOG.info("ID: {}, # Cast: {}, # Crew: {}", result.getId(), result.getCast().size(), result.getCrew().size()); assertEquals("Incorrect ID", test.getTmdb(), result.getId()); - TestSuite.test(result.getCast()); - TestSuite.test(result.getCrew()); + TestSuite.test(result.getCast(), "Cast"); + TestSuite.test(result.getCrew(), "Crew"); // Check that we have the TV specific fields assertTrue("No title", StringUtils.isNotBlank(result.getCast().get(0).getName())); @@ -167,8 +167,8 @@ public class TmdbPeopleTest extends AbstractTests { PersonCredits result = instance.getPersonCombinedCredits(test.getTmdb(), language, appendToResponse); LOG.info("ID: {}, # Cast: {}, # Crew: {}", result.getId(), result.getCast().size(), result.getCrew().size()); assertEquals("Incorrect ID", test.getTmdb(), result.getId()); - TestSuite.test(result.getCast()); - TestSuite.test(result.getCrew()); + TestSuite.test(result.getCast(), "Cast"); + TestSuite.test(result.getCrew(), "Crew"); boolean checkedMovie = false; boolean checkedTV = false; @@ -220,7 +220,7 @@ public class TmdbPeopleTest extends AbstractTests { for (TestID test : testIDs) { ResultList result = instance.getPersonImages(test.getTmdb()); - TestSuite.test(result); + TestSuite.test(result, "Images"); assertEquals("Wrong artwork type", ArtworkType.PROFILE, result.getResults().get(0).getArtworkType()); } } @@ -238,7 +238,7 @@ public class TmdbPeopleTest extends AbstractTests { for (TestID test : testIDs) { ResultList result = instance.getPersonTaggedImages(test.getTmdb(), page, language); - TestSuite.test(result); + TestSuite.test(result, "Tagged"); for (ArtworkMedia am : result.getResults()) { assertTrue("No ID", StringUtils.isNotBlank(am.getId())); assertTrue("No file path", StringUtils.isNotBlank(am.getFilePath())); @@ -287,7 +287,7 @@ public class TmdbPeopleTest extends AbstractTests { LOG.info("getPersonPopular"); Integer page = null; ResultList result = instance.getPersonPopular(page); - TestSuite.test(result); + TestSuite.test(result, "Popular"); for (PersonFind p : result.getResults()) { assertFalse("No known for entries", p.getKnownFor().isEmpty()); LOG.info("{} ({}) = {}", p.getName(), p.getId(), p.getKnownFor().size()); diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java index 547a719f2..9d8ccfdc2 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java @@ -63,7 +63,7 @@ public class TmdbSearchTest extends AbstractTests { public void testSearchCompanies() throws MovieDbException { LOG.info("searchCompanies"); ResultList result = instance.searchCompanies("Marvel Studios", 0); - TestSuite.test(result); + TestSuite.test(result, "Companies"); TestSuite.testId(result, 420, "Company"); } @@ -78,7 +78,7 @@ public class TmdbSearchTest extends AbstractTests { String query = "batman"; int page = 0; ResultList result = instance.searchCollection(query, page, LANGUAGE_DEFAULT); - TestSuite.test(result); + TestSuite.test(result, "Collection"); TestSuite.testId(result, 263, "Collection"); } @@ -93,7 +93,7 @@ public class TmdbSearchTest extends AbstractTests { String query = "action"; int page = 0; ResultList result = instance.searchKeyword(query, page); - TestSuite.test(result); + TestSuite.test(result, "Keyword"); TestSuite.testId(result, 207600, "Keyword"); } @@ -108,7 +108,7 @@ public class TmdbSearchTest extends AbstractTests { String query = "watch"; int page = 0; ResultList result = instance.searchList(query, page, null); - TestSuite.test(result); + TestSuite.test(result, "List"); } /** @@ -122,17 +122,17 @@ public class TmdbSearchTest extends AbstractTests { // Try a movie with less than 1 page of results ResultList movieList = instance.searchMovie("Blade Runner", 0, "", null, 0, 0, SearchType.PHRASE); - TestSuite.test(movieList); + TestSuite.test(movieList, "Movie 1"); assertTrue("No movies found, should be at least 1", movieList.getResults().size() > 0); // Try a russian langugage movie movieList = instance.searchMovie("О чём говорят мужчины", 0, LANGUAGE_RUSSIAN, null, 0, 0, SearchType.PHRASE); - TestSuite.test(movieList); + TestSuite.test(movieList, "Movie 2"); assertTrue("No 'RU' movies found, should be at least 1", movieList.getResults().size() > 0); // Try a movie with more than 20 results movieList = instance.searchMovie("Star Wars", 0, LANGUAGE_ENGLISH, null, 0, 0, SearchType.PHRASE); - TestSuite.test(movieList); + TestSuite.test(movieList, "Movie 3"); assertTrue("Not enough movies found, should be over 15, found " + movieList.getResults().size(), movieList.getResults().size() >= 15); } @@ -149,7 +149,7 @@ public class TmdbSearchTest extends AbstractTests { String language = ""; Boolean includeAdult = null; ResultList result = instance.searchMulti(query, page, language, includeAdult); - TestSuite.test(result); + TestSuite.test(result, "Multi"); boolean foundTV = false; boolean foundMovie = false; @@ -180,7 +180,7 @@ public class TmdbSearchTest extends AbstractTests { LOG.info("searchPeople"); String personName = "Bruce Willis"; ResultList result = instance.searchPeople(personName, null, null, SearchType.PHRASE); - TestSuite.test(result); + TestSuite.test(result, "People"); TestSuite.testId(result.getResults(), 62, "People"); } @@ -198,7 +198,7 @@ public class TmdbSearchTest extends AbstractTests { Integer firstAirDateYear = null; SearchType searchType = SearchType.PHRASE; ResultList result = instance.searchTV(query, page, language, firstAirDateYear, searchType); - TestSuite.test(result); + TestSuite.test(result, "TV"); TestSuite.testId(result, 1402, "TV Show"); } diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSeasonsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSeasonsTest.java index fff4f89ce..b01e682a7 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSeasonsTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSeasonsTest.java @@ -140,9 +140,13 @@ public class TmdbSeasonsTest extends AbstractTests { for (TestID test : TV_IDS) { LOG.info("Testing: {}", test); MediaCreditList result = instance.getSeasonCredits(test.getTmdb(), seasonNumber); + assertNotNull(result); - TestSuite.test(result.getCast()); - TestSuite.test(result.getCrew()); + TestSuite.test(result.getCast(), "Cast " + test.getTmdb()); + // No crew for 1418 + if (test.getTmdb() != 1418) { + TestSuite.test(result.getCrew(), "Crew " + test.getTmdb()); + } boolean found = false; for (MediaCreditCast p : result.getCast()) { @@ -192,7 +196,7 @@ public class TmdbSeasonsTest extends AbstractTests { for (TestID test : TV_IDS) { LOG.info("Testing: {}", test); ResultList result = instance.getSeasonImages(test.getTmdb(), seasonNumber, language, includeImageLanguage); - TestSuite.test(result); + TestSuite.test(result, "Artwork"); for (Artwork artwork : result.getResults()) { results.found(artwork.getArtworkType()); } diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java index d79044a6a..1bdfb5741 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java @@ -123,7 +123,7 @@ public class TmdbTVTest extends AbstractTests { for (TestID test : TV_IDS) { ResultList result = instance.getTVAlternativeTitles(test.getTmdb()); - TestSuite.test(result); + TestSuite.test(result, "TV Alt Titles"); } } @@ -169,7 +169,7 @@ public class TmdbTVTest extends AbstractTests { for (TestID test : TV_IDS) { ResultList result = instance.getTVContentRatings(test.getTmdb()); - TestSuite.test(result); + TestSuite.test(result, "TV Content Rating"); assertTrue("No language", StringUtils.isNotBlank(result.getResults().get(0).getLanguage())); assertTrue("No rating", StringUtils.isNotBlank(result.getResults().get(0).getRating())); } @@ -236,7 +236,7 @@ public class TmdbTVTest extends AbstractTests { for (TestID test : TV_IDS) { ResultList result = instance.getTVImages(test.getTmdb(), language, includeImageLanguage); - TestSuite.test(result); + TestSuite.test(result, "TV Images"); for (Artwork artwork : result.getResults()) { results.found(artwork.getArtworkType()); } @@ -260,7 +260,7 @@ public class TmdbTVTest extends AbstractTests { for (TestID test : TV_IDS) { ResultList result = instance.getTVKeywords(test.getTmdb(), appendToResponse); - TestSuite.test(result); + TestSuite.test(result, "TV Keyword"); } } @@ -295,7 +295,7 @@ public class TmdbTVTest extends AbstractTests { for (TestID test : TV_IDS) { ResultList result = instance.getTVSimilar(test.getTmdb(), page, language, appendToResponse); - TestSuite.test(result); + TestSuite.test(result, "TV Similar"); } } @@ -310,7 +310,7 @@ public class TmdbTVTest extends AbstractTests { for (TestID test : TV_IDS) { ResultList result = instance.getTVTranslations(test.getTmdb()); - TestSuite.test(result); + TestSuite.test(result, "TV Translations"); } } @@ -358,7 +358,7 @@ public class TmdbTVTest extends AbstractTests { String language = LANGUAGE_DEFAULT; ResultList result = instance.getTVOnTheAir(page, language); - TestSuite.test(result); + TestSuite.test(result, "TV OTA"); } /** @@ -374,7 +374,7 @@ public class TmdbTVTest extends AbstractTests { String timezone = ""; ResultList result = instance.getTVAiringToday(page, language, timezone); - TestSuite.test(result); + TestSuite.test(result, "TV Airing"); } /** @@ -389,7 +389,7 @@ public class TmdbTVTest extends AbstractTests { String language = LANGUAGE_DEFAULT; ResultList result = instance.getTVTopRated(page, language); - TestSuite.test(result); + TestSuite.test(result, "TV Top"); } /** @@ -404,7 +404,7 @@ public class TmdbTVTest extends AbstractTests { String language = LANGUAGE_DEFAULT; ResultList result = instance.getTVPopular(page, language); - TestSuite.test(result); + TestSuite.test(result, "tv Popular"); } }