Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
6884dfb3
authored
Jun 29, 2020
by
bachinger
Committed by
Oliver Woodman
Jun 29, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Move SimpleExoPlayer.Builder unit test to a separate class
PiperOrigin-RevId: 318785458
parent
8e09cf45
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
15 deletions
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
View file @
6884dfb3
...
@@ -105,7 +105,6 @@ import org.junit.Before;
...
@@ -105,7 +105,6 @@ import org.junit.Before;
import
org.junit.Ignore
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
import
org.robolectric.annotation.Config
;
import
org.robolectric.annotation.LooperMode
;
import
org.robolectric.annotation.LooperMode
;
import
org.robolectric.shadows.ShadowAudioManager
;
import
org.robolectric.shadows.ShadowAudioManager
;
...
@@ -6767,20 +6766,6 @@ public final class ExoPlayerTest {
...
@@ -6767,20 +6766,6 @@ public final class ExoPlayerTest {
assertThat
(
initialMediaItems
).
containsExactlyElementsIn
(
currentMediaItems
);
assertThat
(
initialMediaItems
).
containsExactlyElementsIn
(
currentMediaItems
);
}
}
// TODO: Revert to @Config(sdk = Config.ALL_SDKS) once b/143232359 is resolved
@Test
@Config
(
minSdk
=
Config
.
OLDEST_SDK
,
maxSdk
=
Config
.
TARGET_SDK
)
public
void
buildSimpleExoPlayerInBackgroundThread_doesNotThrow
()
throws
Exception
{
Thread
builderThread
=
new
Thread
(()
->
new
SimpleExoPlayer
.
Builder
(
context
).
build
());
AtomicReference
<
Throwable
>
builderThrow
=
new
AtomicReference
<>();
builderThread
.
setUncaughtExceptionHandler
((
thread
,
throwable
)
->
builderThrow
.
set
(
throwable
));
builderThread
.
start
();
builderThread
.
join
();
assertThat
(
builderThrow
.
get
()).
isNull
();
}
// Internal methods.
// Internal methods.
private
static
ActionSchedule
.
Builder
addSurfaceSwitch
(
ActionSchedule
.
Builder
builder
)
{
private
static
ActionSchedule
.
Builder
addSurfaceSwitch
(
ActionSchedule
.
Builder
builder
)
{
...
...
library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java
0 → 100644
View file @
6884dfb3
/*
* Copyright 2020 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.
*/
package
com
.
google
.
android
.
exoplayer2
;
import
static
com
.
google
.
common
.
truth
.
Truth
.
assertThat
;
import
androidx.test.core.app.ApplicationProvider
;
import
androidx.test.ext.junit.runners.AndroidJUnit4
;
import
java.util.concurrent.atomic.AtomicReference
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.robolectric.annotation.Config
;
/** Unit test for {@link SimpleExoPlayer}. */
@RunWith
(
AndroidJUnit4
.
class
)
public
class
SimpleExoPlayerTest
{
// TODO(b/143232359): Revert to @Config(sdk = Config.ALL_SDKS) once b/143232359 is resolved
@Test
@Config
(
minSdk
=
Config
.
OLDEST_SDK
,
maxSdk
=
Config
.
TARGET_SDK
)
public
void
builder_inBackgroundThread_doesNotThrow
()
throws
Exception
{
Thread
builderThread
=
new
Thread
(
()
->
new
SimpleExoPlayer
.
Builder
(
ApplicationProvider
.
getApplicationContext
()).
build
());
AtomicReference
<
Throwable
>
builderThrow
=
new
AtomicReference
<>();
builderThread
.
setUncaughtExceptionHandler
((
thread
,
throwable
)
->
builderThrow
.
set
(
throwable
));
builderThread
.
start
();
builderThread
.
join
();
assertThat
(
builderThrow
.
get
()).
isNull
();
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment