Put tests where they belong + bump bintray-release version.

Issue: #651
2026-03-25 09:25:53 +00:00 · 2015-07-27 16:32:55 +01:00 · 2015-07-27 16:32:55 +01:00 · 48826836d1
commit 48826836d1
parent 08dc691ff7
50 changed files with 3 additions and 9 deletions
--- a/build.gradle
+++ b/build.gradle
@ -21,7 +21,7 @@ buildscript {
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:1.2.3'
-        classpath 'com.novoda:bintray-release:0.2.7'
+        classpath 'com.novoda:bintray-release:0.3.2'
    }
 }

--- a/library/build.gradle
+++ b/library/build.gradle
@ -38,13 +38,6 @@ android {
    lintOptions {
        abortOnError false
    }
-
-    sourceSets {
-        androidTest {
-            assets.srcDirs = ['src/test/assets']
-            java.srcDirs = ['src/test/java']
-        }
-    }
 }

 dependencies {
--- a/library/src/androidTest/.classpath
+++ b/library/src/androidTest/.classpath
--- a/library/src/androidTest/.project
+++ b/library/src/androidTest/.project
--- a/library/src/androidTest/.settings/org.eclipse.jdt.core.prefs
+++ b/library/src/androidTest/.settings/org.eclipse.jdt.core.prefs
--- a/library/src/androidTest/AndroidManifest.xml
+++ b/library/src/androidTest/AndroidManifest.xml
@ -28,6 +28,7 @@

  <instrumentation
      android:targetPackage="com.google.android.exoplayer.tests"
-      android:name="android.test.InstrumentationTestRunner"/>
+      android:name="android.test.InstrumentationTestRunner"
+      tools:replace="android:targetPackage"/>

 </manifest>
--- a/library/src/androidTest/assets/dash/sample_mpd_1
+++ b/library/src/androidTest/assets/dash/sample_mpd_1
--- a/library/src/androidTest/assets/subrip/empty
+++ b/library/src/androidTest/assets/subrip/empty
--- a/library/src/androidTest/assets/subrip/typical
+++ b/library/src/androidTest/assets/subrip/typical
--- a/library/src/androidTest/assets/webm/vorbis_codec_private
+++ b/library/src/androidTest/assets/webm/vorbis_codec_private
--- a/library/src/androidTest/assets/webvtt/empty
+++ b/library/src/androidTest/assets/webvtt/empty
--- a/library/src/androidTest/assets/webvtt/live_typical
+++ b/library/src/androidTest/assets/webvtt/live_typical
--- a/library/src/androidTest/assets/webvtt/typical
+++ b/library/src/androidTest/assets/webvtt/typical
--- a/library/src/androidTest/assets/webvtt/typical_with_identifiers
+++ b/library/src/androidTest/assets/webvtt/typical_with_identifiers
--- a/library/src/androidTest/assets/webvtt/typical_with_tags
+++ b/library/src/androidTest/assets/webvtt/typical_with_tags
--- a/library/src/androidTest/java/com/google/android/exoplayer/CTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/CTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/MediaFormatTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/MediaFormatTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/TimeRangeTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/TimeRangeTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/dash/DashChunkSourceTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/dash/DashChunkSourceTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParserTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParserTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/RangedUriTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/RangedUriTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/RepresentationTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/RepresentationTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/UrlTemplateTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/UrlTemplateTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/extractor/DefaultExtractorInputTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/extractor/DefaultExtractorInputTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/extractor/ExtractorTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/extractor/ExtractorTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/extractor/mp3/BufferingInputTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/extractor/mp3/BufferingInputTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/extractor/mp4/Mp4ExtractorTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/extractor/mp4/Mp4ExtractorTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/DefaultEbmlReaderTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/DefaultEbmlReaderTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/StreamBuilder.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/StreamBuilder.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/VarintReaderTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/VarintReaderTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/WebmExtractorTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/WebmExtractorTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/hls/HlsMasterPlaylistParserTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/hls/HlsMasterPlaylistParserTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/hls/HlsMediaPlaylistParserTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/hls/HlsMediaPlaylistParserTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/metadata/Id3ParserTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/metadata/Id3ParserTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeDataSource.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeDataSource.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/testutil/TestUtil.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/testutil/TestUtil.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/text/subrip/SubripParserTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/text/subrip/SubripParserTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/text/webvtt/WebvttParserTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/text/webvtt/WebvttParserTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/text/webvtt/WebvttSubtitleTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/text/webvtt/WebvttSubtitleTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/upstream/ByteArrayDataSourceTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/upstream/ByteArrayDataSourceTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/util/FakeClock.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/util/FakeClock.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/util/NalUnitUtilTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/util/NalUnitUtilTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/util/ParsableByteArrayTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/util/ParsableByteArrayTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/util/UriUtilTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/util/UriUtilTest.java
--- a/library/src/androidTest/java/com/google/android/exoplayer/util/UtilTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/util/UtilTest.java
--- a/library/src/androidTest/libs/.README.txt
+++ b/library/src/androidTest/libs/.README.txt
--- a/library/src/androidTest/project.properties
+++ b/library/src/androidTest/project.properties
--- a/library/src/androidTest/res/.README.txt
+++ b/library/src/androidTest/res/.README.txt