Skip to content

Commit 5bd40f9

Browse files
committed
fix psi tests
1 parent c0ed321 commit 5bd40f9

File tree

3 files changed

+12
-34
lines changed

3 files changed

+12
-34
lines changed

srt/src/main/java/com/pedro/srt/mpeg2ts/psi/TableToSend.kt

-25
This file was deleted.

srt/src/test/java/com/pedro/srt/mpeg2ts/PsiManagerTest.kt

+12-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.pedro.srt.mpeg2ts
1818

1919
import com.pedro.srt.mpeg2ts.psi.PsiManager
20-
import com.pedro.srt.mpeg2ts.psi.TableToSend
2120
import com.pedro.srt.mpeg2ts.service.Mpeg2TsService
2221
import org.junit.Assert.assertEquals
2322
import org.junit.Test
@@ -27,26 +26,31 @@ import org.junit.Test
2726
*/
2827
class PsiManagerTest {
2928

30-
private val service = Mpeg2TsService()
29+
private val service = Mpeg2TsService().apply { generatePmt() }
30+
private val psiManager = PsiManager(service).apply {
31+
upgradePatVersion()
32+
upgradeSdtVersion()
33+
}
34+
private val mpegTsPacketizer = MpegTsPacketizer(psiManager)
3135

3236
@Test
3337
fun `GIVEN a psiManager WHEN call should send is key false patPeriod times THEN return TableToSend PAT_PMT`() {
3438
val psiManager = PsiManager(service)
35-
var sendValue = TableToSend.NONE
39+
var packets = listOf<MpegTsPacket>()
3640
(0..PsiManager.patPeriod).forEach { _ ->
37-
sendValue = psiManager.shouldSend(false)
41+
packets = psiManager.checkSendInfo(false, mpegTsPacketizer)
3842
}
39-
assertEquals(TableToSend.PAT_PMT, sendValue)
43+
assertEquals(2, packets.size)
4044
}
4145

4246
@Test
4347
fun `GIVEN a psiManager WHEN call should send is key false sdtPeriod times THEN return TableToSend ALL`() {
4448
val psiManager = PsiManager(service)
45-
var sendValue = TableToSend.NONE
49+
var packets = listOf<MpegTsPacket>()
4650
(0..PsiManager.sdtPeriod).forEach { _ ->
47-
sendValue = psiManager.shouldSend(false)
51+
packets = psiManager.checkSendInfo(false, mpegTsPacketizer)
4852
}
49-
assertEquals(TableToSend.ALL, sendValue)
53+
assertEquals(3, packets.size)
5054
}
5155

5256
@Test

udp/src/main/java/com/pedro/udp/UdpSender.kt

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import com.pedro.srt.mpeg2ts.packets.BasePacket
3232
import com.pedro.srt.mpeg2ts.packets.H26XPacket
3333
import com.pedro.srt.mpeg2ts.packets.OpusPacket
3434
import com.pedro.srt.mpeg2ts.psi.PsiManager
35-
import com.pedro.srt.mpeg2ts.psi.TableToSend
3635
import com.pedro.srt.mpeg2ts.service.Mpeg2TsService
3736
import com.pedro.srt.srt.packets.data.PacketPosition
3837
import com.pedro.srt.utils.Constants

0 commit comments

Comments
 (0)