From e2fc60129e695447aa1b09f52f6fb2a526e55a09 Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Wed, 20 Jul 2022 12:08:10 -0500 Subject: [PATCH 1/4] Update jitsi-utils. --- .../src/main/kotlin/org/jitsi/nlj/rtp/TransportCcEngine.kt | 3 +-- .../jitsi/nlj/transform/node/incoming/TccGeneratorNode.kt | 4 ++-- .../src/test/kotlin/org/jitsi/nlj/MediaSourceDescTest.kt | 5 ++--- .../test/kotlin/org/jitsi/nlj/rtcp/KeyframeRequesterTest.kt | 2 +- .../kotlin/org/jitsi/nlj/rtcp/StreamPacketRequesterTest.kt | 2 +- .../test/kotlin/org/jitsi/nlj/rtp/TransportCcEngineTest.kt | 2 +- .../nlj/rtp/bandwidthestimation/BandwidthEstimationTest.kt | 2 +- .../org/jitsi/nlj/stats/EndpointConnectionStatsTest.kt | 2 +- .../test/kotlin/org/jitsi/nlj/stats/PacketIOActivityTest.kt | 2 +- .../kotlin/org/jitsi/nlj/test_utils/RtpPacketGenerator.kt | 2 +- .../src/test/kotlin/org/jitsi/nlj/test_utils/TimelineTest.kt | 2 +- .../transform/node/incoming/RemoteBandwidthEstimatorTest.kt | 2 +- .../nlj/transform/node/incoming/TccGeneratorNodeTest.kt | 2 +- .../test/kotlin/org/jitsi/nlj/util/TimeExpiringCacheTest.kt | 2 +- .../jitsi/videobridge/EndpointConnectionStatusMonitorTest.kt | 2 +- jvb/src/test/kotlin/org/jitsi/videobridge/VideobridgeTest.kt | 2 +- .../videobridge/cc/allocation/BitrateControllerNewTest.kt | 2 +- .../videobridge/cc/allocation/BitrateControllerPerfTest.kt | 2 +- .../jitsi/videobridge/cc/allocation/BitrateControllerTest.kt | 2 +- .../videobridge/cc/allocation/SingleSourceAllocation2Test.kt | 2 +- .../jitsi/videobridge/load_management/JvbLoadManagerTest.kt | 2 +- .../jitsi/videobridge/util/BooleanStateTimeTrackerTest.kt | 2 +- pom.xml | 2 +- 23 files changed, 25 insertions(+), 27 deletions(-) diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/TransportCcEngine.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/TransportCcEngine.kt index 94a561b457..08ac5cbf0a 100644 --- a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/TransportCcEngine.kt +++ b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/TransportCcEngine.kt @@ -35,7 +35,6 @@ import org.json.simple.JSONObject import java.time.Clock import java.time.Duration import java.time.Instant -import java.util.* import java.util.concurrent.atomic.LongAdder /** @@ -90,7 +89,7 @@ class TransportCcEngine( private var lastRtt: Duration? = null - private val lossListeners = LinkedList() + private val lossListeners = mutableListOf() /** * Called when an RTP sender has a new round-trip time estimate. diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNode.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNode.kt index 76016fb228..a7c5fd251b 100644 --- a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNode.kt +++ b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNode.kt @@ -40,7 +40,7 @@ import org.jitsi.utils.secs import java.time.Clock import java.time.Duration import java.time.Instant -import java.util.* +import java.util.TreeMap /** * Extract the TCC sequence numbers from each passing packet and generate @@ -70,7 +70,7 @@ class TccGeneratorNode( } private val rfc3711IndexTracker = Rfc3711IndexTracker() - private val lossListeners = LinkedList() + private val lossListeners = mutableListOf() init { streamInformation.onRtpExtensionMapping(TRANSPORT_CC) { diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/MediaSourceDescTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/MediaSourceDescTest.kt index ac36082c87..bce5a8065d 100644 --- a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/MediaSourceDescTest.kt +++ b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/MediaSourceDescTest.kt @@ -224,9 +224,8 @@ private fun createSource( ): MediaSourceDesc { var height = 720 - val encodings = Array(primarySsrcs.size) { - encodingIdx -> - val primarySsrc: Long = primarySsrcs.get(encodingIdx) + val encodings = Array(primarySsrcs.size) { encodingIdx -> + val primarySsrc: Long = primarySsrcs[encodingIdx] val ret = createRtpEncodingDesc( primarySsrc, numSpatialLayersPerStream, numTemporalLayersPerStream, encodingIdx, height diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/KeyframeRequesterTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/KeyframeRequesterTest.kt index ccdc2bf30e..9bee6effac 100644 --- a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/KeyframeRequesterTest.kt +++ b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/KeyframeRequesterTest.kt @@ -35,9 +35,9 @@ import org.jitsi.nlj.util.RtpExtensionHandler import org.jitsi.nlj.util.RtpPayloadTypesChangedHandler import org.jitsi.rtp.rtcp.rtcpfb.payload_specific_fb.RtcpFbFirPacket import org.jitsi.rtp.rtcp.rtcpfb.payload_specific_fb.RtcpFbPliPacket -import org.jitsi.test.time.FakeClock import org.jitsi.utils.ms import org.jitsi.utils.secs +import org.jitsi.utils.time.FakeClock class KeyframeRequesterTest : ShouldSpec() { override fun isolationMode(): IsolationMode? = IsolationMode.InstancePerLeaf diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/StreamPacketRequesterTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/StreamPacketRequesterTest.kt index e1f2c5ebb4..32f7c673f2 100644 --- a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/StreamPacketRequesterTest.kt +++ b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/StreamPacketRequesterTest.kt @@ -24,7 +24,7 @@ import io.kotest.matchers.shouldBe import org.jitsi.nlj.resources.logging.StdoutLogger import org.jitsi.rtp.rtcp.RtcpPacket import org.jitsi.rtp.rtcp.rtcpfb.transport_layer_fb.RtcpFbNackPacket -import org.jitsi.test.concurrent.FakeScheduledExecutorService +import org.jitsi.utils.concurrent.FakeScheduledExecutorService class StreamPacketRequesterTest : ShouldSpec() { override fun isolationMode(): IsolationMode? = IsolationMode.InstancePerLeaf diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtp/TransportCcEngineTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtp/TransportCcEngineTest.kt index 5061da2c04..2bde7dd289 100644 --- a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtp/TransportCcEngineTest.kt +++ b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtp/TransportCcEngineTest.kt @@ -23,7 +23,7 @@ import org.jitsi.nlj.resources.logging.StdoutLogger import org.jitsi.nlj.rtp.bandwidthestimation.BandwidthEstimator import org.jitsi.nlj.util.bytes import org.jitsi.rtp.rtcp.rtcpfb.transport_layer_fb.tcc.RtcpFbTccPacketBuilder -import org.jitsi.test.time.FakeClock +import org.jitsi.utils.time.FakeClock import java.util.logging.Level class TransportCcEngineTest : FunSpec() { diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtp/bandwidthestimation/BandwidthEstimationTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtp/bandwidthestimation/BandwidthEstimationTest.kt index 1f03edf407..da53bab3fe 100644 --- a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtp/bandwidthestimation/BandwidthEstimationTest.kt +++ b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtp/bandwidthestimation/BandwidthEstimationTest.kt @@ -25,7 +25,7 @@ import org.jitsi.nlj.util.bits import org.jitsi.nlj.util.bps import org.jitsi.nlj.util.bytes import org.jitsi.nlj.util.mbps -import org.jitsi.test.concurrent.FakeScheduledExecutorService +import org.jitsi.utils.concurrent.FakeScheduledExecutorService import org.jitsi.utils.logging.DiagnosticContext import org.jitsi.utils.logging.TimeSeriesLogger import org.jitsi.utils.logging2.LoggerImpl diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/EndpointConnectionStatsTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/EndpointConnectionStatsTest.kt index 9ec36a2565..5c48de7d0d 100644 --- a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/EndpointConnectionStatsTest.kt +++ b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/EndpointConnectionStatsTest.kt @@ -27,8 +27,8 @@ import org.jitsi.nlj.test_utils.timeline import org.jitsi.rtp.rtcp.RtcpReportBlock import org.jitsi.rtp.rtcp.RtcpRrPacket import org.jitsi.rtp.rtcp.RtcpSrPacket -import org.jitsi.test.time.FakeClock import org.jitsi.utils.ms +import org.jitsi.utils.time.FakeClock import java.time.Duration class EndpointConnectionStatsTest : ShouldSpec() { diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/PacketIOActivityTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/PacketIOActivityTest.kt index 07c7702c7b..c191ae9fca 100644 --- a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/PacketIOActivityTest.kt +++ b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/PacketIOActivityTest.kt @@ -19,8 +19,8 @@ package org.jitsi.nlj.stats import io.kotest.core.spec.IsolationMode import io.kotest.core.spec.style.ShouldSpec import io.kotest.matchers.shouldBe -import org.jitsi.test.time.FakeClock import org.jitsi.utils.secs +import org.jitsi.utils.time.FakeClock import java.time.Duration class PacketIOActivityTest : ShouldSpec() { diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/RtpPacketGenerator.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/RtpPacketGenerator.kt index 4e80b4f0d9..97071575c4 100644 --- a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/RtpPacketGenerator.kt +++ b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/RtpPacketGenerator.kt @@ -22,9 +22,9 @@ import org.jitsi.nlj.util.atRate import org.jitsi.nlj.util.howMuchCanISendAtRate import org.jitsi.nlj.util.`in` import org.jitsi.rtp.rtp.RtpPacket -import org.jitsi.test.time.FakeClock import org.jitsi.utils.div import org.jitsi.utils.secs +import org.jitsi.utils.time.FakeClock import java.time.Duration import java.time.Instant diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/TimelineTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/TimelineTest.kt index 8352dea65d..5f43c31f0c 100644 --- a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/TimelineTest.kt +++ b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/TimelineTest.kt @@ -16,7 +16,7 @@ package org.jitsi.nlj.test_utils -import org.jitsi.test.time.FakeClock +import org.jitsi.utils.time.FakeClock import java.time.Duration import java.time.Instant diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/RemoteBandwidthEstimatorTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/RemoteBandwidthEstimatorTest.kt index 90b15e64de..b09b716cb4 100644 --- a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/RemoteBandwidthEstimatorTest.kt +++ b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/RemoteBandwidthEstimatorTest.kt @@ -31,8 +31,8 @@ import org.jitsi.nlj.util.StreamInformationStoreImpl import org.jitsi.nlj.util.mbps import org.jitsi.rtp.rtp.RtpPacket import org.jitsi.rtp.rtp.header_extensions.AbsSendTimeHeaderExtension -import org.jitsi.test.time.FakeClock import org.jitsi.utils.secs +import org.jitsi.utils.time.FakeClock import java.time.Duration class RemoteBandwidthEstimatorTest : ShouldSpec() { diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNodeTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNodeTest.kt index 5a397a5372..58550e2e07 100644 --- a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNodeTest.kt +++ b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNodeTest.kt @@ -22,8 +22,8 @@ import org.jitsi.rtp.rtcp.rtcpfb.transport_layer_fb.tcc.RtcpFbTccPacket import org.jitsi.rtp.rtcp.rtcpfb.transport_layer_fb.tcc.UnreceivedPacketReport import org.jitsi.rtp.rtp.RtpPacket import org.jitsi.rtp.rtp.header_extensions.TccHeaderExtension -import org.jitsi.test.time.FakeClock import org.jitsi.utils.ms +import org.jitsi.utils.time.FakeClock import java.time.Duration import java.util.Random diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/util/TimeExpiringCacheTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/util/TimeExpiringCacheTest.kt index 20ef86329e..53419e2512 100644 --- a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/util/TimeExpiringCacheTest.kt +++ b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/util/TimeExpiringCacheTest.kt @@ -21,8 +21,8 @@ import io.kotest.core.spec.style.ShouldSpec import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe import io.kotest.matchers.types.shouldBeSameInstanceAs -import org.jitsi.test.time.FakeClock import org.jitsi.utils.secs +import org.jitsi.utils.time.FakeClock import java.time.Instant internal class TimeExpiringCacheTest : ShouldSpec() { diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/EndpointConnectionStatusMonitorTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/EndpointConnectionStatusMonitorTest.kt index 69e270b0d4..b2bd893f59 100644 --- a/jvb/src/test/kotlin/org/jitsi/videobridge/EndpointConnectionStatusMonitorTest.kt +++ b/jvb/src/test/kotlin/org/jitsi/videobridge/EndpointConnectionStatusMonitorTest.kt @@ -27,7 +27,7 @@ import io.mockk.every import io.mockk.mockk import io.mockk.slot import org.jitsi.nlj.util.NEVER -import org.jitsi.test.concurrent.FakeScheduledExecutorService +import org.jitsi.utils.concurrent.FakeScheduledExecutorService import org.jitsi.utils.logging2.LoggerImpl import org.jitsi.utils.mins import org.jitsi.utils.secs diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/VideobridgeTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/VideobridgeTest.kt index b82a86665c..b6490e2890 100644 --- a/jvb/src/test/kotlin/org/jitsi/videobridge/VideobridgeTest.kt +++ b/jvb/src/test/kotlin/org/jitsi/videobridge/VideobridgeTest.kt @@ -25,8 +25,8 @@ import io.mockk.mockk import io.mockk.verify import org.jitsi.config.withNewConfig import org.jitsi.shutdown.ShutdownServiceImpl -import org.jitsi.test.concurrent.FakeScheduledExecutorService import org.jitsi.utils.OrderedJsonObject +import org.jitsi.utils.concurrent.FakeScheduledExecutorService import org.jitsi.videobridge.shutdown.ShutdownConfig import org.jitsi.videobridge.shutdown.ShutdownState import org.jitsi.videobridge.util.TaskPools diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerNewTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerNewTest.kt index 989bd34231..769f6fd5b8 100644 --- a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerNewTest.kt +++ b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerNewTest.kt @@ -31,11 +31,11 @@ import org.jitsi.nlj.rtp.VideoRtpPacket import org.jitsi.nlj.util.bps import org.jitsi.nlj.util.kbps import org.jitsi.nlj.util.mbps -import org.jitsi.test.time.FakeClock import org.jitsi.utils.logging.DiagnosticContext import org.jitsi.utils.logging2.createLogger import org.jitsi.utils.ms import org.jitsi.utils.secs +import org.jitsi.utils.time.FakeClock import org.jitsi.videobridge.message.ReceiverVideoConstraintsMessage import java.util.function.Supplier diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerPerfTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerPerfTest.kt index ba0c7b750f..f81b3df769 100644 --- a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerPerfTest.kt +++ b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerPerfTest.kt @@ -19,12 +19,12 @@ import io.kotest.core.spec.style.StringSpec import org.jitsi.nlj.PacketInfo import org.jitsi.nlj.format.RtxPayloadType import org.jitsi.nlj.rtp.VideoRtpPacket -import org.jitsi.test.time.FakeClock import org.jitsi.utils.logging.DiagnosticContext import org.jitsi.utils.logging2.createLogger import org.jitsi.utils.ms import org.jitsi.utils.nanos import org.jitsi.utils.secs +import org.jitsi.utils.time.FakeClock import org.jitsi.videobridge.message.ReceiverVideoConstraintsMessage import java.util.function.Supplier import kotlin.random.Random diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTest.kt index 337e15e4cc..19eee9a67e 100644 --- a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTest.kt +++ b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTest.kt @@ -35,11 +35,11 @@ import org.jitsi.nlj.util.Bandwidth import org.jitsi.nlj.util.bps import org.jitsi.nlj.util.kbps import org.jitsi.nlj.util.mbps -import org.jitsi.test.time.FakeClock import org.jitsi.utils.logging.DiagnosticContext import org.jitsi.utils.logging2.createLogger import org.jitsi.utils.ms import org.jitsi.utils.secs +import org.jitsi.utils.time.FakeClock import org.jitsi.videobridge.configWithMultiStreamDisabled import org.jitsi.videobridge.message.ReceiverVideoConstraintsMessage import java.time.Instant diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocation2Test.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocation2Test.kt index bcd316d73e..f6efbd4c8e 100644 --- a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocation2Test.kt +++ b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocation2Test.kt @@ -25,8 +25,8 @@ import org.jitsi.nlj.RtpEncodingDesc import org.jitsi.nlj.VideoType import org.jitsi.nlj.util.bps import org.jitsi.nlj.util.kbps -import org.jitsi.test.time.FakeClock import org.jitsi.utils.logging.DiagnosticContext +import org.jitsi.utils.time.FakeClock /** * Test the logic for selecting the layers to be considered for a source and the "preferred" layer. diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/load_management/JvbLoadManagerTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/load_management/JvbLoadManagerTest.kt index 97bb0a412e..2b7a986530 100644 --- a/jvb/src/test/kotlin/org/jitsi/videobridge/load_management/JvbLoadManagerTest.kt +++ b/jvb/src/test/kotlin/org/jitsi/videobridge/load_management/JvbLoadManagerTest.kt @@ -23,9 +23,9 @@ import io.mockk.mockk import io.mockk.verify import org.jitsi.ConfigTest import org.jitsi.config.withNewConfig -import org.jitsi.test.time.FakeClock import org.jitsi.utils.mins import org.jitsi.utils.secs +import org.jitsi.utils.time.FakeClock class JvbLoadManagerTest : ConfigTest() { init { diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/util/BooleanStateTimeTrackerTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/util/BooleanStateTimeTrackerTest.kt index abcf72a046..1150f67c34 100644 --- a/jvb/src/test/kotlin/org/jitsi/videobridge/util/BooleanStateTimeTrackerTest.kt +++ b/jvb/src/test/kotlin/org/jitsi/videobridge/util/BooleanStateTimeTrackerTest.kt @@ -18,8 +18,8 @@ package org.jitsi.videobridge.util import io.kotest.core.spec.style.ShouldSpec import io.kotest.matchers.shouldBe -import org.jitsi.test.time.FakeClock import org.jitsi.utils.secs +import org.jitsi.utils.time.FakeClock import java.time.Duration class BooleanStateTimeTrackerTest : ShouldSpec() { diff --git a/pom.xml b/pom.xml index aa1e7d3a54..cab1374ad2 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 5.3.0 5.8.2 1.1-112-g46bbe5c - 1.0-115-gb93957d + 1.0-119-ga7b23ff 1.13.1 3.2.2 4.6.0 From 3ca4ee4540bea29d2d5163782576bf7388f8525e Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Wed, 20 Jul 2022 12:36:23 -0500 Subject: [PATCH 2/4] squash: Update another old reference. --- .../videobridge/cc/allocation/BitrateControllerTraceTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTraceTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTraceTest.kt index a07b394a08..784e9fdea2 100644 --- a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTraceTest.kt +++ b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTraceTest.kt @@ -23,7 +23,7 @@ import org.jitsi.nlj.MediaSourceDesc import org.jitsi.nlj.RtpEncodingDesc import org.jitsi.nlj.VideoType import org.jitsi.nlj.util.bps -import org.jitsi.test.time.FakeClock +import org.jitsi.utils.time.FakeClock import java.time.Instant /** From c9e19f0e0b3b2537abe6303cad7c4a13c6ec23db Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Wed, 20 Jul 2022 13:15:46 -0500 Subject: [PATCH 3/4] squash: Update another old reference. --- .../videobridge/cc/allocation/SingleSourceAllocationTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocationTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocationTest.kt index cea69721fe..72ea243fa8 100644 --- a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocationTest.kt +++ b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocationTest.kt @@ -24,8 +24,8 @@ import org.jitsi.nlj.RtpEncodingDesc import org.jitsi.nlj.VideoType import org.jitsi.nlj.util.bps import org.jitsi.nlj.util.kbps -import org.jitsi.test.time.FakeClock import org.jitsi.utils.logging.DiagnosticContext +import org.jitsi.utils.time.FakeClock /** * Test the logic for selecting the layers to be considered for an endpoint and the "preferred" layer. From dcac25afdd743559b4e7bab313c6bce01aef902a Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Wed, 20 Jul 2022 14:39:29 -0500 Subject: [PATCH 4/4] chore: Update jicoco. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cab1374ad2..5e829cf92b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 1.6.21 5.3.0 5.8.2 - 1.1-112-g46bbe5c + 1.1-113-g4e7ea8b 1.0-119-ga7b23ff 1.13.1 3.2.2