chore: update tests to conform to already existing tests

Author: justandras

packages/job-worker/src/playout/lookahead/__tests__/lookaheadOffset/constants.ts

@@ -318,22 +318,19 @@ export const baseContext = {
 				device: 'casparcg',
 				layer: 10,
 				lookahead: LookaheadMode.PRELOAD,
-				lookaheadDepth: 1,
-				lookaheadMaxSearchDistance: 10,
+				lookaheadDepth: 2,
 			},
 			layer2: {
 				device: 'casparcg',
 				layer: 10,
 				lookahead: LookaheadMode.PRELOAD,
-				lookaheadDepth: 1,
-				lookaheadMaxSearchDistance: 10,
+				lookaheadDepth: 2,
 			},
 			layer3: {
 				device: 'casparcg',
 				layer: 10,
 				lookahead: LookaheadMode.PRELOAD,
-				lookaheadDepth: 1,
-				lookaheadMaxSearchDistance: 10,
+				lookaheadDepth: 2,
 			},
 		},
 	},

packages/job-worker/src/playout/lookahead/__tests__/lookaheadOffset/lookaheadOffset.test.ts

@@ -58,78 +58,72 @@ describe('lookahead offset integration', () => {
 
 		expect(res).toEqual([])
 	})
-	test('returns one lookahead object for a single future part', async () => {
+	test('respects lookaheadMaxSearchDistance', async () => {
 		getOrderedPartsAfterPlayheadMock.mockReturnValue([
-			{
-				_id: protectString('p1'),
-				classesForNext: [],
-			} as any,
+			{ _id: protectString('p1'), classesForNext: [] } as any,
+			{ _id: protectString('p2'), classesForNext: [] } as any,
+			{ _id: protectString('p3'), classesForNext: [] } as any,
+			{ _id: protectString('p4'), classesForNext: [] } as any,
 		])
 
-		const findFetchMock = jest.fn().mockResolvedValue([makePiece({ partId: 'p1', layer: 'layer1' })])
+		const findFetchMock = jest
+			.fn()
+			.mockResolvedValue([
+				makePiece({ partId: 'p1', layer: 'layer1' }),
+				makePiece({ partId: 'p2', layer: 'layer1' }),
+				makePiece({ partId: 'p3', layer: 'layer1' }),
+				makePiece({ partId: 'p4', layer: 'layer1' }),
+			])
 
 		context = {
 			...context,
+			studio: {
+				...context.studio,
+				mappings: {
+					...context.studio.mappings,
+					layer1: {
+						...context.studio.mappings['layer1'],
+						lookaheadMaxSearchDistance: 3,
+					},
+				},
+			},
 			directCollections: {
 				...context.directCollections,
 				Pieces: {
 					...context.directCollections.Pieces,
 					findFetch: findFetchMock,
 				},
 			},
-		} as unknown as JobContext
+		} as JobContext
 
 		const res = await getLookeaheadObjects(context, playoutModel, {
 			current: undefined,
 			next: undefined,
 			previous: undefined,
 		} as SelectedPartInstancesTimelineInfo)
 
-		expect(res).toHaveLength(1)
-
-		const obj = res[0]
-		expect(obj.layer).toBe('layer1_lookahead')
-		expect(obj.objectType).toBe('rundown')
-		expect(obj.pieceInstanceId).toContain('p1')
-		expect(obj.partInstanceId).toContain('p1')
-		expect(obj.content).toMatchObject({
+		expect(res).toHaveLength(2)
+		const obj0 = res[0]
+		const obj1 = res[1]
+
+		expect(obj0.layer).toBe('layer1_lookahead')
+		expect(obj0.objectType).toBe('rundown')
+		expect(obj0.pieceInstanceId).toContain('p1')
+		expect(obj0.partInstanceId).toContain('p1')
+		expect(obj0.content).toMatchObject({
+			deviceType: TSR.DeviceType.CASPARCG,
+			type: TSR.TimelineContentTypeCasparCg.MEDIA,
+			file: 'AMB',
+		})
+		expect(obj1.layer).toBe('layer1_lookahead')
+		expect(obj1.objectType).toBe('rundown')
+		expect(obj1.pieceInstanceId).toContain('p2')
+		expect(obj1.partInstanceId).toContain('p2')
+		expect(obj1.content).toMatchObject({
 			deviceType: TSR.DeviceType.CASPARCG,
 			type: TSR.TimelineContentTypeCasparCg.MEDIA,
 			file: 'AMB',
 		})
-	})
-	test('respects lookaheadMaxSearchDistance', async () => {
-		findLargestLookaheadDistanceMock.mockReturnValue(10)
-		getOrderedPartsAfterPlayheadMock.mockReturnValue([
-			{ _id: protectString('p1'), classesForNext: [] } as any,
-			{ _id: protectString('p2'), classesForNext: [] } as any,
-		])
-
-		context = {
-			...context,
-			studio: {
-				...context.studio,
-				mappings: {
-					...context.studio.mappings,
-					layer1: {
-						...context.studio.mappings['layer1'],
-						lookaheadMaxSearchDistance: 1,
-					},
-				},
-			},
-		} as JobContext
-
-		context.directCollections.Pieces.findFetch = jest
-			.fn()
-			.mockResolvedValue([
-				makePiece({ partId: 'p1', layer: 'layer1' }),
-				makePiece({ partId: 'p2', layer: 'layer1' }),
-			])
-
-		const res = await getLookeaheadObjects(context, playoutModel, {} as SelectedPartInstancesTimelineInfo)
-
-		expect(res).toHaveLength(1)
-		expect(res[0].partInstanceId).toContain('p1')
 	})
 	test('applies nextTimeOffset to lookahead objects in future part', async () => {
 		playoutModel = {
@@ -140,11 +134,17 @@ describe('lookahead offset integration', () => {
 			},
 		} as PlayoutModel
 		findLargestLookaheadDistanceMock.mockReturnValue(1)
-		getOrderedPartsAfterPlayheadMock.mockReturnValue([{ _id: protectString('p1'), classesForNext: [] } as any])
+		getOrderedPartsAfterPlayheadMock.mockReturnValue([
+			{ _id: protectString('p1'), classesForNext: [] } as any,
+			{ _id: protectString('p2'), classesForNext: [] } as any,
+		])
 
 		context.directCollections.Pieces.findFetch = jest
 			.fn()
-			.mockResolvedValue([makePiece({ partId: 'p1', layer: 'layer1', start: 0 })])
+			.mockResolvedValue([
+				makePiece({ partId: 'p1', layer: 'layer1' }),
+				makePiece({ partId: 'p2', layer: 'layer1' }),
+			])
 
 		const res = await getLookeaheadObjects(context, playoutModel, {} as SelectedPartInstancesTimelineInfo)
 

packages/job-worker/src/playout/lookahead/findForLayer.ts

@@ -74,7 +74,7 @@ export function findLookaheadForLayer(
 			res.future.push(...nextObjs)
 		}
 		previousPart = nextPartInfo.part
-	} else lookaheadMaxSearchDistance += 1 // if there is no next part, we should look at the future parts. It's easiest to just expand the search by one.
+	}
 
 	if (lookaheadMaxSearchDistance > 1 && lookaheadTargetFutureObjects > 0) {
 		for (const partInfo of orderedPartInfos.slice(0, lookaheadMaxSearchDistance - 1)) {