Skip to content

Commit d697f4a

Browse files
committed
Use the equals
1 parent 86e00c5 commit d697f4a

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import com.google.firebase.ktx.app
2525

2626
class FirebaseSessions internal constructor(firebaseApp: FirebaseApp) {
2727

28-
private val sessionGenerator = SessionGenerator(true)
28+
private val sessionGenerator = SessionGenerator(collectEvents = true)
2929

3030
init {
3131
val sessionInitiator = SessionInitiator(WallClock::elapsedRealtime, this::initiateSessionStart)

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionGenerator.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import java.util.UUID
2626
internal data class SessionInfo(
2727
val sessionId: String,
2828
val firstSessionId: String,
29-
val shouldDispatchEvents: Boolean,
29+
val collectEvents: Boolean,
3030
val sessionIndex: Int,
3131
)
3232

@@ -54,7 +54,13 @@ internal class SessionGenerator(collectEvents: Boolean) {
5454

5555
sessionIndex += 1
5656

57-
thisSession = SessionInfo(newSessionId, firstSessionId, collectEvents, sessionIndex)
57+
thisSession =
58+
SessionInfo(
59+
sessionId = newSessionId,
60+
firstSessionId = firstSessionId,
61+
collectEvents = collectEvents,
62+
sessionIndex = sessionIndex
63+
)
5864
}
5965

6066
val currentSession: SessionInfo

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionGeneratorTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,33 @@ class SessionGeneratorTest {
3838
// ensures it has consistent behavior.
3939
@Test
4040
fun currentSession_beforeGenerateReturnsDefault() {
41-
val sessionGenerator = SessionGenerator(false)
41+
val sessionGenerator = SessionGenerator(collectEvents = false)
4242

4343
assertThat(sessionGenerator.currentSession.sessionId).isEqualTo("")
4444
assertThat(sessionGenerator.currentSession.firstSessionId).isEqualTo("")
45-
assertThat(sessionGenerator.currentSession.shouldDispatchEvents).isEqualTo(false)
45+
assertThat(sessionGenerator.currentSession.collectEvents).isEqualTo(false)
4646
assertThat(sessionGenerator.currentSession.sessionIndex).isEqualTo(-1)
4747
}
4848

4949
@Test
5050
fun generateNewSessionID_generatesValidSessionInfo() {
51-
val sessionGenerator = SessionGenerator(true)
51+
val sessionGenerator = SessionGenerator(collectEvents = true)
5252

5353
sessionGenerator.generateNewSession()
5454

5555
assertThat(isValidSessionId(sessionGenerator.currentSession.sessionId)).isEqualTo(true)
5656
assertThat(isValidSessionId(sessionGenerator.currentSession.firstSessionId)).isEqualTo(true)
5757
assertThat(sessionGenerator.currentSession.firstSessionId)
5858
.isEqualTo(sessionGenerator.currentSession.sessionId)
59-
assertThat(sessionGenerator.currentSession.shouldDispatchEvents).isEqualTo(true)
59+
assertThat(sessionGenerator.currentSession.collectEvents).isEqualTo(true)
6060
assertThat(sessionGenerator.currentSession.sessionIndex).isEqualTo(0)
6161
}
6262

6363
// Ensures that generating a Session ID multiple times results in the fist
6464
// Session ID being set in the firstSessionId field
6565
@Test
6666
fun generateNewSessionID_incrementsSessionIndex_keepsFirstSessionId() {
67-
val sessionGenerator = SessionGenerator(true)
67+
val sessionGenerator = SessionGenerator(collectEvents = true)
6868

6969
sessionGenerator.generateNewSession()
7070

0 commit comments

Comments
 (0)