diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java index 7a25d1684..70a32c0c2 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java @@ -13,6 +13,7 @@ package com.moviejukebox.themoviedb.model; import java.util.List; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.codehaus.jackson.annotate.JsonAnySetter; import org.codehaus.jackson.annotate.JsonProperty; @@ -94,6 +95,9 @@ public class TmdbConfiguration { * @return */ public boolean isValidPosterSize(String posterSize) { + if (StringUtils.isBlank(posterSize)) { + return false; + } return posterSizes.contains(posterSize); } @@ -103,6 +107,9 @@ public class TmdbConfiguration { * @return */ public boolean isValidBackdropSize(String backdropSize) { + if (StringUtils.isBlank(backdropSize)) { + return false; + } return backdropSizes.contains(backdropSize); } @@ -112,6 +119,9 @@ public class TmdbConfiguration { * @return */ public boolean isValidProfileSize(String profileSize) { + if (StringUtils.isBlank(profileSize)) { + return false; + } return profileSizes.contains(profileSize); } diff --git a/themoviedbapi/src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java b/themoviedbapi/src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java index c7e9a90ef..99b34ac9f 100644 --- a/themoviedbapi/src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java +++ b/themoviedbapi/src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java @@ -61,7 +61,7 @@ public class TheMovieDbTest { /** * Test of getConfiguration method, of class TheMovieDb. */ - //@Test + @Test public void testConfiguration() throws IOException { LOGGER.info("Test Configuration"); @@ -77,7 +77,7 @@ public class TheMovieDbTest { /** * Test of searchMovie method, of class TheMovieDb. */ - //@Test + @Test public void testSearchMovie() throws UnsupportedEncodingException { LOGGER.info("searchMovie"); @@ -97,7 +97,7 @@ public class TheMovieDbTest { /** * Test of getMovieInfo method, of class TheMovieDb. */ - //@Test + @Test public void testGetMovieInfo() { LOGGER.info("getMovieInfo"); String language = "en"; @@ -108,7 +108,7 @@ public class TheMovieDbTest { /** * Test of getMovieAlternativeTitles method, of class TheMovieDb. */ - //@Test + @Test public void testGetMovieAlternativeTitles() { LOGGER.info("getMovieAlternativeTitles"); String country = ""; @@ -124,7 +124,7 @@ public class TheMovieDbTest { /** * Test of getMovieCasts method, of class TheMovieDb. */ - //@Test + @Test public void testGetMovieCasts() { LOGGER.info("getMovieCasts"); List people = tmdb.getMovieCasts(ID_BLADE_RUNNER); @@ -151,7 +151,7 @@ public class TheMovieDbTest { /** * Test of getMovieImages method, of class TheMovieDb. */ - //@Test + @Test public void testGetMovieImages() { LOGGER.info("getMovieImages"); String language = ""; @@ -162,7 +162,7 @@ public class TheMovieDbTest { /** * Test of getMovieKeywords method, of class TheMovieDb. */ - //@Test + @Test public void testGetMovieKeywords() { LOGGER.info("getMovieKeywords"); List result = tmdb.getMovieKeywords(ID_BLADE_RUNNER); @@ -172,7 +172,7 @@ public class TheMovieDbTest { /** * Test of getMovieReleaseInfo method, of class TheMovieDb. */ - //@Test + @Test public void testGetMovieReleaseInfo() { LOGGER.info("getMovieReleaseInfo"); List result = tmdb.getMovieReleaseInfo(ID_BLADE_RUNNER, ""); @@ -182,7 +182,7 @@ public class TheMovieDbTest { /** * Test of getMovieTrailers method, of class TheMovieDb. */ - //@Test + @Test public void testGetMovieTrailers() { LOGGER.info("getMovieTrailers"); List result = tmdb.getMovieTrailers(ID_BLADE_RUNNER, ""); @@ -192,7 +192,7 @@ public class TheMovieDbTest { /** * Test of getMovieTranslations method, of class TheMovieDb. */ - //@Test + @Test public void testGetMovieTranslations() { LOGGER.info("getMovieTranslations"); List result = tmdb.getMovieTranslations(ID_BLADE_RUNNER); @@ -202,7 +202,7 @@ public class TheMovieDbTest { /** * Test of getCollectionInfo method, of class TheMovieDb. */ - //@Test + @Test public void testGetCollectionInfo() { LOGGER.info("getCollectionInfo"); String language = ""; @@ -210,7 +210,7 @@ public class TheMovieDbTest { assertFalse("No collection information", result.getParts().isEmpty()); } - //@Test + @Test public void testCreateImageUrl() { LOGGER.info("createImageUrl"); MovieDb movie = tmdb.getMovieInfo(ID_BLADE_RUNNER, ""); @@ -221,7 +221,7 @@ public class TheMovieDbTest { /** * Test of getMovieInfoImdb method, of class TheMovieDb. */ - //@Test + @Test public void testGetMovieInfoImdb() { LOGGER.info("getMovieInfoImdb"); MovieDb result = tmdb.getMovieInfoImdb("tt0076759", "en-US"); @@ -231,7 +231,7 @@ public class TheMovieDbTest { /** * Test of getApiKey method, of class TheMovieDb. */ - //@Test + @Test public void testGetApiKey() { // Not required } @@ -239,7 +239,7 @@ public class TheMovieDbTest { /** * Test of getApiBase method, of class TheMovieDb. */ - //@Test + @Test public void testGetApiBase() { // Not required } @@ -247,7 +247,7 @@ public class TheMovieDbTest { /** * Test of getConfiguration method, of class TheMovieDb. */ - //@Test + @Test public void testGetConfiguration() { // Not required } @@ -294,11 +294,6 @@ public class TheMovieDbTest { List artwork = tmdb.getPersonImages(ID_BRUCE_WILLIS); assertTrue("No cast information", artwork.size() > 0); - - for(Artwork a:artwork) { - LOGGER.info(" " + a.toString()); - } - } }