Skip to content

Commit 037fd63

Browse files
committed
fix: fn names and tests
1 parent 3522edb commit 037fd63

File tree

4 files changed

+5
-23
lines changed

4 files changed

+5
-23
lines changed

packages/playback/src/lib/pipeline-loaders/hls-pipeline-loader.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ interface IHlsPipelineLoaderDependencies extends IPipelineLoaderDependencies {
1313
export class HlsPipelineLoader implements IPipelineLoader {
1414
private static hlsParserFactory_: typeof ChunkPlaylistParser | null = null;
1515

16-
public static setHlsParser(parser: typeof ChunkPlaylistParser): void {
16+
public static setHlsParserFactory(parser: typeof ChunkPlaylistParser): void {
1717
HlsPipelineLoader.hlsParserFactory_ = parser;
1818
}
1919

20-
public static getHlsParser(): typeof ChunkPlaylistParser | null {
20+
public static getHlsParserFactory(): typeof ChunkPlaylistParser | null {
2121
return HlsPipelineLoader.hlsParserFactory_;
2222
}
2323

packages/playback/src/lib/service-locator.ts

-6
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ import { EventEmitter } from './utils/event-emitter';
1818
import { NetworkManager } from './network/network-manager';
1919
import { PlayerEventType } from './consts/events';
2020
import { PipelineLoaderFactoryStorage } from './utils/pipeline-loader-factory-storage';
21-
import type { ChunkPlaylistParser } from '@videojs/hls-parser';
22-
import { HlsPipelineLoader } from './pipeline-loaders/hls-pipeline-loader';
2321

2422
export class ServiceLocator {
2523
public readonly logger: ILogger;
@@ -68,8 +66,4 @@ export class ServiceLocator {
6866
protected createNetworkManager_(dependencies: NetworkManagerDependencies): INetworkManager {
6967
return new NetworkManager(dependencies);
7068
}
71-
72-
public getHlsParser(): typeof ChunkPlaylistParser | null {
73-
return HlsPipelineLoader.getHlsParser();
74-
}
7569
}

packages/playback/test/lib/pipeline-loaders/hls-pipeline-loader.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import { ChunkPlaylistParser } from '@videojs/hls-parser';
44

55
describe('hls-pipeline-loader spec', () => {
66
it('parser is static pipeline loader member', () => {
7-
expect(HlsPipelineLoader.getHlsParser()).toBe(null);
7+
expect(HlsPipelineLoader.getHlsParserFactory()).toBe(null);
88
// set parser
9-
HlsPipelineLoader.setHlsParser(ChunkPlaylistParser);
10-
const ChunkHlsParser = HlsPipelineLoader.getHlsParser();
9+
HlsPipelineLoader.setHlsParserFactory(ChunkPlaylistParser);
10+
const ChunkHlsParser = HlsPipelineLoader.getHlsParserFactory();
1111
expect(ChunkHlsParser).toBeTypeOf('function');
1212
const parser = ChunkHlsParser ? ChunkHlsParser.create({}) : null;
1313
expect(parser).toBeInstanceOf(ChunkPlaylistParser);
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import { ChunkPlaylistParser } from '@videojs/hls-parser';
21
import { ServiceLocator } from '../../src/lib/service-locator';
32
import { beforeEach, describe, expect, it } from 'vitest';
4-
import { HlsPipelineLoader } from '../../src/lib/pipeline-loaders/hls-pipeline-loader';
53

64
describe('Service locator spec', () => {
75
let serviceLocator: ServiceLocator;
@@ -12,14 +10,4 @@ describe('Service locator spec', () => {
1210
it('should create a service locator instance', () => {
1311
expect(serviceLocator).toBeInstanceOf(ServiceLocator);
1412
});
15-
16-
it('should return the chunk hls parser', () => {
17-
expect(serviceLocator.getHlsParser()).toEqual(null);
18-
// set parser
19-
HlsPipelineLoader.setHlsParser(ChunkPlaylistParser);
20-
const ChunkHlsParser = serviceLocator.getHlsParser();
21-
expect(ChunkHlsParser).toBeTypeOf('function');
22-
const parser = ChunkHlsParser ? ChunkHlsParser.create({}) : null;
23-
expect(parser).toBeInstanceOf(ChunkPlaylistParser);
24-
});
2513
});

0 commit comments

Comments
 (0)