Skip to content

Commit de68b51

Browse files
committed
Merge branch 'sessions-deps' into sessions-products
2 parents bf47172 + 9e67118 commit de68b51

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependencies.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ object FirebaseSessionsDependencies {
4848
dependencies[subscriberName] = Dependency(Mutex(locked = true))
4949
}
5050

51-
/** Register and unlock the subscriber. This must be called before [getSubscribers] can return. */
51+
/**
52+
* Register and unlock the subscriber. This must be called before [getRegisteredSubscribers] can
53+
* return.
54+
*/
5255
internal fun register(subscriber: SessionSubscriber) {
5356
val subscriberName = subscriber.sessionSubscriberName
5457
val dependency = getDependency(subscriberName)
@@ -64,7 +67,7 @@ object FirebaseSessionsDependencies {
6467
}
6568

6669
/** Gets the subscribers safely, blocks until all the subscribers are registered. */
67-
internal suspend fun getSubscribers(): Map<SessionSubscriber.Name, SessionSubscriber> {
70+
internal suspend fun getRegisteredSubscribers(): Map<SessionSubscriber.Name, SessionSubscriber> {
6871
// The call to getSubscriber will never throw because the mutex guarantees it's been registered.
6972
return dependencies.mapValues { (subscriberName, dependency) ->
7073
dependency.mutex.withLock { getSubscriber(subscriberName) }

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependenciesTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ class FirebaseSessionsDependenciesTest {
104104
}
105105

106106
// Block until the register happens.
107-
val subscribers = FirebaseSessionsDependencies.getSubscribers()
107+
val subscribers = FirebaseSessionsDependencies.getRegisteredSubscribers()
108108

109109
assertThat(subscribers).containsExactly(CRASHLYTICS, crashlyticsSubscriber)
110110
}
111111

112112
@Test
113113
fun getSubscribers_noDependencies() = runTest {
114-
val subscribers = FirebaseSessionsDependencies.getSubscribers()
114+
val subscribers = FirebaseSessionsDependencies.getRegisteredSubscribers()
115115

116116
assertThat(subscribers).isEmpty()
117117
}
@@ -121,6 +121,6 @@ class FirebaseSessionsDependenciesTest {
121121
FirebaseSessionsDependencies.addDependency(CRASHLYTICS)
122122

123123
// The register never happens, wait until the timeout.
124-
withTimeout(2.seconds) { FirebaseSessionsDependencies.getSubscribers() }
124+
withTimeout(2.seconds) { FirebaseSessionsDependencies.getRegisteredSubscribers() }
125125
}
126126
}

0 commit comments

Comments
 (0)