Update account methods

Move to their own class
Updated HttpClient for POST and DELETE

src/test/java/com/omertron/themoviedbapi/TestAccounts.java

@@ -0,0 +1,275 @@
+/*
+ *      Copyright (c) 2004-2015 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation, either version 3 of the License, or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi;
+
+import com.omertron.themoviedbapi.model.Account;
+import com.omertron.themoviedbapi.model.MovieDb;
+import com.omertron.themoviedbapi.model.MovieDbList;
+import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model.TokenAuthorisation;
+import com.omertron.themoviedbapi.model.TokenSession;
+import java.io.File;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestAccounts {
+
+    private static final Logger LOG = LoggerFactory.getLogger(TestAccounts.class);
+    // API Key
+    private static final String PROP_FIlENAME = "testing.properties";
+    private static String API_KEY;
+    private static String ACCOUNT_USERNAME;
+    private static String ACCOUNT_PASSWORD;
+    private static TheMovieDbApi tmdb;
+    private static TokenSession tokenSession = null;
+    private static Account account = null;
+
+    public TestAccounts() throws MovieDbException {
+    }
+
+    @BeforeClass
+    public static void setUpClass() throws MovieDbException {
+        TestLogger.Configure();
+
+        Properties props = new Properties();
+        File f = new File(PROP_FIlENAME);
+        if (f.exists()) {
+            LOG.info("Loading properties from '{}'", PROP_FIlENAME);
+            TestLogger.loadProperties(props, f);
+
+            API_KEY = props.getProperty("API_Key");
+            ACCOUNT_USERNAME = props.getProperty("Username");
+            ACCOUNT_PASSWORD = props.getProperty("Password");
+        } else {
+            // Properties file is created in the main test class
+            fail("Failed to get key information from properties file '" + PROP_FIlENAME + "'");
+        }
+
+        tmdb = new TheMovieDbApi(API_KEY);
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+    }
+
+    @Before
+    public void setUp() throws MovieDbException {
+        if (tokenSession == null) {
+            testSessionCreation();
+        }
+
+        if (account == null) {
+            testAccount();
+        }
+    }
+
+    @After
+    public void tearDown() {
+    }
+
+    /**
+     * Test and create a session token for the rest of the tests
+     *
+     * @throws MovieDbException
+     */
+    @Test
+    public void testSessionCreation() throws MovieDbException {
+        LOG.info("Test and create a session token for the rest of the tests");
+
+        // 1: Create a request token
+        TokenAuthorisation token = tmdb.getAuthorisationToken();
+        assertFalse("Token (auth) is null", token == null);
+        assertTrue("Token (auth) is not valid", token.getSuccess());
+        LOG.info("Token (auth): {}", token.toString());
+
+        // 2b; Get user permission
+        token = tmdb.getSessionTokenLogin(token, ACCOUNT_USERNAME, ACCOUNT_PASSWORD);
+        assertFalse("Token (login) is null", token == null);
+        assertTrue("Token (login) is not valid", token.getSuccess());
+        LOG.info("Token (login): {}", token.toString());
+
+        // 3: Create the sessions ID
+        tokenSession = tmdb.getSessionToken(token);
+        assertFalse("Session token is null", tokenSession == null);
+        assertTrue("Session token is not valid", tokenSession.getSuccess());
+        LOG.info("Session token: {}", tokenSession.toString());
+    }
+
+    /**
+     * Test the account information
+     *
+     * @throws MovieDbException
+     */
+    @Test
+    public void testAccount() throws MovieDbException {
+        LOG.info("Using Session ID '{}' for test", tokenSession.getSessionId());
+        account = tmdb.getAccount(tokenSession.getSessionId());
+
+        LOG.info("Account: {}", account);
+
+        // Make sure properties are extracted correctly
+        assertEquals("Wrong username!", ACCOUNT_USERNAME, account.getUserName());
+    }
+
+    @Test
+    public void testWatchList() throws MovieDbException {
+        // If the static account is null, get it
+        if (account == null) {
+            account = tmdb.getAccount(tokenSession.getSessionId());
+        }
+
+        // make sure it's empty (because it's just a test account
+        Assert.assertTrue(tmdb.getWatchList(tokenSession.getSessionId(), account.getId()).isEmpty());
+
+        // add a movie
+        tmdb.addToWatchList(tokenSession.getSessionId(), account.getId(), 550);
+
+        List<MovieDb> watchList = tmdb.getWatchList(tokenSession.getSessionId(), account.getId());
+        assertNotNull("Empty watch list returned", watchList);
+        assertEquals("Watchlist wrong size", 1, watchList.size());
+
+        // clean up again
+        tmdb.removeFromWatchList(tokenSession.getSessionId(), account.getId(), 550);
+
+        Assert.assertTrue(tmdb.getWatchList(tokenSession.getSessionId(), account.getId()).isEmpty());
+    }
+
+    @Test
+    public void testFavorites() throws MovieDbException {
+        // If the static account is null, get it
+        if (account == null) {
+            account = tmdb.getAccount(tokenSession.getSessionId());
+        }
+
+        // make sure it's empty (because it's just a test account
+        Assert.assertTrue(tmdb.getFavoriteMovies(tokenSession.getSessionId(), account.getId()).isEmpty());
+
+        // add a movie
+        tmdb.changeFavoriteStatus(tokenSession.getSessionId(), account.getId(), 550, true);
+
+        List<MovieDb> watchList = tmdb.getFavoriteMovies(tokenSession.getSessionId(), account.getId());
+        assertNotNull("Empty watch list returned", watchList);
+        assertEquals("Watchlist wrong size", 1, watchList.size());
+
+        // clean up again
+        tmdb.changeFavoriteStatus(tokenSession.getSessionId(), account.getId(), 550, false);
+
+        Assert.assertTrue(tmdb.getFavoriteMovies(tokenSession.getSessionId(), account.getId()).isEmpty());
+    }
+
+    /**
+     * Test of getSessionToken method, of class TheMovieDbApi.
+     *
+     * TODO: Cannot be tested without a HTTP authorisation:
+     * http://help.themoviedb.org/kb/api/user-authentication
+     *
+     * @throws MovieDbException
+     */
+    @Ignore("Tested in setup")
+    public void testGetSessionToken() throws MovieDbException {
+    }
+
+    /**
+     * Test of getGuestSessionToken method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
+     */
+    @Test
+    public void testGetGuestSessionToken() throws MovieDbException {
+        LOG.info("getGuestSessionToken");
+        TokenSession result = tmdb.getGuestSessionToken();
+
+        assertTrue("Failed to get guest session", result.getSuccess());
+    }
+
+    /**
+     * Test of postMovieRating method, of class TheMovieDbApi.
+     *
+     * TODO: Cannot be tested without a HTTP authorisation:
+     * http://help.themoviedb.org/kb/api/user-authentication
+     *
+     * @throws MovieDbException
+     */
+    @Test
+    public void testMovieRating() throws MovieDbException {
+        LOG.info("postMovieRating");
+
+        Integer movieID = 68724;
+        Integer rating = new Random().nextInt(10) + 1;
+
+        boolean wasPosted = tmdb.postMovieRating(tokenSession.getSessionId(), movieID, rating);
+        assertTrue("Rating was not added", wasPosted);
+
+        // get all rated movies
+        List<MovieDb> ratedMovies = tmdb.getRatedMovies(tokenSession.getSessionId(), account.getId());
+        assertTrue("No rated movies", ratedMovies.size() > 0);
+
+        // make sure that we find the movie and it is rated correctly
+        boolean foundMovie = false;
+        for (MovieDb movie : ratedMovies) {
+            if (movie.getId() == movieID) {
+                assertEquals("Incorrect movie rating", movie.getUserRating(), (float) rating, 0);
+                foundMovie = true;
+            }
+        }
+        assertTrue(foundMovie);
+    }
+
+    @Test
+    public void testMovieLists() throws MovieDbException {
+        Integer movieID = 68724;
+
+        // use a random name to avoid that we clash we leftovers of incomplete test runs
+        String name = "test list " + new Random().nextInt(100);
+
+        // create the list
+        String listId = tmdb.createList(tokenSession.getSessionId(), name, "api testing only");
+
+        // add a movie, and test that it is on the list now
+        tmdb.addMovieToList(tokenSession.getSessionId(), listId, movieID);
+        MovieDbList list = tmdb.getList(listId);
+        assertNotNull("Movie list returned was null", list);
+        assertEquals("Unexpected number of items returned", 1, list.getItemCount());
+        assertEquals((int) movieID, list.getItems().get(0).getId());
+
+        // now remove the movie
+        tmdb.removeMovieFromList(tokenSession.getSessionId(), listId, movieID);
+        assertEquals(tmdb.getList(listId).getItemCount(), 0);
+
+        // delete the test list
+        StatusCode statusCode = tmdb.deleteMovieList(tokenSession.getSessionId(), listId);
+        assertEquals(statusCode.getStatusCode(), 13);
+    }
+}

src/test/java/com/omertron/themoviedbapi/TestLogger.java

@@ -56,6 +56,7 @@ public class TestLogger {
         config.append("java.util.logging.SimpleFormatter.format = [%1$tH:%1$tM:%1$tS %4$6s] %2$s - %5$s %6$s%n").append(CRLF);
         // Exclude http logging
         config.append("sun.net.www.protocol.http.HttpURLConnection.level = OFF").append(CRLF);
+        config.append("org.apache.http.level = SEVERE").append(CRLF);
 
         InputStream ins = new ByteArrayInputStream(config.toString().getBytes());
         try {

src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java

@@ -19,7 +19,6 @@
  */
 package com.omertron.themoviedbapi;
 
-import com.omertron.themoviedbapi.model.Account;
 import com.omertron.themoviedbapi.model.AlternativeTitle;
 import com.omertron.themoviedbapi.model.Artwork;
 import com.omertron.themoviedbapi.model.ChangedItem;
@@ -39,7 +38,6 @@ import com.omertron.themoviedbapi.model.Person;
 import com.omertron.themoviedbapi.model.PersonCredit;
 import com.omertron.themoviedbapi.model.ReleaseInfo;
 import com.omertron.themoviedbapi.model.Reviews;
-import com.omertron.themoviedbapi.model.StatusCode;
 import com.omertron.themoviedbapi.model.TmdbConfiguration;
 import com.omertron.themoviedbapi.model.TokenAuthorisation;
 import com.omertron.themoviedbapi.model.TokenSession;
@@ -50,12 +48,9 @@ import com.omertron.themoviedbapi.results.TmdbResultsMap;
 import java.io.File;
 import java.util.List;
 import java.util.Properties;
-import java.util.Random;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -80,8 +75,6 @@ public class TheMovieDbApiTest {
     // API Key
     private static final String PROP_FIlENAME = "testing.properties";
     private static String API_KEY;
-    private static int ACCOUNT_ID_APITESTS;
-    private static String SESSION_ID_APITESTS;
     private static TheMovieDbApi tmdb;
     // Test data
     private static final int ID_MOVIE_BLADE_RUNNER = 78;
@@ -102,7 +95,7 @@ public class TheMovieDbApiTest {
     }
 
     @BeforeClass
-    public static void setUpClass() throws Exception {
+    public static void setUpClass() throws MovieDbException {
         TestLogger.Configure();
 
         Properties props = new Properties();
@@ -112,14 +105,12 @@ public class TheMovieDbApiTest {
             TestLogger.loadProperties(props, f);
 
             API_KEY = props.getProperty("API_Key");
-            ACCOUNT_ID_APITESTS = NumberUtils.toInt(props.getProperty("Account_ID"), 0);
-            SESSION_ID_APITESTS = props.getProperty("Session_ID");
         } else {
             LOG.info("Property file '{}' not found, creating dummy file.", PROP_FIlENAME);
 
             props.setProperty("API_Key", "INSERT_YOUR_KEY_HERE");
-            props.setProperty("Account_ID", "ACCOUNT ID FOR SESSION TESTS");
-            props.setProperty("Session_ID", "INSERT_YOUR_SESSION_ID_HERE");
+            props.setProperty("Username", "INSERT_YOUR_USERNAME_HERE");
+            props.setProperty("Password", "INSERT_YOUR_PASSWORD_HERE");
 
             TestLogger.saveProperties(props, f, "Properties file for tests");
             fail("Failed to get key information from properties file '" + PROP_FIlENAME + "'");
@@ -129,7 +120,7 @@ public class TheMovieDbApiTest {
     }
 
     @AfterClass
-    public static void tearDownClass() throws Exception {
+    public static void tearDownClass() throws MovieDbException {
     }
 
     @Before
@@ -156,52 +147,6 @@ public class TheMovieDbApiTest {
         LOG.info(tmdbConfig.toString());
     }
 
-    @Test
-    public void testAccount() throws MovieDbException {
-        LOG.info("Using Session ID '{}' for test", SESSION_ID_APITESTS);
-        Account account = tmdb.getAccount(SESSION_ID_APITESTS);
-
-        // Make sure properties are extracted correctly
-        assertEquals("apitests", account.getUserName());
-        assertEquals(ACCOUNT_ID_APITESTS, account.getId());
-    }
-
-    @Ignore("Session required")
-    public void testWatchList() throws MovieDbException {
-        // make sure it's empty (because it's just a test account
-        Assert.assertTrue(tmdb.getWatchList(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS).isEmpty());
-
-        // add a movie
-        tmdb.addToWatchList(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS, 550);
-
-        List<MovieDb> watchList = tmdb.getWatchList(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS);
-        assertNotNull("Empty watch list returned", watchList);
-        assertEquals("Watchlist wrong size", 1, watchList.size());
-
-        // clean up again
-        tmdb.removeFromWatchList(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS, 550);
-
-        Assert.assertTrue(tmdb.getWatchList(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS).isEmpty());
-    }
-
-    @Ignore("Session required")
-    public void testFavorites() throws MovieDbException {
-        // make sure it's empty (because it's just a test account
-        Assert.assertTrue(tmdb.getFavoriteMovies(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS).isEmpty());
-
-        // add a movie
-        tmdb.changeFavoriteStatus(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS, 550, true);
-
-        List<MovieDb> watchList = tmdb.getFavoriteMovies(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS);
-        assertNotNull("Empty watch list returned", watchList);
-        assertEquals("Watchlist wrong size", 1, watchList.size());
-
-        // clean up again
-        tmdb.changeFavoriteStatus(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS, 550, false);
-
-        Assert.assertTrue(tmdb.getFavoriteMovies(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS).isEmpty());
-    }
-
     /**
      * Test of searchMovie method, of class TheMovieDbApi.
      *
@@ -563,7 +508,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Test
-    public void testGetUpcoming() throws Exception {
+    public void testGetUpcoming() throws MovieDbException {
         LOG.info("getUpcoming");
         TmdbResultsList<MovieDb> result = tmdb.getUpcoming(LANGUAGE_DEFAULT, 0);
         assertTrue("No upcoming movies found", !result.getResults().isEmpty());
@@ -575,7 +520,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Test
-    public void testGetCollectionImages() throws Exception {
+    public void testGetCollectionImages() throws MovieDbException {
         LOG.info("getCollectionImages");
         TmdbResultsList<Artwork> result = tmdb.getCollectionImages(ID_COLLECTION_STAR_WARS, LANGUAGE_DEFAULT);
         assertFalse("No artwork found", result.getResults().isEmpty());
@@ -587,7 +532,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Test
-    public void testGetAuthorisationToken() throws Exception {
+    public void testGetAuthorisationToken() throws MovieDbException {
         LOG.info("getAuthorisationToken");
         TokenAuthorisation result = tmdb.getAuthorisationToken();
         assertFalse("Token is null", result == null);
@@ -604,7 +549,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Ignore("Session required")
-    public void testGetSessionToken() throws Exception {
+    public void testGetSessionToken() throws MovieDbException {
         LOG.info("getSessionToken");
         TokenAuthorisation token = tmdb.getAuthorisationToken();
         assertFalse("Token is null", token == null);
@@ -623,14 +568,14 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Ignore("Not ready yet")
-    public void testGetGuestSessionToken() throws Exception {
+    public void testGetGuestSessionToken() throws MovieDbException {
         LOG.info("getGuestSessionToken");
         TokenSession result = tmdb.getGuestSessionToken();
 
         assertTrue("Failed to get guest session", result.getSuccess());
     }
 
-    public void testGetMovieLists() throws Exception {
+    public void testGetMovieLists() throws MovieDbException {
         LOG.info("getMovieLists");
         TmdbResultsList<MovieList> result = tmdb.getMovieLists(ID_MOVIE_BLADE_RUNNER, LANGUAGE_ENGLISH, 0);
         assertNotNull("No results found", result);
@@ -645,7 +590,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Ignore("Do not test this until it is fixed")
-    public void testGetMovieChanges() throws Exception {
+    public void testGetMovieChanges() throws MovieDbException {
         LOG.info("getMovieChanges");
 
         String startDate = "";
@@ -662,7 +607,7 @@ public class TheMovieDbApiTest {
     }
 
     @Test
-    public void testGetPersonLatest() throws Exception {
+    public void testGetPersonLatest() throws MovieDbException {
         LOG.info("getPersonLatest");
 
         Person result = tmdb.getPersonLatest();
@@ -677,7 +622,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Test
-    public void testSearchCollection() throws Exception {
+    public void testSearchCollection() throws MovieDbException {
         LOG.info("searchCollection");
         String query = "batman";
         int page = 0;
@@ -692,7 +637,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Test
-    public void testSearchList() throws Exception {
+    public void testSearchList() throws MovieDbException {
         LOG.info("searchList");
         String query = "watch";
         int page = 0;
@@ -707,7 +652,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Test
-    public void testSearchKeyword() throws Exception {
+    public void testSearchKeyword() throws MovieDbException {
         LOG.info("searchKeyword");
         String query = "action";
         int page = 0;
@@ -716,73 +661,13 @@ public class TheMovieDbApiTest {
         assertTrue("No keywords found", result.getResults().size() > 0);
     }
 
-    /**
-     * Test of postMovieRating method, of class TheMovieDbApi.
-     *
-     * TODO: Cannot be tested without a HTTP authorisation:
-     * http://help.themoviedb.org/kb/api/user-authentication
-     *
-     * @throws MovieDbException
-     */
-    @Ignore("Session required")
-    public void testMovieRating() throws Exception {
-        LOG.info("postMovieRating");
-        Integer movieID = 68724;
-        Integer rating = new Random().nextInt(10) + 1;
-
-        boolean wasPosted = tmdb.postMovieRating(SESSION_ID_APITESTS, movieID, rating);
-
-        assertNotNull(wasPosted);
-        assertTrue(wasPosted);
-
-        // get all rated movies
-        List<MovieDb> ratedMovies = tmdb.getRatedMovies(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS);
-        assertTrue(ratedMovies.size() > 0);
-
-        // make sure that we find the movie and it is rated correctly
-        boolean foundMovie = false;
-        for (MovieDb movie : ratedMovies) {
-            if (movie.getId() == movieID) {
-                assertEquals(movie.getUserRating(), (float) rating, 0);
-                foundMovie = true;
-            }
-        }
-        assertTrue(foundMovie);
-    }
-
-    @Ignore("Session required")
-    public void testMovieLists() throws Exception {
-        Integer movieID = 68724;
-
-        // use a random name to avoid that we clash we leftovers of incomplete test runs
-        String name = "test list " + new Random().nextInt(100);
-
-        // create the list
-        String listId = tmdb.createList(SESSION_ID_APITESTS, name, "api testing only");
-
-        // add a movie, and test that it is on the list now
-        tmdb.addMovieToList(SESSION_ID_APITESTS, listId, movieID);
-        MovieDbList list = tmdb.getList(listId);
-        assertNotNull("Movie list returned was null", list);
-        assertEquals("Unexpected number of items returned", 1, list.getItemCount());
-        assertEquals((int) movieID, list.getItems().get(0).getId());
-
-        // now remove the movie
-        tmdb.removeMovieFromList(SESSION_ID_APITESTS, listId, movieID);
-        assertEquals(tmdb.getList(listId).getItemCount(), 0);
-
-        // delete the test list
-        StatusCode statusCode = tmdb.deleteMovieList(SESSION_ID_APITESTS, listId);
-        assertEquals(statusCode.getStatusCode(), 13);
-    }
-
     /**
      * Test of getPersonChanges method, of class TheMovieDbApi.
      *
      * @throws MovieDbException
      */
     @Ignore("Not ready yet")
-    public void testGetPersonChanges() throws Exception {
+    public void testGetPersonChanges() throws MovieDbException {
         LOG.info("getPersonChanges");
         String startDate = "";
         String endDate = "";
@@ -795,7 +680,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Test
-    public void testGetList() throws Exception {
+    public void testGetList() throws MovieDbException {
         LOG.info("getList");
         String listId = "509ec17b19c2950a0600050d";
         MovieDbList result = tmdb.getList(listId);
@@ -808,7 +693,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Test
-    public void testGetKeyword() throws Exception {
+    public void testGetKeyword() throws MovieDbException {
         LOG.info("getKeyword");
         Keyword result = tmdb.getKeyword(ID_KEYWORD);
         assertEquals("fight", result.getName());
@@ -820,7 +705,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Test
-    public void testGetKeywordMovies() throws Exception {
+    public void testGetKeywordMovies() throws MovieDbException {
         LOG.info("getKeywordMovies");
         int page = 0;
         TmdbResultsList<KeywordMovie> result = tmdb.getKeywordMovies(ID_KEYWORD, LANGUAGE_DEFAULT, page);
@@ -833,7 +718,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Test
-    public void testGetReviews() throws Exception {
+    public void testGetReviews() throws MovieDbException {
         LOG.info("getReviews");
         int page = 0;
         TmdbResultsList<Reviews> result = tmdb.getReviews(ID_MOVIE_THE_AVENGERS, LANGUAGE_DEFAULT, page);
@@ -841,68 +726,26 @@ public class TheMovieDbApiTest {
         assertFalse("No reviews found", result.getResults().isEmpty());
     }
 
-    /**
-     * Test of compareMovies method, of class TheMovieDbApi.
-     *
-     */
-    @Ignore("Not required")
-    public void testCompareMovies_3args() {
-    }
-
-    /**
-     * Test of compareMovies method, of class TheMovieDbApi.
-     *
-     */
-    @Ignore("Not required")
-    public void testCompareMovies_4args() {
-    }
-
-    /**
-     * Test of getPersonPopular method, of class TheMovieDbApi.
-     *
-     */
-    @Ignore("Not required")
-    public void testGetPersonPopular_0args() {
-    }
-
     /**
      * Test of getPersonPopular method, of class TheMovieDbApi.
      *
      * @throws MovieDbException
      */
     @Test
-    public void testGetPersonPopular_int() throws Exception {
+    public void testGetPersonPopular_int() throws MovieDbException {
         LOG.info("getPersonPopular");
         int page = 0;
         TmdbResultsList<Person> result = tmdb.getPersonPopular(page);
         assertFalse("No popular people", result.getResults().isEmpty());
     }
 
-    /**
-     * Test of getGenreMovies method, of class TheMovieDbApi.
-     *
-     * @throws MovieDbException
-     */
-    @Ignore("Not required")
-    public void testGetGenreMovies_3args() throws Exception {
-    }
-
-    /**
-     * Test of getGenreMovies method, of class TheMovieDbApi.
-     *
-     * @throws MovieDbException
-     */
-    @Ignore("Not required")
-    public void testGetGenreMovies_4args() throws Exception {
-    }
-
     /**
      * Test of getMovieChangesList method, of class TheMovieDbApi.
      *
      * @throws MovieDbException
      */
     @Test
-    public void testGetMovieChangesList() throws Exception {
+    public void testGetMovieChangesList() throws MovieDbException {
         LOG.info("getMovieChangesList");
         int page = 0;
         String startDate = "";
@@ -917,7 +760,7 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Ignore("Not ready yet")
-    public void testGetPersonChangesList() throws Exception {
+    public void testGetPersonChangesList() throws MovieDbException {
         LOG.info("getPersonChangesList");
         int page = 0;
         String startDate = "";
@@ -933,28 +776,19 @@ public class TheMovieDbApiTest {
      * @throws MovieDbException
      */
     @Test
-    public void testGetJobs() throws Exception {
+    public void testGetJobs() throws MovieDbException {
         LOG.info("getJobs");
         TmdbResultsList<JobDepartment> result = tmdb.getJobs();
         assertFalse("No jobs found", result.getResults().isEmpty());
     }
 
-    /**
-     * Test of getDiscover method, of class TheMovieDbApi.
-     *
-     * @throws MovieDbException
-     */
-    @Ignore("Not required")
-    public void testGetDiscover_14args() throws Exception {
-    }
-
     /**
      * Test of getDiscover method, of class TheMovieDbApi.
      *
      * @throws MovieDbException
      */
     @Test
-    public void testGetDiscover_Discover() throws Exception {
+    public void testGetDiscover_Discover() throws MovieDbException {
         LOG.info("getDiscover");
         Discover discover = new Discover();
         discover.year(2013).language(LANGUAGE_ENGLISH);