forked from androidx/androidx
-
Notifications
You must be signed in to change notification settings - Fork 77
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Commonize lifecycle tests #1330
Open
kropp
wants to merge
3
commits into
JetBrains:jb-main
Choose a base branch
from
kropp:commonize-lifecycle-tests
base: jb-main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
...fecycle-runtime/src/androidUnitTest/kotlin/androidx/lifecycle/runLifecycleTest.android.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
/* | ||
* Copyright 2024 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 androidx.lifecycle | ||
|
||
import kotlin.coroutines.CoroutineContext | ||
import kotlin.coroutines.EmptyCoroutineContext | ||
import kotlinx.coroutines.CloseableCoroutineDispatcher | ||
import kotlinx.coroutines.CoroutineScope | ||
import kotlinx.coroutines.DelicateCoroutinesApi | ||
import kotlinx.coroutines.Dispatchers | ||
import kotlinx.coroutines.ExperimentalCoroutinesApi | ||
import kotlinx.coroutines.MainCoroutineDispatcher | ||
import kotlinx.coroutines.Runnable | ||
import kotlinx.coroutines.newSingleThreadContext | ||
import kotlinx.coroutines.runBlocking | ||
import kotlinx.coroutines.test.TestResult | ||
import kotlinx.coroutines.test.resetMain | ||
import kotlinx.coroutines.test.setMain | ||
|
||
/** | ||
* Android Unit Tests target doesn't provide a Main dispatcher. | ||
* Lifecycle internals rely on Main & Main.immediate dispatchers heavily, | ||
* so we need to re-create their behavior in tests. | ||
*/ | ||
@OptIn(ExperimentalCoroutinesApi::class, DelicateCoroutinesApi::class) | ||
private class SurrogateMainCoroutineDispatcher : MainCoroutineDispatcher() { | ||
private val isMainThread: ThreadLocal<Boolean> = ThreadLocal() | ||
|
||
private val mainThreadSurrogate = newSingleThreadContext("UI thread") | ||
|
||
init { | ||
mainThreadSurrogate.dispatch(EmptyCoroutineContext, Runnable { isMainThread.set(true) }) | ||
} | ||
|
||
override val immediate: MainCoroutineDispatcher = ImmediateMainCoroutineDispatcher(isMainThread, mainThreadSurrogate) | ||
|
||
override fun dispatch(context: CoroutineContext, block: Runnable) { | ||
mainThreadSurrogate.dispatch(context, block) | ||
} | ||
|
||
fun close() { | ||
mainThreadSurrogate.close() | ||
} | ||
} | ||
|
||
private class ImmediateMainCoroutineDispatcher( | ||
private val isMainThread: ThreadLocal<Boolean>, | ||
private val mainThreadSurrogate: CloseableCoroutineDispatcher, | ||
) : MainCoroutineDispatcher() { | ||
override val immediate: MainCoroutineDispatcher get() = this | ||
|
||
override fun dispatch(context: CoroutineContext, block: Runnable) { | ||
mainThreadSurrogate.dispatch(context, block) | ||
} | ||
|
||
override fun isDispatchNeeded(context: CoroutineContext): Boolean { | ||
return !isMainThread.get() | ||
} | ||
} | ||
|
||
@OptIn(ExperimentalCoroutinesApi::class) | ||
actual fun runLifecycleTest(block: suspend CoroutineScope.() -> Unit): TestResult { | ||
val mainThreadSurrogate = SurrogateMainCoroutineDispatcher() | ||
Dispatchers.setMain(mainThreadSurrogate) | ||
|
||
try { | ||
runBlocking(mainThreadSurrogate, block = block) | ||
} finally { | ||
Dispatchers.resetMain() | ||
mainThreadSurrogate.close() | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
@@ -1,5 +1,5 @@ | ||||
/* | ||||
* Copyright 2019 The Android Open Source Project | ||||
* Copyright 2024 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. | ||||
|
@@ -16,27 +16,28 @@ | |||
|
||||
package androidx.lifecycle | ||||
|
||||
import com.google.common.truth.Truth | ||||
import java.util.concurrent.atomic.AtomicInteger | ||||
import androidx.kruth.assertThat | ||||
import kotlinx.atomicfu.atomic | ||||
|
||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||
|
||||
/** | ||||
* Partial copy from | ||||
* https://github.com/Kotlin/kotlinx.coroutines/blob/master/core/kotlinx-coroutines-core/test/TestBase.kt | ||||
* to track execution order. | ||||
*/ | ||||
class Expectations { | ||||
private val counter = AtomicInteger(0) | ||||
private val counter = atomic(0) | ||||
|
||||
fun expect(expected: Int) { | ||||
val order = counter.incrementAndGet() | ||||
Truth.assertThat(order).isEqualTo(expected) | ||||
assertThat(order).isEqualTo(expected) | ||||
} | ||||
|
||||
fun expectUnreached() { | ||||
throw AssertionError("should've not reached here") | ||||
} | ||||
|
||||
fun expectTotal(total: Int) { | ||||
Truth.assertThat(counter.get()).isEqualTo(total) | ||||
assertThat(counter.value).isEqualTo(total) | ||||
} | ||||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please revert updating years in header comments