Update gradle files and tests

advancedDownloader/build.gradle

@@ -1,8 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 27
- buildToolsVersion '27.0.3'
+ compileSdkVersion 28
 
  defaultConfig {
  applicationId "at.huber.youtubeDownloader"

build.gradle

@@ -6,7 +6,7 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.1.4'
+ classpath 'com.android.tools.build:gradle:3.3.2'
 
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Feb 14 13:40:41 CET 2018
+#Thu Mar 14 18:46:10 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.10.1-all.zip

sampleApp/build.gradle

@@ -1,8 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 27
- buildToolsVersion '27.0.3'
+ compileSdkVersion 28
 
  defaultConfig {
  applicationId "at.huber.sampleDownload"

youtubeExtractor/build.gradle

@@ -1,20 +1,23 @@
 apply plugin: 'com.android.library'
 
 android {
- compileSdkVersion 27
- buildToolsVersion '27.0.3'
+ compileSdkVersion 28
 
  defaultConfig {
  minSdkVersion 14
- targetSdkVersion 27
+ targetSdkVersion 28
  versionCode 1
  versionName "1.0"
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
  }
 }
 
 dependencies {
  implementation('com.github.evgenyneu:js-evaluator-for-android:v4.0.0') {
  exclude module: 'appcompat-v7'
  }
- implementation 'com.android.support:support-annotations:27.1.1'
+ implementation 'com.android.support:support-annotations:28.0.0'
+
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'com.android.support.test:rules:1.0.2'
 }

youtubeExtractor/src/androidTest/java/at/huber/youtubeExtractor/ExtractorCase.java → youtubeExtractor/src/androidTest/java/at/huber/youtubeExtractor/ExtractorTestCases.java

@@ -1,41 +1,59 @@
 package at.huber.youtubeExtractor;
 
+import android.os.Handler;
+import android.os.Looper;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.FlakyTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+import android.util.SparseArray;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import android.test.InstrumentationTestCase;
-import android.util.Log;
-import android.util.SparseArray;
+import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNotSame;
 
-public class ExtractorCase extends InstrumentationTestCase {
+@RunWith(AndroidJUnit4.class)
+@FlakyTest
+public class ExtractorTestCases {
 
  private static final String EXTRACTOR_TEST_TAG = "Extractor Test";
 
  private String testUrl;
 
+ @Test
  public void testUsualVideo() throws Throwable {
  VideoMeta expMeta = new VideoMeta("YE7VzlLtp-4", "Big Buck Bunny", "Blender",
  "UCSMOQeBJ2RAnuFungnQOxLg", 597, 0, false);
  extractorTest("http:https://youtube.com/watch?v=YE7VzlLtp-4", expMeta);
  extractorTestDashManifest("http:https://youtube.com/watch?v=YE7VzlLtp-4");
  }
 
+ @Test
  public void testUnembeddable() throws Throwable {
  VideoMeta expMeta = new VideoMeta("QH4VHl2uQ9o", "Match Chain Reaction Amazing Fire Art", "BLACKHAND",
  "UCl9nsRuGenStMDZfD95w85A", 331, 0, false);
  extractorTest("https://www.youtube.com/watch?v=QH4VHl2uQ9o", expMeta);
  extractorTestDashManifest("https://www.youtube.com/watch?v=QH4VHl2uQ9o");
  }
 
+ @Test
  public void testEncipheredVideo() throws Throwable {
- VideoMeta expMeta = new VideoMeta("e8X3ACToii0", "Rise Against - Savior", "RiseAgainstVEVO",
+ VideoMeta expMeta = new VideoMeta("e8X3ACToii0", "Rise Against - Savior (Official Video)", "RiseAgainstVEVO",
  "UChMKB2AHNpeuWhalpRYhUaw", 243, 0, false);
  extractorTest("https://www.youtube.com/watch?v=e8X3ACToii0", expMeta);
  }
 
+ @Test
  public void testAgeRestrictVideo() throws Throwable {
  VideoMeta expMeta = new VideoMeta("61Ev-YvBw2c", "Test video for age-restriction",
  "jpdemoA", "UC95NqtFsDZKlmzOJmZi_g6Q", 14, 0, false);
@@ -57,12 +75,11 @@ private void extractorTestDashManifest(final String youtubeLink)
 
  testUrl = null;
 
- runTestOnUiThread(new Runnable() {
+ new Handler(Looper.getMainLooper()).post(new Runnable() {
 
  @Override
  public void run() {
- final YouTubeExtractor ytEx = new YouTubeExtractor(getInstrumentation()
- .getTargetContext()) {
+ final YouTubeExtractor ytEx = new YouTubeExtractor(InstrumentationRegistry.getContext()) {
  @Override
  public void onExtractionComplete(SparseArray<YtFile> ytFiles, VideoMeta videoMeta) {
  assertNotNull(ytFiles);
@@ -106,7 +123,7 @@ private void extractorTest(final String youtubeLink, final VideoMeta expMeta)
 
  testUrl = null;
 
- runTestOnUiThread(new Runnable() {
+ new Handler(Looper.getMainLooper()).post(new Runnable() {
 
  @Override
  public void run() {

youtubeExtractor/src/androidTest/java/at/huber/youtubeExtractor/ExtractorTestSuite.java

@@ -0,0 +1,11 @@
+package at.huber.youtubeExtractor;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ExtractorTestCases.class})
+public class ExtractorTestSuite {}
+
+
+