Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated unit tests

This commit is contained in:
daniel oeh 2013-08-28 19:41:00 +02:00
parent 307fda7ca9
commit fb1d348e28
3 changed files with 270 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/de/danoeh/antennapod/service/download/HttpDownloader.java
View File

@ -11,6 +11,7 @@ import java.net.SocketTimeoutException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.http.Header;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
@ -68,6 +69,11 @@ public class HttpDownloader extends Downloader {
HttpResponse response = httpClient.execute(httpGet); HttpResponse response = httpClient.execute(httpGet);
HttpEntity httpEntity = response.getEntity(); HttpEntity httpEntity = response.getEntity();
int responseCode = response.getStatusLine().getStatusCode(); int responseCode = response.getStatusLine().getStatusCode();
Header contentEncodingHeader = response.getFirstHeader("Content-Encoding");
final boolean isGzip = contentEncodingHeader != null &&
contentEncodingHeader.getValue().equalsIgnoreCase("gzip");
if (AppConfig.DEBUG) if (AppConfig.DEBUG)
Log.d(TAG, "Response code is " + responseCode); Log.d(TAG, "Response code is " + responseCode);
@ -129,7 +135,9 @@ public class HttpDownloader extends Downloader {
onCancelled(); onCancelled();
} else { } else {
out.flush(); out.flush();
if (request.getSize() != DownloadStatus.SIZE_UNKNOWN && // check if size specified in the response header is the same as the size of the
// written file. This check cannot be made if compression was used
if (!isGzip && request.getSize() != DownloadStatus.SIZE_UNKNOWN &&
request.getSoFar() != request.getSize()) { request.getSoFar() != request.getSize()) {
onFail(DownloadError.ERROR_IO_ERROR, onFail(DownloadError.ERROR_IO_ERROR,
"Download completed but size: " + "Download completed but size: " +

8
src/de/danoeh/antennapod/storage/DBTasks.java
View File

@ -441,7 +441,13 @@ public final class DBTasks {
} }
for (FeedItem item : delete) { for (FeedItem item : delete) {
DBWriter.deleteFeedMediaOfItem(context, item.getId()); try {
DBWriter.deleteFeedMediaOfItem(context, item.getId()).get();
} catch (InterruptedException e) {
e.printStackTrace();
} catch (ExecutionException e) {
e.printStackTrace();
}
} }
int counter = delete.size(); int counter = delete.size();

277
src/instrumentationTest/de/test/antennapod/storage/DBWriterTest.java
View File

@ -3,6 +3,7 @@ package instrumentationTest.de.test.antennapod.storage;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.test.InstrumentationTestCase; import android.test.InstrumentationTestCase;
import android.util.Log;
import de.danoeh.antennapod.feed.Feed; import de.danoeh.antennapod.feed.Feed;
import de.danoeh.antennapod.feed.FeedImage; import de.danoeh.antennapod.feed.FeedImage;
import de.danoeh.antennapod.feed.FeedItem; import de.danoeh.antennapod.feed.FeedItem;
@ -14,10 +15,10 @@ import de.danoeh.antennapod.storage.PodDBAdapter;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
@ -25,7 +26,9 @@ import java.util.concurrent.TimeoutException;
* Test class for DBWriter * Test class for DBWriter
*/ */
public class DBWriterTest extends InstrumentationTestCase { public class DBWriterTest extends InstrumentationTestCase {
private static final String TAG = "DBWriterTest";
private static final String TEST_FOLDER = "testDBWriter"; private static final String TEST_FOLDER = "testDBWriter";
private static final long TIMEOUT = 5L;
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
@ -85,7 +88,7 @@ public class DBWriterTest extends InstrumentationTestCase {
File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER); File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
assertNotNull(destFolder); assertNotNull(destFolder);
Feed feed = new Feed ("url", new Date(), "title"); Feed feed = new Feed("url", new Date(), "title");
feed.setItems(new ArrayList<FeedItem>()); feed.setItems(new ArrayList<FeedItem>());
// create Feed image // create Feed image
@ -121,7 +124,7 @@ public class DBWriterTest extends InstrumentationTestCase {
assertTrue(item.getMedia().getId() != 0); assertTrue(item.getMedia().getId() != 0);
} }
DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(5, TimeUnit.SECONDS); DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
// check if files still exist // check if files still exist
assertFalse(imgFile.exists()); assertFalse(imgFile.exists());
@ -151,7 +154,7 @@ public class DBWriterTest extends InstrumentationTestCase {
File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER); File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
assertNotNull(destFolder); assertNotNull(destFolder);
Feed feed = new Feed ("url", new Date(), "title"); Feed feed = new Feed("url", new Date(), "title");
feed.setItems(new ArrayList<FeedItem>()); feed.setItems(new ArrayList<FeedItem>());
feed.setImage(null); feed.setImage(null);
@ -181,7 +184,7 @@ public class DBWriterTest extends InstrumentationTestCase {
assertTrue(item.getMedia().getId() != 0); assertTrue(item.getMedia().getId() != 0);
} }
DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(5, TimeUnit.SECONDS); DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
// check if files still exist // check if files still exist
for (File f : itemFiles) { for (File f : itemFiles) {
@ -207,7 +210,7 @@ public class DBWriterTest extends InstrumentationTestCase {
File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER); File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
assertNotNull(destFolder); assertNotNull(destFolder);
Feed feed = new Feed ("url", new Date(), "title"); Feed feed = new Feed("url", new Date(), "title");
feed.setItems(null); feed.setItems(null);
// create Feed image // create Feed image
@ -225,7 +228,7 @@ public class DBWriterTest extends InstrumentationTestCase {
assertTrue(feed.getId() != 0); assertTrue(feed.getId() != 0);
assertTrue(feed.getImage().getId() != 0); assertTrue(feed.getImage().getId() != 0);
DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(5, TimeUnit.SECONDS); DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
// check if files still exist // check if files still exist
assertFalse(imgFile.exists()); assertFalse(imgFile.exists());
@ -244,7 +247,7 @@ public class DBWriterTest extends InstrumentationTestCase {
File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER); File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
assertNotNull(destFolder); assertNotNull(destFolder);
Feed feed = new Feed ("url", new Date(), "title"); Feed feed = new Feed("url", new Date(), "title");
feed.setItems(new ArrayList<FeedItem>()); feed.setItems(new ArrayList<FeedItem>());
// create Feed image // create Feed image
@ -272,7 +275,7 @@ public class DBWriterTest extends InstrumentationTestCase {
assertTrue(item.getId() != 0); assertTrue(item.getId() != 0);
} }
DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(5, TimeUnit.SECONDS); DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
// check if files still exist // check if files still exist
assertFalse(imgFile.exists()); assertFalse(imgFile.exists());
@ -296,7 +299,7 @@ public class DBWriterTest extends InstrumentationTestCase {
File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER); File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
assertNotNull(destFolder); assertNotNull(destFolder);
Feed feed = new Feed ("url", new Date(), "title"); Feed feed = new Feed("url", new Date(), "title");
feed.setItems(new ArrayList<FeedItem>()); feed.setItems(new ArrayList<FeedItem>());
// create Feed image // create Feed image
@ -341,7 +344,7 @@ public class DBWriterTest extends InstrumentationTestCase {
queueCursor.close(); queueCursor.close();
adapter.close(); adapter.close();
DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(5, TimeUnit.SECONDS); DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
adapter.open(); adapter.open();
Cursor c = adapter.getFeedCursor(feed.getId()); Cursor c = adapter.getFeedCursor(feed.getId());
@ -368,7 +371,7 @@ public class DBWriterTest extends InstrumentationTestCase {
File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER); File destFolder = getInstrumentation().getTargetContext().getExternalFilesDir(TEST_FOLDER);
assertNotNull(destFolder); assertNotNull(destFolder);
Feed feed = new Feed ("url", new Date(), "title"); Feed feed = new Feed("url", new Date(), "title");
feed.setItems(new ArrayList<FeedItem>()); feed.setItems(new ArrayList<FeedItem>());
// create Feed image // create Feed image
@ -402,7 +405,7 @@ public class DBWriterTest extends InstrumentationTestCase {
assertTrue(item.getMedia().getId() != 0); assertTrue(item.getMedia().getId() != 0);
} }
DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(5, TimeUnit.SECONDS); DBWriter.deleteFeed(getInstrumentation().getTargetContext(), feed.getId()).get(TIMEOUT, TimeUnit.SECONDS);
adapter = new PodDBAdapter(getInstrumentation().getContext()); adapter = new PodDBAdapter(getInstrumentation().getContext());
adapter.open(); adapter.open();
@ -422,13 +425,30 @@ public class DBWriterTest extends InstrumentationTestCase {
} }
} }
public void testAddItemToPlaybackHistoryNotPlayedYet() throws ExecutionException, InterruptedException { private FeedMedia playbackHistorySetup(Date playbackCompletionDate) {
FeedMedia media = new FeedMedia(0, null, 10, 0, 1, "mime", null, "url", false, null); final Context context = getInstrumentation().getTargetContext();
DBWriter.addItemToPlaybackHistory(getInstrumentation().getTargetContext(), media).get(); Feed feed = new Feed("url", new Date(), "title");
assertTrue(media.getId() != 0); feed.setItems(new ArrayList<FeedItem>());
PodDBAdapter adapter = new PodDBAdapter(getInstrumentation().getTargetContext()); FeedItem item = new FeedItem(0, "title", "id", "link", new Date(), true, feed);
FeedMedia media = new FeedMedia(0, item, 10, 0, 1, "mime", null, "url", false, playbackCompletionDate);
feed.getItems().add(item);
item.setMedia(media);
PodDBAdapter adapter = new PodDBAdapter(context);
adapter.open(); adapter.open();
media = DBReader.getFeedMedia(getInstrumentation().getTargetContext(), media.getId()); adapter.setCompleteFeed(feed);
adapter.close();
assertTrue(media.getId() != 0);
return media;
}
public void testAddItemToPlaybackHistoryNotPlayedYet() throws ExecutionException, InterruptedException {
final Context context = getInstrumentation().getTargetContext();
FeedMedia media = playbackHistorySetup(null);
DBWriter.addItemToPlaybackHistory(context, media).get();
PodDBAdapter adapter = new PodDBAdapter(context);
adapter.open();
media = DBReader.getFeedMedia(context, media.getId());
adapter.close(); adapter.close();
assertNotNull(media); assertNotNull(media);
@ -437,12 +457,13 @@ public class DBWriterTest extends InstrumentationTestCase {
public void testAddItemToPlaybackHistoryAlreadyPlayed() throws ExecutionException, InterruptedException { public void testAddItemToPlaybackHistoryAlreadyPlayed() throws ExecutionException, InterruptedException {
final long OLD_DATE = 0; final long OLD_DATE = 0;
FeedMedia media = new FeedMedia(0, null, 10, 0, 1, "mime", null, "url", false, new Date(OLD_DATE)); final Context context = getInstrumentation().getTargetContext();
FeedMedia media = playbackHistorySetup(new Date(OLD_DATE));
DBWriter.addItemToPlaybackHistory(getInstrumentation().getTargetContext(), media).get(); DBWriter.addItemToPlaybackHistory(getInstrumentation().getTargetContext(), media).get();
assertTrue(media.getId() != 0); PodDBAdapter adapter = new PodDBAdapter(context);
PodDBAdapter adapter = new PodDBAdapter(getInstrumentation().getTargetContext());
adapter.open(); adapter.open();
media = DBReader.getFeedMedia(getInstrumentation().getTargetContext(), media.getId()); media = DBReader.getFeedMedia(context, media.getId());
adapter.close(); adapter.close();
assertNotNull(media); assertNotNull(media);
@ -450,4 +471,214 @@ public class DBWriterTest extends InstrumentationTestCase {
assertFalse(OLD_DATE == media.getPlaybackCompletionDate().getTime()); assertFalse(OLD_DATE == media.getPlaybackCompletionDate().getTime());
} }
private Feed queueTestSetupMultipleItems(final int NUM_ITEMS) throws InterruptedException, ExecutionException, TimeoutException {
final Context context = getInstrumentation().getTargetContext();
Feed feed = new Feed("url", new Date(), "title");
feed.setItems(new ArrayList<FeedItem>());
for (int i = 0; i < NUM_ITEMS; i++) {
FeedItem item = new FeedItem(0, "title " + i, "id " + i, "link " + i, new Date(), true, feed);
feed.getItems().add(item);
}
PodDBAdapter adapter = new PodDBAdapter(context);
adapter.open();
adapter.setCompleteFeed(feed);
adapter.close();
for (FeedItem item : feed.getItems()) {
assertTrue(item.getId() != 0);
}
List<Future<?>> futures = new ArrayList<Future<?>>();
for (FeedItem item : feed.getItems()) {
futures.add(DBWriter.addQueueItem(context, item.getId()));
}
for (Future<?> f : futures) {
f.get(TIMEOUT, TimeUnit.SECONDS);
}
return feed;
}
public void testAddQueueItemSingleItem() throws InterruptedException, ExecutionException, TimeoutException {
final Context context = getInstrumentation().getTargetContext();
Feed feed = new Feed("url", new Date(), "title");
feed.setItems(new ArrayList<FeedItem>());
FeedItem item = new FeedItem(0, "title", "id", "link", new Date(), true, feed);
feed.getItems().add(item);
PodDBAdapter adapter = new PodDBAdapter(context);
adapter.open();
adapter.setCompleteFeed(feed);
adapter.close();
assertTrue(item.getId() != 0);
DBWriter.addQueueItem(context, item.getId()).get(TIMEOUT, TimeUnit.SECONDS);
adapter = new PodDBAdapter(context);
adapter.open();
Cursor cursor = adapter.getQueueIDCursor();
assertTrue(cursor.moveToFirst());
assertTrue(cursor.getLong(0) == item.getId());
cursor.close();
adapter.close();
}
public void testAddQueueItemSingleItemAlreadyInQueue() throws InterruptedException, ExecutionException, TimeoutException {
final Context context = getInstrumentation().getTargetContext();
Feed feed = new Feed("url", new Date(), "title");
feed.setItems(new ArrayList<FeedItem>());
FeedItem item = new FeedItem(0, "title", "id", "link", new Date(), true, feed);
feed.getItems().add(item);
PodDBAdapter adapter = new PodDBAdapter(context);
adapter.open();
adapter.setCompleteFeed(feed);
adapter.close();
assertTrue(item.getId() != 0);
DBWriter.addQueueItem(context, item.getId()).get(TIMEOUT, TimeUnit.SECONDS);
adapter = new PodDBAdapter(context);
adapter.open();
Cursor cursor = adapter.getQueueIDCursor();
assertTrue(cursor.moveToFirst());
assertTrue(cursor.getLong(0) == item.getId());
cursor.close();
adapter.close();
DBWriter.addQueueItem(context, item.getId()).get(TIMEOUT, TimeUnit.SECONDS);
adapter = new PodDBAdapter(context);
adapter.open();
cursor = adapter.getQueueIDCursor();
assertTrue(cursor.moveToFirst());
assertTrue(cursor.getLong(0) == item.getId());
assertTrue(cursor.getCount() == 1);
cursor.close();
adapter.close();
}
public void testAddQueueItemMultipleItems() throws InterruptedException, ExecutionException, TimeoutException {
final Context context = getInstrumentation().getTargetContext();
final int NUM_ITEMS = 10;
Feed feed = queueTestSetupMultipleItems(NUM_ITEMS);
PodDBAdapter adapter = new PodDBAdapter(context);
adapter.open();
Cursor cursor = adapter.getQueueIDCursor();
assertTrue(cursor.moveToFirst());
assertTrue(cursor.getCount() == NUM_ITEMS);
for (int i = 0; i < NUM_ITEMS; i++) {
assertTrue(cursor.moveToPosition(i));
assertTrue(cursor.getLong(0) == feed.getItems().get(i).getId());
}
cursor.close();
adapter.close();
}
public void testClearQueue() throws InterruptedException, ExecutionException, TimeoutException {
final Context context = getInstrumentation().getTargetContext();
final int NUM_ITEMS = 10;
Feed feed = queueTestSetupMultipleItems(NUM_ITEMS);
DBWriter.clearQueue(context).get(TIMEOUT, TimeUnit.SECONDS);
PodDBAdapter adapter = new PodDBAdapter(context);
adapter.open();
Cursor cursor = adapter.getQueueIDCursor();
assertFalse(cursor.moveToFirst());
cursor.close();
adapter.close();
}
public void testRemoveQueueItem() throws InterruptedException, ExecutionException, TimeoutException {
final int NUM_ITEMS = 10;
final Context context = getInstrumentation().getTargetContext();
Feed feed = new Feed("url", new Date(), "title");
feed.setItems(new ArrayList<FeedItem>());
for (int i = 0; i < NUM_ITEMS; i++) {
FeedItem item = new FeedItem(0, "title " + i, "id " + i, "link " + i, new Date(), true, feed);
feed.getItems().add(item);
}
PodDBAdapter adapter = new PodDBAdapter(context);
adapter.open();
adapter.setCompleteFeed(feed);
adapter.close();
for (FeedItem item : feed.getItems()) {
assertTrue(item.getId() != 0);
}
for (int removeIndex = 0; removeIndex < NUM_ITEMS; removeIndex++) {
final long id = feed.getItems().get(removeIndex).getId();
adapter = new PodDBAdapter(context);
adapter.open();
adapter.setQueue(feed.getItems());
adapter.close();
DBWriter.removeQueueItem(context, id, false).get(TIMEOUT, TimeUnit.SECONDS);
adapter = new PodDBAdapter(context);
adapter.open();
Cursor queue = adapter.getQueueIDCursor();
assertTrue(queue.getCount() == NUM_ITEMS - 1);
for (int i = 0; i < queue.getCount(); i++) {
assertTrue(queue.moveToPosition(i));
final long queueID = queue.getLong(0);
assertTrue(queueID != id); // removed item is no longer in queue
boolean idFound = false;
for (FeedItem item : feed.getItems()) { // items that were not removed are still in the queue
idFound = idFound | (item.getId() == queueID);
}
assertTrue(idFound);
}
queue.close();
adapter.close();
}
}
public void testMoveQueueItem() throws InterruptedException, ExecutionException, TimeoutException {
final int NUM_ITEMS = 10;
final Context context = getInstrumentation().getTargetContext();
Feed feed = new Feed("url", new Date(), "title");
feed.setItems(new ArrayList<FeedItem>());
for (int i = 0; i < NUM_ITEMS; i++) {
FeedItem item = new FeedItem(0, "title " + i, "id " + i, "link " + i, new Date(), true, feed);
feed.getItems().add(item);
}
PodDBAdapter adapter = new PodDBAdapter(context);
adapter.open();
adapter.setCompleteFeed(feed);
adapter.close();
for (FeedItem item : feed.getItems()) {
assertTrue(item.getId() != 0);
}
for (int from = 0; from < NUM_ITEMS; from++) {
for (int to = 0; to < NUM_ITEMS; to++) {
if (from == to) {
continue;
}
Log.d(TAG, String.format("testMoveQueueItem: From=%d, To=%d", from, to));
final long fromID = feed.getItems().get(from).getId();
adapter = new PodDBAdapter(context);
adapter.open();
adapter.setQueue(feed.getItems());
adapter.close();
DBWriter.moveQueueItem(context, from, to, false).get(TIMEOUT, TimeUnit.SECONDS);
adapter = new PodDBAdapter(context);
adapter.open();
Cursor queue = adapter.getQueueIDCursor();
assertTrue(queue.getCount() == NUM_ITEMS);
assertTrue(queue.moveToPosition(from));
assertFalse(queue.getLong(0) == fromID);
assertTrue(queue.moveToPosition(to));
assertTrue(queue.getLong(0) == fromID);
queue.close();
adapter.close();
}
}
}
} }