aboutsummaryrefslogtreecommitdiff
path: root/app/src/androidTest/java/github/daneren2005
diff options
context:
space:
mode:
authorKoen <koen@koenvh.nl>2018-12-07 16:17:32 +0100
committerGitHub <noreply@github.com>2018-12-07 16:17:32 +0100
commit968b1d6972b137b4c1f1bdaf028db4bf54509579 (patch)
treeddae83de1ad54ac2d6650d399c01ebec7fb71258 /app/src/androidTest/java/github/daneren2005
parentf104d619d6164d308f3195bd7f8dd0b01c832ef9 (diff)
parent898b2a955dfbad411187c7311cc09286cf53b554 (diff)
downloaddsub-968b1d6972b137b4c1f1bdaf028db4bf54509579.tar.gz
dsub-968b1d6972b137b4c1f1bdaf028db4bf54509579.tar.bz2
dsub-968b1d6972b137b4c1f1bdaf028db4bf54509579.zip
Merge pull request #4 from daneren2005/edge
5.4.4
Diffstat (limited to 'app/src/androidTest/java/github/daneren2005')
-rw-r--r--app/src/androidTest/java/github/daneren2005/dsub/domain/GenreComparatorTest.java8
-rw-r--r--app/src/androidTest/java/github/daneren2005/dsub/service/DownloadServiceTest.java15
2 files changed, 19 insertions, 4 deletions
diff --git a/app/src/androidTest/java/github/daneren2005/dsub/domain/GenreComparatorTest.java b/app/src/androidTest/java/github/daneren2005/dsub/domain/GenreComparatorTest.java
index 9ffa518e..16d189fa 100644
--- a/app/src/androidTest/java/github/daneren2005/dsub/domain/GenreComparatorTest.java
+++ b/app/src/androidTest/java/github/daneren2005/dsub/domain/GenreComparatorTest.java
@@ -16,7 +16,7 @@ public class GenreComparatorTest extends TestCase {
Genre g2 = new Genre();
- List<Genre> genres = new ArrayList<Genre>();
+ List<Genre> genres = new ArrayList<>();
genres.add(g1);
genres.add(g2);
@@ -34,7 +34,7 @@ public class GenreComparatorTest extends TestCase {
Genre g2 = new Genre();
g2.setName("genre");
- List<Genre> genres = new ArrayList<Genre>();
+ List<Genre> genres = new ArrayList<>();
genres.add(g1);
genres.add(g2);
@@ -53,9 +53,9 @@ public class GenreComparatorTest extends TestCase {
g2.setName("Pop");
Genre g3 = new Genre();
- g2.setName("Rap");
+ g3.setName("Rap");
- List<Genre> genres = new ArrayList<Genre>();
+ List<Genre> genres = new ArrayList<>();
genres.add(g1);
genres.add(g2);
genres.add(g3);
diff --git a/app/src/androidTest/java/github/daneren2005/dsub/service/DownloadServiceTest.java b/app/src/androidTest/java/github/daneren2005/dsub/service/DownloadServiceTest.java
index 44b77b84..2e10b977 100644
--- a/app/src/androidTest/java/github/daneren2005/dsub/service/DownloadServiceTest.java
+++ b/app/src/androidTest/java/github/daneren2005/dsub/service/DownloadServiceTest.java
@@ -49,6 +49,20 @@ public class DownloadServiceTest extends
assertEquals(0, position);
}
+ public void testGetRecentDownloadsWithoutPlaylist() {
+ int output_length = downloadService.getRecentDownloads().size();
+ assertEquals(0, output_length);
+ }
+
+ public void testGetRecentDownloadsWithPlaylist() {
+ downloadService.getDownloads().clear();
+ downloadService.download(this.createMusicSongs(2), false, false, false,
+ false, 0, 0);
+
+ int output_length = downloadService.getRecentDownloads().size();
+ assertEquals(1, output_length);
+ }
+
public void testGetCurrentPlayingIndexWithoutPlayList() {
int currentPlayingIndex = activity.getDownloadService()
.getCurrentPlayingIndex();
@@ -118,6 +132,7 @@ public class DownloadServiceTest extends
// Do a next before the previous
downloadService.next();
+ downloadService.setPlayerState(STARTED);
// Do the previous
downloadService.previous();