From 48826836d15d7ea57a4ea55fb48d1823b95a93e4 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Mon, 27 Jul 2015 16:32:55 +0100 Subject: [PATCH] Put tests where they belong + bump bintray-release version. Issue: #651 --- build.gradle | 2 +- library/build.gradle | 7 ------- library/src/{test => androidTest}/.classpath | 0 library/src/{test => androidTest}/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../src/{test => androidTest}/AndroidManifest.xml | 3 ++- .../{test => androidTest}/assets/dash/sample_mpd_1 | 0 .../src/{test => androidTest}/assets/subrip/empty | 0 .../src/{test => androidTest}/assets/subrip/typical | 0 .../assets/webm/vorbis_codec_private | Bin .../src/{test => androidTest}/assets/webvtt/empty | 0 .../assets/webvtt/live_typical | 0 .../src/{test => androidTest}/assets/webvtt/typical | 0 .../assets/webvtt/typical_with_identifiers | 0 .../assets/webvtt/typical_with_tags | 0 .../java/com/google/android/exoplayer/CTest.java | 0 .../google/android/exoplayer/MediaFormatTest.java | 0 .../com/google/android/exoplayer/TimeRangeTest.java | 0 .../android/exoplayer/dash/DashChunkSourceTest.java | 0 .../mpd/MediaPresentationDescriptionParserTest.java | 0 .../android/exoplayer/dash/mpd/RangedUriTest.java | 0 .../exoplayer/dash/mpd/RepresentationTest.java | 0 .../android/exoplayer/dash/mpd/UrlTemplateTest.java | 0 .../extractor/DefaultExtractorInputTest.java | 0 .../android/exoplayer/extractor/ExtractorTest.java | 0 .../exoplayer/extractor/mp3/BufferingInputTest.java | 0 .../exoplayer/extractor/mp4/Mp4ExtractorTest.java | 0 .../extractor/webm/DefaultEbmlReaderTest.java | 0 .../exoplayer/extractor/webm/StreamBuilder.java | 0 .../exoplayer/extractor/webm/VarintReaderTest.java | 0 .../exoplayer/extractor/webm/WebmExtractorTest.java | 0 .../exoplayer/hls/HlsMasterPlaylistParserTest.java | 0 .../exoplayer/hls/HlsMediaPlaylistParserTest.java | 0 .../android/exoplayer/metadata/Id3ParserTest.java | 0 .../android/exoplayer/testutil/FakeDataSource.java | 0 .../exoplayer/testutil/FakeExtractorOutput.java | 0 .../android/exoplayer/testutil/FakeTrackOutput.java | 0 .../google/android/exoplayer/testutil/TestUtil.java | 0 .../exoplayer/text/subrip/SubripParserTest.java | 0 .../exoplayer/text/webvtt/WebvttParserTest.java | 0 .../exoplayer/text/webvtt/WebvttSubtitleTest.java | 0 .../exoplayer/upstream/ByteArrayDataSourceTest.java | 0 .../google/android/exoplayer/util/FakeClock.java | 0 .../android/exoplayer/util/NalUnitUtilTest.java | 0 .../exoplayer/util/ParsableByteArrayTest.java | 0 .../google/android/exoplayer/util/UriUtilTest.java | 0 .../com/google/android/exoplayer/util/UtilTest.java | 0 library/src/{test => androidTest}/libs/.README.txt | 0 .../src/{test => androidTest}/project.properties | 0 library/src/{test => androidTest}/res/.README.txt | 0 50 files changed, 3 insertions(+), 9 deletions(-) rename library/src/{test => androidTest}/.classpath (100%) rename library/src/{test => androidTest}/.project (100%) rename library/src/{test => androidTest}/.settings/org.eclipse.jdt.core.prefs (100%) rename library/src/{test => androidTest}/AndroidManifest.xml (92%) rename library/src/{test => androidTest}/assets/dash/sample_mpd_1 (100%) rename library/src/{test => androidTest}/assets/subrip/empty (100%) rename library/src/{test => androidTest}/assets/subrip/typical (100%) rename library/src/{test => androidTest}/assets/webm/vorbis_codec_private (100%) rename library/src/{test => androidTest}/assets/webvtt/empty (100%) rename library/src/{test => androidTest}/assets/webvtt/live_typical (100%) rename library/src/{test => androidTest}/assets/webvtt/typical (100%) rename library/src/{test => androidTest}/assets/webvtt/typical_with_identifiers (100%) rename library/src/{test => androidTest}/assets/webvtt/typical_with_tags (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/CTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/MediaFormatTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/TimeRangeTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/dash/DashChunkSourceTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParserTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/dash/mpd/RangedUriTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/dash/mpd/RepresentationTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/dash/mpd/UrlTemplateTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/extractor/DefaultExtractorInputTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/extractor/ExtractorTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/extractor/mp3/BufferingInputTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/extractor/mp4/Mp4ExtractorTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/extractor/webm/DefaultEbmlReaderTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/extractor/webm/StreamBuilder.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/extractor/webm/VarintReaderTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/extractor/webm/WebmExtractorTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/hls/HlsMasterPlaylistParserTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/hls/HlsMediaPlaylistParserTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/metadata/Id3ParserTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/testutil/FakeDataSource.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/testutil/TestUtil.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/text/subrip/SubripParserTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/text/webvtt/WebvttParserTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/text/webvtt/WebvttSubtitleTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/upstream/ByteArrayDataSourceTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/util/FakeClock.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/util/NalUnitUtilTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/util/ParsableByteArrayTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/util/UriUtilTest.java (100%) rename library/src/{test => androidTest}/java/com/google/android/exoplayer/util/UtilTest.java (100%) rename library/src/{test => androidTest}/libs/.README.txt (100%) rename library/src/{test => androidTest}/project.properties (100%) rename library/src/{test => androidTest}/res/.README.txt (100%) diff --git a/build.gradle b/build.gradle index fab548dc65..cd01d15c17 100644 --- 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 index ea115c3337..152efbcf15 100644 --- 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 b/library/src/androidTest/.classpath similarity index 100% rename from library/src/test/.classpath rename to library/src/androidTest/.classpath diff --git a/library/src/test/.project b/library/src/androidTest/.project similarity index 100% rename from library/src/test/.project rename to library/src/androidTest/.project diff --git a/library/src/test/.settings/org.eclipse.jdt.core.prefs b/library/src/androidTest/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from library/src/test/.settings/org.eclipse.jdt.core.prefs rename to library/src/androidTest/.settings/org.eclipse.jdt.core.prefs diff --git a/library/src/test/AndroidManifest.xml b/library/src/androidTest/AndroidManifest.xml similarity index 92% rename from library/src/test/AndroidManifest.xml rename to library/src/androidTest/AndroidManifest.xml index c9c12992a1..eb07d822e3 100644 --- a/library/src/test/AndroidManifest.xml +++ b/library/src/androidTest/AndroidManifest.xml @@ -28,6 +28,7 @@ + android:name="android.test.InstrumentationTestRunner" + tools:replace="android:targetPackage"/> diff --git a/library/src/test/assets/dash/sample_mpd_1 b/library/src/androidTest/assets/dash/sample_mpd_1 similarity index 100% rename from library/src/test/assets/dash/sample_mpd_1 rename to library/src/androidTest/assets/dash/sample_mpd_1 diff --git a/library/src/test/assets/subrip/empty b/library/src/androidTest/assets/subrip/empty similarity index 100% rename from library/src/test/assets/subrip/empty rename to library/src/androidTest/assets/subrip/empty diff --git a/library/src/test/assets/subrip/typical b/library/src/androidTest/assets/subrip/typical similarity index 100% rename from library/src/test/assets/subrip/typical rename to library/src/androidTest/assets/subrip/typical diff --git a/library/src/test/assets/webm/vorbis_codec_private b/library/src/androidTest/assets/webm/vorbis_codec_private similarity index 100% rename from library/src/test/assets/webm/vorbis_codec_private rename to library/src/androidTest/assets/webm/vorbis_codec_private diff --git a/library/src/test/assets/webvtt/empty b/library/src/androidTest/assets/webvtt/empty similarity index 100% rename from library/src/test/assets/webvtt/empty rename to library/src/androidTest/assets/webvtt/empty diff --git a/library/src/test/assets/webvtt/live_typical b/library/src/androidTest/assets/webvtt/live_typical similarity index 100% rename from library/src/test/assets/webvtt/live_typical rename to library/src/androidTest/assets/webvtt/live_typical diff --git a/library/src/test/assets/webvtt/typical b/library/src/androidTest/assets/webvtt/typical similarity index 100% rename from library/src/test/assets/webvtt/typical rename to library/src/androidTest/assets/webvtt/typical diff --git a/library/src/test/assets/webvtt/typical_with_identifiers b/library/src/androidTest/assets/webvtt/typical_with_identifiers similarity index 100% rename from library/src/test/assets/webvtt/typical_with_identifiers rename to library/src/androidTest/assets/webvtt/typical_with_identifiers diff --git a/library/src/test/assets/webvtt/typical_with_tags b/library/src/androidTest/assets/webvtt/typical_with_tags similarity index 100% rename from library/src/test/assets/webvtt/typical_with_tags rename to library/src/androidTest/assets/webvtt/typical_with_tags diff --git a/library/src/test/java/com/google/android/exoplayer/CTest.java b/library/src/androidTest/java/com/google/android/exoplayer/CTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/CTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/CTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/MediaFormatTest.java b/library/src/androidTest/java/com/google/android/exoplayer/MediaFormatTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/MediaFormatTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/MediaFormatTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/TimeRangeTest.java b/library/src/androidTest/java/com/google/android/exoplayer/TimeRangeTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/TimeRangeTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/TimeRangeTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/dash/DashChunkSourceTest.java b/library/src/androidTest/java/com/google/android/exoplayer/dash/DashChunkSourceTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/dash/DashChunkSourceTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/dash/DashChunkSourceTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParserTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParserTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParserTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/dash/mpd/RangedUriTest.java b/library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/RangedUriTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/dash/mpd/RangedUriTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/RangedUriTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/dash/mpd/RepresentationTest.java b/library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/RepresentationTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/dash/mpd/RepresentationTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/RepresentationTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/dash/mpd/UrlTemplateTest.java b/library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/UrlTemplateTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/dash/mpd/UrlTemplateTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/UrlTemplateTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/extractor/DefaultExtractorInputTest.java b/library/src/androidTest/java/com/google/android/exoplayer/extractor/DefaultExtractorInputTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/extractor/DefaultExtractorInputTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/extractor/DefaultExtractorInputTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/extractor/ExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer/extractor/ExtractorTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/extractor/ExtractorTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/extractor/ExtractorTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/extractor/mp3/BufferingInputTest.java b/library/src/androidTest/java/com/google/android/exoplayer/extractor/mp3/BufferingInputTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/extractor/mp3/BufferingInputTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/extractor/mp3/BufferingInputTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/extractor/mp4/Mp4ExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer/extractor/mp4/Mp4ExtractorTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/extractor/mp4/Mp4ExtractorTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/extractor/mp4/Mp4ExtractorTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/extractor/webm/DefaultEbmlReaderTest.java b/library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/DefaultEbmlReaderTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/extractor/webm/DefaultEbmlReaderTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/DefaultEbmlReaderTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/extractor/webm/StreamBuilder.java b/library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/StreamBuilder.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/extractor/webm/StreamBuilder.java rename to library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/StreamBuilder.java diff --git a/library/src/test/java/com/google/android/exoplayer/extractor/webm/VarintReaderTest.java b/library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/VarintReaderTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/extractor/webm/VarintReaderTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/VarintReaderTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/extractor/webm/WebmExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/WebmExtractorTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/extractor/webm/WebmExtractorTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/extractor/webm/WebmExtractorTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/hls/HlsMasterPlaylistParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer/hls/HlsMasterPlaylistParserTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/hls/HlsMasterPlaylistParserTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/hls/HlsMasterPlaylistParserTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/hls/HlsMediaPlaylistParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer/hls/HlsMediaPlaylistParserTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/hls/HlsMediaPlaylistParserTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/hls/HlsMediaPlaylistParserTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/metadata/Id3ParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer/metadata/Id3ParserTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/metadata/Id3ParserTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/metadata/Id3ParserTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/testutil/FakeDataSource.java b/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeDataSource.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/testutil/FakeDataSource.java rename to library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeDataSource.java diff --git a/library/src/test/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java b/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java rename to library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java diff --git a/library/src/test/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java b/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java rename to library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java diff --git a/library/src/test/java/com/google/android/exoplayer/testutil/TestUtil.java b/library/src/androidTest/java/com/google/android/exoplayer/testutil/TestUtil.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/testutil/TestUtil.java rename to library/src/androidTest/java/com/google/android/exoplayer/testutil/TestUtil.java diff --git a/library/src/test/java/com/google/android/exoplayer/text/subrip/SubripParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer/text/subrip/SubripParserTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/text/subrip/SubripParserTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/text/subrip/SubripParserTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/text/webvtt/WebvttParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer/text/webvtt/WebvttParserTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/text/webvtt/WebvttParserTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/text/webvtt/WebvttParserTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/text/webvtt/WebvttSubtitleTest.java b/library/src/androidTest/java/com/google/android/exoplayer/text/webvtt/WebvttSubtitleTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/text/webvtt/WebvttSubtitleTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/text/webvtt/WebvttSubtitleTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/upstream/ByteArrayDataSourceTest.java b/library/src/androidTest/java/com/google/android/exoplayer/upstream/ByteArrayDataSourceTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/upstream/ByteArrayDataSourceTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/upstream/ByteArrayDataSourceTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/util/FakeClock.java b/library/src/androidTest/java/com/google/android/exoplayer/util/FakeClock.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/util/FakeClock.java rename to library/src/androidTest/java/com/google/android/exoplayer/util/FakeClock.java diff --git a/library/src/test/java/com/google/android/exoplayer/util/NalUnitUtilTest.java b/library/src/androidTest/java/com/google/android/exoplayer/util/NalUnitUtilTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/util/NalUnitUtilTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/util/NalUnitUtilTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/util/ParsableByteArrayTest.java b/library/src/androidTest/java/com/google/android/exoplayer/util/ParsableByteArrayTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/util/ParsableByteArrayTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/util/ParsableByteArrayTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/util/UriUtilTest.java b/library/src/androidTest/java/com/google/android/exoplayer/util/UriUtilTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/util/UriUtilTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/util/UriUtilTest.java diff --git a/library/src/test/java/com/google/android/exoplayer/util/UtilTest.java b/library/src/androidTest/java/com/google/android/exoplayer/util/UtilTest.java similarity index 100% rename from library/src/test/java/com/google/android/exoplayer/util/UtilTest.java rename to library/src/androidTest/java/com/google/android/exoplayer/util/UtilTest.java diff --git a/library/src/test/libs/.README.txt b/library/src/androidTest/libs/.README.txt similarity index 100% rename from library/src/test/libs/.README.txt rename to library/src/androidTest/libs/.README.txt diff --git a/library/src/test/project.properties b/library/src/androidTest/project.properties similarity index 100% rename from library/src/test/project.properties rename to library/src/androidTest/project.properties diff --git a/library/src/test/res/.README.txt b/library/src/androidTest/res/.README.txt similarity index 100% rename from library/src/test/res/.README.txt rename to library/src/androidTest/res/.README.txt