From ffdeb4c1b8c4b2b7d39b9e2ce56e9e5171ecf052 Mon Sep 17 00:00:00 2001 From: Stuart Boston Date: Wed, 4 Mar 2015 15:44:08 +0000 Subject: [PATCH] Uncomment tests --- .../themoviedbapi/methods/TmdbKeywords.java | 4 +--- .../methods/TmdbAccountTest.java | 20 +++++++++---------- .../methods/TmdbChangesTest.java | 1 - .../methods/TmdbReviewsTest.java | 1 - .../themoviedbapi/methods/TmdbSearchTest.java | 18 ++++++++--------- .../themoviedbapi/methods/TmdbTVTest.java | 1 - 6 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java index 9012d386b..ba049dce4 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java @@ -90,9 +90,7 @@ public class TmdbKeywords extends AbstractMethod { URL url = new ApiUrl(apiKey, MethodBase.KEYWORD).subMethod(MethodSub.MOVIES).buildUrl(parameters); WrapperGenericList wrapper = processWrapper(getTypeReference(MovieBasic.class), url, "keyword movies"); - TmdbResultsList results = new TmdbResultsList(wrapper.getResults()); - results.copyWrapper(wrapper); - return results; + return wrapper.getTmdbResultsList(); } } diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java index a06efec46..7744a9870 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java @@ -78,7 +78,7 @@ public class TmdbAccountTest extends AbstractTests { * * @throws com.omertron.themoviedbapi.MovieDbException */ - //@Test + @Test public void testGetAccount() throws MovieDbException { LOG.info("getAccount"); Account result = instance.getAccount(getSessionId()); @@ -92,7 +92,7 @@ public class TmdbAccountTest extends AbstractTests { * * @throws com.omertron.themoviedbapi.MovieDbException */ - //@Test + @Test public void testGetUserLists() throws MovieDbException { LOG.info("getUserLists"); List results = instance.getUserLists(getSessionId(), getAccountId()); @@ -108,7 +108,7 @@ public class TmdbAccountTest extends AbstractTests { * * @throws com.omertron.themoviedbapi.MovieDbException */ - //@Test + @Test public void testGetFavoriteMovies() throws MovieDbException { LOG.info("getFavoriteMovies"); List results = instance.getFavoriteMovies(getSessionId(), getAccountId()); @@ -124,7 +124,7 @@ public class TmdbAccountTest extends AbstractTests { * * @throws com.omertron.themoviedbapi.MovieDbException */ - //@Test + @Test public void testGetFavoriteTv() throws MovieDbException { LOG.info("getFavoriteTv"); List results = instance.getFavoriteTv(getSessionId(), getAccountId()); @@ -140,7 +140,7 @@ public class TmdbAccountTest extends AbstractTests { * * @throws com.omertron.themoviedbapi.MovieDbException */ - //@Test + @Test public void testModifyFavoriteStatus() throws MovieDbException { LOG.info("modifyFavoriteStatus"); @@ -170,7 +170,7 @@ public class TmdbAccountTest extends AbstractTests { * * @throws com.omertron.themoviedbapi.MovieDbException */ - //@Test + @Test public void testGetRatedMovies() throws MovieDbException { LOG.info("getRatedMovies"); List results = instance.getRatedMovies(getSessionId(), getAccountId(), null, null, null); @@ -183,7 +183,7 @@ public class TmdbAccountTest extends AbstractTests { * * @throws com.omertron.themoviedbapi.MovieDbException */ - //@Test + @Test public void testGetRatedTV() throws MovieDbException { LOG.info("getRatedTV"); List results = instance.getRatedTV(getSessionId(), getAccountId(), null, null, null); @@ -199,7 +199,7 @@ public class TmdbAccountTest extends AbstractTests { * * @throws com.omertron.themoviedbapi.MovieDbException */ - //@Test + @Test public void testGetWatchListMovie() throws MovieDbException { LOG.info("getWatchListMovie"); List results = instance.getWatchListMovie(getSessionId(), getAccountId(), null, null, null); @@ -215,7 +215,7 @@ public class TmdbAccountTest extends AbstractTests { * * @throws com.omertron.themoviedbapi.MovieDbException */ - //@Test + @Test public void testGetWatchListTV() throws MovieDbException { LOG.info("getWatchListTV"); List results = instance.getWatchListTV(getSessionId(), getAccountId(), null, null, null); @@ -231,7 +231,7 @@ public class TmdbAccountTest extends AbstractTests { * * @throws com.omertron.themoviedbapi.MovieDbException */ - //@Test + @Test public void testModifyWatchList() throws MovieDbException { LOG.info("modifyWatchList"); diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java index 9d7199595..d7a9314a0 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java @@ -36,7 +36,6 @@ import org.junit.Test; */ public class TmdbChangesTest extends AbstractTests { - // API private static TmdbChanges instance; public TmdbChangesTest() { diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbReviewsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbReviewsTest.java index 00b507e21..30eb98cd3 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbReviewsTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbReviewsTest.java @@ -38,7 +38,6 @@ import org.junit.Test; */ public class TmdbReviewsTest extends AbstractTests { - // API private static TmdbReviews instance; public TmdbReviewsTest() { diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java index ecf54ac7e..27ac12cda 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java @@ -22,11 +22,11 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.enumeration.SearchType; -import com.omertron.themoviedbapi.model.media.MediaBasic; -import com.omertron.themoviedbapi.model.keyword.Keyword; import com.omertron.themoviedbapi.model.collection.Collection; import com.omertron.themoviedbapi.model.company.Company; +import com.omertron.themoviedbapi.model.keyword.Keyword; import com.omertron.themoviedbapi.model.list.UserList; +import com.omertron.themoviedbapi.model.media.MediaBasic; import com.omertron.themoviedbapi.model.movie.MovieDb; import com.omertron.themoviedbapi.model.person.PersonFind; import com.omertron.themoviedbapi.model.tv.TVBasic; @@ -75,7 +75,7 @@ public class TmdbSearchTest extends AbstractTests { * * @throws MovieDbException */ -// @Test + @Test public void testSearchCompanies() throws MovieDbException { LOG.info("searchCompanies"); TmdbResultsList result = instance.searchCompanies(COMPANY_NAME, 0); @@ -89,7 +89,7 @@ public class TmdbSearchTest extends AbstractTests { * * @throws MovieDbException */ -// @Test + @Test public void testSearchCollection() throws MovieDbException { LOG.info("searchCollection"); String query = "batman"; @@ -105,7 +105,7 @@ public class TmdbSearchTest extends AbstractTests { * * @throws MovieDbException */ -// @Test + @Test public void testSearchKeyword() throws MovieDbException { LOG.info("searchKeyword"); String query = "action"; @@ -121,7 +121,7 @@ public class TmdbSearchTest extends AbstractTests { * * @throws MovieDbException */ -// @Test + @Test public void testSearchList() throws MovieDbException { LOG.info("searchList"); String query = "watch"; @@ -137,7 +137,7 @@ public class TmdbSearchTest extends AbstractTests { * * @throws MovieDbException */ -// @Test + @Test public void testSearchMovie() throws MovieDbException { LOG.info("searchMovie"); @@ -177,7 +177,7 @@ public class TmdbSearchTest extends AbstractTests { * * @throws MovieDbException */ -// @Test + @Test public void testSearchPeople() throws MovieDbException { LOG.info("searchPeople"); String personName = "Bruce Willis"; @@ -192,7 +192,7 @@ public class TmdbSearchTest extends AbstractTests { * * @throws com.omertron.themoviedbapi.MovieDbException */ -// @Test + @Test public void testSearchTV() throws MovieDbException { System.out.println("searchTV"); String query = "The Walking Dead"; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java index 480a2fae0..5247d182c 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java @@ -32,7 +32,6 @@ import org.junit.BeforeClass; */ public class TmdbTVTest extends AbstractTests { - // API private static TmdbTV instance; // IDs private static final int ID_BIG_BANG_THEORY = 1418;