Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion media/src/main/java/com/mparticle/media/MediaSession.kt
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ class MediaSession protected constructor(builder: Builder) {
sessionId?.let {
customAttributes[mediaSessionIdKey] = it
}
customAttributes[mediaContentId] = mediaContentId
customAttributes[contentIdKey] = mediaContentId
customAttributes[segmentIndexKey] = segmentSummary.index.toString()
segmentSummary.title?.let {
customAttributes[segmentTitleKey] = it
Expand Down
59 changes: 59 additions & 0 deletions media/src/test/java/com/mparticle/MediaSessionTest.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.mparticle

import com.mparticle.media.MediaSegmentSummary
import com.mparticle.media.MediaSession
import com.mparticle.media.events.*
import com.mparticle.testutils.RandomUtils
Expand Down Expand Up @@ -464,6 +465,64 @@ class MediaSessionTest {
events[9].assertTrue { it.eventName == MediaEventName.AD_BREAK_END}
}

@Test
fun testLogSegmentSummary() {
val mparticle = MockMParticle()
val mediaSession = MediaSession.builder(mparticle) {
title = "hello"
mediaContentId ="123"
duration =1000
}

val events = mutableListOf<MediaEvent>()
mediaSession.mediaEventListener = { event ->
events.add(event)
}

mediaSession.logSegmentStart{}

mediaSession.logSegmentEnd()
assertEquals(2, events.size)
events.forEach {
it.mediaContent.apply {
assertEquals("hello", name)
assertEquals("123", contentId)
assertEquals(1000L, duration)
}
}
assertNotNull(mparticle.loggedEvents[2].customAttributes)
assertNotNull(mparticle.loggedEvents[2].customAttributes?.get("content_id"))
assertEquals("123",mparticle.loggedEvents[2].customAttributes?.get("content_id"))
}

@Test
fun testLogSegmentSummary_When_Content_ID_IS_NULL() {
val mparticle = MockMParticle()
val mediaSession = MediaSession.builder(mparticle) {
title = "hello"
duration =1000
}

val events = mutableListOf<MediaEvent>()
mediaSession.mediaEventListener = { event ->
events.add(event)
}

mediaSession.logSegmentStart{}

mediaSession.logSegmentEnd()
assertEquals(2, events.size)
events.forEach {
it.mediaContent.apply {
assertEquals("hello", name)
assertEquals(1000L, duration)
}
}
assertNotNull(mparticle.loggedEvents[2].customAttributes)
assertNotNull(mparticle.loggedEvents[2].customAttributes?.get("content_id"))
assertEquals("",mparticle.loggedEvents[2].customAttributes?.get("content_id"))
}

fun BaseEvent.isPlayheadEvent(): Boolean {
return if (this is MediaEvent) {
eventName == MediaEventName.UPDATE_PLAYHEAD_POSITION
Expand Down