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

Issue: google#651
b95505017 · Jul 27, 2015 · 4882683 · 4882683
1 parent 08dc691
commit 4882683
Show file tree

Hide file tree

Showing 50 changed files with 3 additions and 9 deletions.
diff --git 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'
     }
 }
 

diff --git 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 {

diff --git a/library/src/test/.classpath → library/src/androidTest/.classpath b/library/src/test/.classpath → library/src/androidTest/.classpath
diff --git a/library/src/test/.project → library/src/androidTest/.project b/library/src/test/.project → library/src/androidTest/.project
diff --git a/...test/.settings/org.eclipse.jdt.core.prefs → ...Test/.settings/org.eclipse.jdt.core.prefs b/...test/.settings/org.eclipse.jdt.core.prefs → ...Test/.settings/org.eclipse.jdt.core.prefs
diff --git a/library/src/test/AndroidManifest.xml → library/src/androidTest/AndroidManifest.xml b/library/src/test/AndroidManifest.xml → 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>
diff --git a/library/src/test/assets/dash/sample_mpd_1 → .../src/androidTest/assets/dash/sample_mpd_1 b/library/src/test/assets/dash/sample_mpd_1 → .../src/androidTest/assets/dash/sample_mpd_1
diff --git a/library/src/test/assets/subrip/empty → library/src/androidTest/assets/subrip/empty b/library/src/test/assets/subrip/empty → library/src/androidTest/assets/subrip/empty
diff --git a/library/src/test/assets/subrip/typical → ...ary/src/androidTest/assets/subrip/typical b/library/src/test/assets/subrip/typical → ...ary/src/androidTest/assets/subrip/typical
diff --git a/...src/test/assets/webm/vorbis_codec_private → ...roidTest/assets/webm/vorbis_codec_private b/...src/test/assets/webm/vorbis_codec_private → ...roidTest/assets/webm/vorbis_codec_private
diff --git a/library/src/test/assets/webvtt/empty → library/src/androidTest/assets/webvtt/empty b/library/src/test/assets/webvtt/empty → library/src/androidTest/assets/webvtt/empty
diff --git a/library/src/test/assets/webvtt/live_typical → ...rc/androidTest/assets/webvtt/live_typical b/library/src/test/assets/webvtt/live_typical → ...rc/androidTest/assets/webvtt/live_typical
diff --git a/library/src/test/assets/webvtt/typical → ...ary/src/androidTest/assets/webvtt/typical b/library/src/test/assets/webvtt/typical → ...ary/src/androidTest/assets/webvtt/typical
diff --git a/...st/assets/webvtt/typical_with_identifiers → ...st/assets/webvtt/typical_with_identifiers b/...st/assets/webvtt/typical_with_identifiers → ...st/assets/webvtt/typical_with_identifiers
diff --git a/.../src/test/assets/webvtt/typical_with_tags → ...droidTest/assets/webvtt/typical_with_tags b/.../src/test/assets/webvtt/typical_with_tags → ...droidTest/assets/webvtt/typical_with_tags
diff --git a/...a/com/google/android/exoplayer/CTest.java → ...a/com/google/android/exoplayer/CTest.java b/...a/com/google/android/exoplayer/CTest.java → ...a/com/google/android/exoplayer/CTest.java
diff --git a/...le/android/exoplayer/MediaFormatTest.java → ...le/android/exoplayer/MediaFormatTest.java b/...le/android/exoplayer/MediaFormatTest.java → ...le/android/exoplayer/MediaFormatTest.java
diff --git a/...ogle/android/exoplayer/TimeRangeTest.java → ...ogle/android/exoplayer/TimeRangeTest.java b/...ogle/android/exoplayer/TimeRangeTest.java → ...ogle/android/exoplayer/TimeRangeTest.java
diff --git a/...d/exoplayer/dash/DashChunkSourceTest.java → ...d/exoplayer/dash/DashChunkSourceTest.java b/...d/exoplayer/dash/DashChunkSourceTest.java → ...d/exoplayer/dash/DashChunkSourceTest.java
diff --git a/...diaPresentationDescriptionParserTest.java → ...diaPresentationDescriptionParserTest.java b/...diaPresentationDescriptionParserTest.java → ...diaPresentationDescriptionParserTest.java
diff --git a/...oid/exoplayer/dash/mpd/RangedUriTest.java → ...oid/exoplayer/dash/mpd/RangedUriTest.java b/...oid/exoplayer/dash/mpd/RangedUriTest.java → ...oid/exoplayer/dash/mpd/RangedUriTest.java
diff --git a/...xoplayer/dash/mpd/RepresentationTest.java → ...xoplayer/dash/mpd/RepresentationTest.java b/...xoplayer/dash/mpd/RepresentationTest.java → ...xoplayer/dash/mpd/RepresentationTest.java
diff --git a/...d/exoplayer/dash/mpd/UrlTemplateTest.java → ...d/exoplayer/dash/mpd/UrlTemplateTest.java b/...d/exoplayer/dash/mpd/UrlTemplateTest.java → ...d/exoplayer/dash/mpd/UrlTemplateTest.java
diff --git a/.../extractor/DefaultExtractorInputTest.java → .../extractor/DefaultExtractorInputTest.java b/.../extractor/DefaultExtractorInputTest.java → .../extractor/DefaultExtractorInputTest.java
diff --git a/...id/exoplayer/extractor/ExtractorTest.java → ...id/exoplayer/extractor/ExtractorTest.java b/...id/exoplayer/extractor/ExtractorTest.java → ...id/exoplayer/extractor/ExtractorTest.java
diff --git a/...yer/extractor/mp3/BufferingInputTest.java → ...yer/extractor/mp3/BufferingInputTest.java b/...yer/extractor/mp3/BufferingInputTest.java → ...yer/extractor/mp3/BufferingInputTest.java
diff --git a/...layer/extractor/mp4/Mp4ExtractorTest.java → ...layer/extractor/mp4/Mp4ExtractorTest.java b/...layer/extractor/mp4/Mp4ExtractorTest.java → ...layer/extractor/mp4/Mp4ExtractorTest.java
diff --git a/...extractor/webm/DefaultEbmlReaderTest.java → ...extractor/webm/DefaultEbmlReaderTest.java b/...extractor/webm/DefaultEbmlReaderTest.java → ...extractor/webm/DefaultEbmlReaderTest.java
diff --git a/...oplayer/extractor/webm/StreamBuilder.java → ...oplayer/extractor/webm/StreamBuilder.java b/...oplayer/extractor/webm/StreamBuilder.java → ...oplayer/extractor/webm/StreamBuilder.java
diff --git a/...ayer/extractor/webm/VarintReaderTest.java → ...ayer/extractor/webm/VarintReaderTest.java b/...ayer/extractor/webm/VarintReaderTest.java → ...ayer/extractor/webm/VarintReaderTest.java
diff --git a/...yer/extractor/webm/WebmExtractorTest.java → ...yer/extractor/webm/WebmExtractorTest.java b/...yer/extractor/webm/WebmExtractorTest.java → ...yer/extractor/webm/WebmExtractorTest.java
diff --git a/...ayer/hls/HlsMasterPlaylistParserTest.java → ...ayer/hls/HlsMasterPlaylistParserTest.java b/...ayer/hls/HlsMasterPlaylistParserTest.java → ...ayer/hls/HlsMasterPlaylistParserTest.java
diff --git a/...layer/hls/HlsMediaPlaylistParserTest.java → ...layer/hls/HlsMediaPlaylistParserTest.java b/...layer/hls/HlsMediaPlaylistParserTest.java → ...layer/hls/HlsMediaPlaylistParserTest.java
diff --git a/...oid/exoplayer/metadata/Id3ParserTest.java → ...oid/exoplayer/metadata/Id3ParserTest.java b/...oid/exoplayer/metadata/Id3ParserTest.java → ...oid/exoplayer/metadata/Id3ParserTest.java
diff --git a/...id/exoplayer/testutil/FakeDataSource.java → ...id/exoplayer/testutil/FakeDataSource.java b/...id/exoplayer/testutil/FakeDataSource.java → ...id/exoplayer/testutil/FakeDataSource.java
diff --git a/...oplayer/testutil/FakeExtractorOutput.java → ...oplayer/testutil/FakeExtractorOutput.java b/...oplayer/testutil/FakeExtractorOutput.java → ...oplayer/testutil/FakeExtractorOutput.java
diff --git a/...d/exoplayer/testutil/FakeTrackOutput.java → ...d/exoplayer/testutil/FakeTrackOutput.java b/...d/exoplayer/testutil/FakeTrackOutput.java → ...d/exoplayer/testutil/FakeTrackOutput.java
diff --git a/.../android/exoplayer/testutil/TestUtil.java → .../android/exoplayer/testutil/TestUtil.java b/.../android/exoplayer/testutil/TestUtil.java → .../android/exoplayer/testutil/TestUtil.java
diff --git a/...oplayer/text/subrip/SubripParserTest.java → ...oplayer/text/subrip/SubripParserTest.java b/...oplayer/text/subrip/SubripParserTest.java → ...oplayer/text/subrip/SubripParserTest.java
diff --git a/...oplayer/text/webvtt/WebvttParserTest.java → ...oplayer/text/webvtt/WebvttParserTest.java b/...oplayer/text/webvtt/WebvttParserTest.java → ...oplayer/text/webvtt/WebvttParserTest.java
diff --git a/...layer/text/webvtt/WebvttSubtitleTest.java → ...layer/text/webvtt/WebvttSubtitleTest.java b/...layer/text/webvtt/WebvttSubtitleTest.java → ...layer/text/webvtt/WebvttSubtitleTest.java
diff --git a/...yer/upstream/ByteArrayDataSourceTest.java → ...yer/upstream/ByteArrayDataSourceTest.java b/...yer/upstream/ByteArrayDataSourceTest.java → ...yer/upstream/ByteArrayDataSourceTest.java
diff --git a/...gle/android/exoplayer/util/FakeClock.java → ...gle/android/exoplayer/util/FakeClock.java b/...gle/android/exoplayer/util/FakeClock.java → ...gle/android/exoplayer/util/FakeClock.java
diff --git a/...droid/exoplayer/util/NalUnitUtilTest.java → ...droid/exoplayer/util/NalUnitUtilTest.java b/...droid/exoplayer/util/NalUnitUtilTest.java → ...droid/exoplayer/util/NalUnitUtilTest.java
diff --git a/...exoplayer/util/ParsableByteArrayTest.java → ...exoplayer/util/ParsableByteArrayTest.java b/...exoplayer/util/ParsableByteArrayTest.java → ...exoplayer/util/ParsableByteArrayTest.java
diff --git a/...e/android/exoplayer/util/UriUtilTest.java → ...e/android/exoplayer/util/UriUtilTest.java b/...e/android/exoplayer/util/UriUtilTest.java → ...e/android/exoplayer/util/UriUtilTest.java
diff --git a/...ogle/android/exoplayer/util/UtilTest.java → ...ogle/android/exoplayer/util/UtilTest.java b/...ogle/android/exoplayer/util/UtilTest.java → ...ogle/android/exoplayer/util/UtilTest.java
diff --git a/library/src/test/libs/.README.txt → library/src/androidTest/libs/.README.txt b/library/src/test/libs/.README.txt → library/src/androidTest/libs/.README.txt
diff --git a/library/src/test/project.properties → library/src/androidTest/project.properties b/library/src/test/project.properties → library/src/androidTest/project.properties
diff --git a/library/src/test/res/.README.txt → library/src/androidTest/res/.README.txt b/library/src/test/res/.README.txt → library/src/androidTest/res/.README.txt