Skip to content

SDK / exoplayer

Go to a project
Commit c14ef750 by tonihei Committed by Oliver Woodman
Options

Move (almost all) remaining core library instrumentation tests to Robolectric. 

There are 4 tests which can't currently be moved:
 - DownloadManagerTest explicitly uses the main looper which isn't easily
   supported because the test runs on this thread.
 - ContentDataSourceTest uses an AssetFileDescriptor which wraps a
   ParcelFileDescriptor. It seems Robolectric doesn't correctly forward the
   inner wrapped file descriptor leading to NPE.
 - CacheContentIndexTest and SimpleCacheSpanTest both work fine with Gradle
   but fail with seemingly valid test failures on Blaze.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=185366678
parent fc7a6d25
Expand all
Inline Side-by-side
Showing with 45 additions and 32 deletions
extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java
......@@ -34,11 +34,14 @@ public class FlacExtractorTest extends InstrumentationTestCase {
}
public void testSample() throws Exception {
ExtractorAsserts.assertBehavior(new ExtractorFactory() {
@Override
public Extractor create() {
return new FlacExtractor();
}
}, "bear.flac", getInstrumentation());
ExtractorAsserts.assertBehavior(
new ExtractorFactory() {
@Override
public Extractor create() {
return new FlacExtractor();
}
},
"bear.flac",
getInstrumentation().getContext());
}
}
library/core/src/test/AndroidManifest.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.android.exoplayer2.core.test">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
</manifest>
library/core/src/androidTest/assets/ssa/invalid_timecodes → library/core/src/test/assets/ssa/invalid_timecodes
......@@ -9,4 +9,4 @@ Style: Default,Open Sans Semibold,36,&H00FFFFFF,&H000000FF,&H00020713,&H00000000
Format: Layer, Start, End, Style, Name, Text
Dialogue: 0,Invalid,0:00:01.23,Default,Olly,This is the first subtitle{ignored}.
Dialogue: 0,0:00:02.34,Invalid,Default,Olly,This is the second subtitle \nwith a newline \Nand another.
Dialogue: 0,0:00:04:56,0:00:08:90,Default,Olly,This is the third subtitle, with a comma.
\ No newline at end of file
Dialogue: 0,0:00:04:56,0:00:08:90,Default,Olly,This is the third subtitle, with a comma.
library/core/src/androidTest/assets/ssa/no_end_timecodes → library/core/src/test/assets/ssa/no_end_timecodes
......@@ -9,4 +9,4 @@ Style: Default,Open Sans Semibold,36,&H00FFFFFF,&H000000FF,&H00020713,&H00000000
Format: Layer, Start, End, Style, Name, Text
Dialogue: 0,0:00:00.00, ,Default,Olly,This is the first subtitle.
Dialogue: 0,0:00:02.34, ,Default,Olly,This is the second subtitle \nwith a newline \Nand another.
Dialogue: 0,0:00:04.56, ,Default,Olly,This is the third subtitle, with a comma.
\ No newline at end of file
Dialogue: 0,0:00:04.56, ,Default,Olly,This is the third subtitle, with a comma.
library/core/src/androidTest/assets/ssa/typical → library/core/src/test/assets/ssa/typical
......@@ -9,4 +9,4 @@ Style: Default,Open Sans Semibold,36,&H00FFFFFF,&H000000FF,&H00020713,&H00000000
Format: Layer, Start, End, Style, Name, Text
Dialogue: 0,0:00:00.00,0:00:01.23,Default,Olly,This is the first subtitle{ignored}.
Dialogue: 0,0:00:02.34,0:00:03.45,Default,Olly,This is the second subtitle \nwith a newline \Nand another.
Dialogue: 0,0:00:04:56,0:00:08:90,Default,Olly,This is the third subtitle, with a comma.
\ No newline at end of file
Dialogue: 0,0:00:04:56,0:00:08:90,Default,Olly,This is the third subtitle, with a comma.
library/core/src/androidTest/assets/ssa/typical_dialogue → library/core/src/test/assets/ssa/typical_dialogue
Dialogue: 0,0:00:00.00,0:00:01.23,Default,Olly,This is the first subtitle{ignored}.
Dialogue: 0,0:00:02.34,0:00:03.45,Default,Olly,This is the second subtitle \nwith a newline \Nand another.
Dialogue: 0,0:00:04:56,0:00:08:90,Default,Olly,This is the third subtitle, with a comma.
\ No newline at end of file
Dialogue: 0,0:00:04:56,0:00:08:90,Default,Olly,This is the third subtitle, with a comma.
library/core/src/androidTest/assets/ssa/typical_format → library/core/src/test/assets/ssa/typical_format
Format: Layer, Start, End, Style, Name, Text
\ No newline at end of file
Format: Layer, Start, End, Style, Name, Text
library/core/src/androidTest/assets/ssa/typical_header → library/core/src/test/assets/ssa/typical_header
......@@ -3,4 +3,4 @@ Title: SomeTitle
[V4+ Styles]
Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
Style: Default,Open Sans Semibold,36,&H00FFFFFF,&H000000FF,&H00020713,&H00000000,-1,0,0,0,100,100,0,0,1,1.7,0,2,0,0,28,1
\ No newline at end of file
Style: Default,Open Sans Semibold,36,&H00FFFFFF,&H000000FF,&H00020713,&H00000000,-1,0,0,0,100,100,0,0,1,1.7,0,2,0,0,28,1
library/core/src/androidTest/assets/subrip/no_end_timecodes → library/core/src/test/assets/subrip/no_end_timecodes
......@@ -8,4 +8,4 @@ We interpret it to mean that a subtitle extends to the start of the next one.
3
00:00:03,456 -->
Or to the end of the media.
\ No newline at end of file
Or to the end of the media.
library/core/src/androidTest/assets/subrip/typical → library/core/src/test/assets/subrip/typical
......@@ -9,4 +9,4 @@ Second subtitle with second line.
3
00:00:04,567 --> 00:00:08,901
This is the third subtitle.
\ No newline at end of file
This is the third subtitle.
library/core/src/androidTest/assets/subrip/typical_extra_blank_line → library/core/src/test/assets/subrip/typical_extra_blank_line
......@@ -10,4 +10,4 @@ Second subtitle with second line.
3
00:00:04,567 --> 00:00:08,901
This is the third subtitle.
\ No newline at end of file
This is the third subtitle.
library/core/src/androidTest/assets/subrip/typical_missing_sequence → library/core/src/test/assets/subrip/typical_missing_sequence
......@@ -8,4 +8,4 @@ Second subtitle with second line.
3
00:00:04,567 --> 00:00:08,901
This is the third subtitle.
\ No newline at end of file
This is the third subtitle.
library/core/src/androidTest/assets/subrip/typical_missing_timecode → library/core/src/test/assets/subrip/typical_missing_timecode
......@@ -8,4 +8,4 @@ Second subtitle with second line.
3
00:00:04,567 --> 00:00:08,901
This is the third subtitle.
\ No newline at end of file
This is the third subtitle.
library/core/src/androidTest/assets/subrip/typical_unexpected_end → library/core/src/test/assets/subrip/typical_unexpected_end
......@@ -7,4 +7,4 @@ This is the first subtitle.
This is the second subtitle.
Second subtitle with second line.
3
\ No newline at end of file
3
library/core/src/androidTest/assets/subrip/typical_with_byte_order_mark → library/core/src/test/assets/subrip/typical_with_byte_order_mark
......@@ -9,4 +9,4 @@ Second subtitle with second line.
3
00:00:04,567 --> 00:00:08,901
This is the third subtitle.
\ No newline at end of file
This is the third subtitle.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment