wip

Author: Julusian

packages/corelib/src/playout/__tests__/processAndPrune.test.ts

@@ -46,11 +46,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 		})
 	}
 
-	function runAndTidyResult(
-		pieceInstances: PieceInstance[],
-		nowInPart: number | PartCurrentTimes,
-		includeVirtual?: boolean
-	) {
+	function runAndTidyResult(pieceInstances: PieceInstance[], partTimes: PartCurrentTimes, includeVirtual?: boolean) {
 		const resolvedInstances = processAndPrunePieceInstanceTimings(
 			{
 				one: {
@@ -67,7 +63,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 				},
 			},
 			pieceInstances,
-			typeof nowInPart === 'number' ? createPartCurrentTimes(nowInPart, 0) : nowInPart, // nocommit - this is a hack to avoid changing tests
+			partTimes,
 			undefined,
 			includeVirtual
 		)
@@ -85,7 +81,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 			createPieceInstance('two', { start: 1000 }, 'two', PieceLifespan.OutOnRundownEnd),
 		]
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0))
 		expect(resolvedInstances).toEqual([
 			{
 				_id: 'one',
@@ -107,7 +103,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 			createPieceInstance('two', { start: 1000, duration: 5000 }, 'one', PieceLifespan.OutOnRundownEnd),
 		]
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0))
 		expect(resolvedInstances).toEqual([
 			{
 				_id: 'one',
@@ -133,7 +129,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 			createPieceInstance('five', { start: 4000 }, 'one', PieceLifespan.OutOnShowStyleEnd),
 		]
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0))
 		expect(resolvedInstances).toEqual([
 			{
 				_id: 'zero',
@@ -183,7 +179,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 			createPieceInstance('zero', { start: 6000 }, 'one', PieceLifespan.OutOnShowStyleEnd, true),
 		]
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0))
 		expect(resolvedInstances).toEqual([
 			{
 				_id: 'zero',
@@ -215,7 +211,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 			createPieceInstance('five', { start: 6000 }, 'one', PieceLifespan.OutOnShowStyleEnd, true),
 		]
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500, true)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0), true)
 		expect(resolvedInstances).toEqual([
 			{
 				_id: 'zero',
@@ -265,7 +261,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 			createPieceInstance('five', { start: 6000 }, 'one', PieceLifespan.OutOnShowStyleEnd),
 		]
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0))
 		expect(resolvedInstances).toEqual([
 			{
 				_id: 'zero',
@@ -311,7 +307,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 			createPieceInstance('two', { start: 1000 }, 'one', PieceLifespan.OutOnSegmentEnd, 5500),
 		]
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0))
 		expect(resolvedInstances).toEqual([
 			{
 				_id: 'one',
@@ -329,7 +325,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 			createPieceInstance('four', { start: 1000 }, 'one', PieceLifespan.OutOnRundownChange, 4000),
 		]
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0))
 		expect(resolvedInstances).toEqual([
 			{
 				_id: 'three',
@@ -345,7 +341,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 			createPieceInstance('two', { start: 1000 }, 'one', PieceLifespan.OutOnShowStyleEnd, 5500),
 		]
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0))
 		expect(resolvedInstances).toEqual([
 			{
 				_id: 'one',
@@ -372,7 +368,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 			}),
 		]
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0))
 		expect(resolvedInstances).toEqual([
 			{
 				_id: 'one',
@@ -405,7 +401,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 			}),
 		]
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0))
 		expect(resolvedInstances).toEqual([
 			{
 				_id: 'two',
@@ -433,7 +429,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 
 		pieceInstances[1].piece.virtual = true
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0))
 
 		// don't expect virtual Pieces in the results, but 'one' should be pruned too
 		expect(resolvedInstances).toEqual([])
@@ -463,7 +459,7 @@ describe('processAndPrunePieceInstanceTimings', () => {
 		pieceInstances[0].piece.prerollDuration = 200
 		pieceInstances[1].piece.prerollDuration = 200
 
-		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+		const resolvedInstances = runAndTidyResult(pieceInstances, createPartCurrentTimes(500, 0))
 
 		expect(resolvedInstances).toEqual([
 			{