From a62cb01e9730581a01f1a4cf544e2b221d8a1bf7 Mon Sep 17 00:00:00 2001 From: hensm Date: Sun, 14 Jul 2019 09:46:05 +0100 Subject: [PATCH] Update blank metadata values from null to undefined to match Chrome --- .../media/classes/GenericMediaMetadata.ts | 10 ++++---- .../cast/media/classes/MovieMediaMetadata.ts | 12 +++++----- .../media/classes/MusicTrackMediaMetadata.ts | 24 +++++++++---------- .../cast/media/classes/PhotoMediaMetadata.ts | 18 +++++++------- .../cast/media/classes/TvShowMediaMetadata.ts | 20 ++++++++-------- .../shim/media/GenericMediaMetadata.spec.js | 10 ++++---- .../shim/media/MovieMediaMetadata.spec.js | 12 +++++----- .../media/MusicTrackMediaMetadata.spec.js | 24 +++++++++---------- .../shim/media/PhotoMediaMetadata.spec.js | 18 +++++++------- .../shim/media/TvShowMediaMetadata.spec.js | 20 ++++++++-------- 10 files changed, 84 insertions(+), 84 deletions(-) diff --git a/ext/src/shim/cast/media/classes/GenericMediaMetadata.ts b/ext/src/shim/cast/media/classes/GenericMediaMetadata.ts index b40ecf3..ba4d35c 100644 --- a/ext/src/shim/cast/media/classes/GenericMediaMetadata.ts +++ b/ext/src/shim/cast/media/classes/GenericMediaMetadata.ts @@ -6,11 +6,11 @@ import { MetadataType } from "../enums"; export default class GenericMediaMetadata { - public images: Image[] = null; + public images: Image[] = undefined; public metadataType: number = MetadataType.GENERIC; - public releaseDate: string = null; - public releaseYear: number = null; - public subtitle: string = null; - public title: string = null; + public releaseDate: string = undefined; + public releaseYear: number = undefined; + public subtitle: string = undefined; + public title: string = undefined; public type: number = MetadataType.GENERIC; } diff --git a/ext/src/shim/cast/media/classes/MovieMediaMetadata.ts b/ext/src/shim/cast/media/classes/MovieMediaMetadata.ts index 30d24a3..7741a98 100644 --- a/ext/src/shim/cast/media/classes/MovieMediaMetadata.ts +++ b/ext/src/shim/cast/media/classes/MovieMediaMetadata.ts @@ -6,12 +6,12 @@ import { MetadataType } from "../enums"; export default class MovieMediaMetadata { - public images: Image[] = null; + public images: Image[] = undefined; public metadataType: number = MetadataType.MOVIE; - public releaseDate: string = null; - public releaseYear: number = null; - public studio: string = null; - public subtitle: string = null; - public title: string = null; + public releaseDate: string = undefined; + public releaseYear: number = undefined; + public studio: string = undefined; + public subtitle: string = undefined; + public title: string = undefined; public type: number = MetadataType.MOVIE; } diff --git a/ext/src/shim/cast/media/classes/MusicTrackMediaMetadata.ts b/ext/src/shim/cast/media/classes/MusicTrackMediaMetadata.ts index 50fcbf9..8144b4f 100644 --- a/ext/src/shim/cast/media/classes/MusicTrackMediaMetadata.ts +++ b/ext/src/shim/cast/media/classes/MusicTrackMediaMetadata.ts @@ -6,18 +6,18 @@ import { MetadataType } from "../enums"; export default class MusicTrackMediaMetadata { - public albumArtist: string = null; - public albumName: string = null; - public artist: string = null; - public artistName: string = null; - public composer: string = null; - public discNumber: number = null; - public images: Image[] = null; + public albumArtist: string = undefined; + public albumName: string = undefined; + public artist: string = undefined; + public artistName: string = undefined; + public composer: string = undefined; + public discNumber: number = undefined; + public images: Image[] = undefined; public metadataType: number = MetadataType.MUSIC_TRACK; - public releaseDate: string = null; - public releaseYear: number = null; - public songName: string = null; - public title: string = null; - public trackNumber: number = null; + public releaseDate: string = undefined; + public releaseYear: number = undefined; + public songName: string = undefined; + public title: string = undefined; + public trackNumber: number = undefined; public type: number = MetadataType.MUSIC_TRACK; } diff --git a/ext/src/shim/cast/media/classes/PhotoMediaMetadata.ts b/ext/src/shim/cast/media/classes/PhotoMediaMetadata.ts index 43501a0..54c54d2 100644 --- a/ext/src/shim/cast/media/classes/PhotoMediaMetadata.ts +++ b/ext/src/shim/cast/media/classes/PhotoMediaMetadata.ts @@ -6,15 +6,15 @@ import { MetadataType } from "../enums"; export default class PhotoMediaMetadata { - public artist: string = null; - public creationDateTime: string = null; - public height: number = null; - public images: Image[] = null; - public latitude: number = null; - public location: string = null; - public longitude: number = null; + public artist: string = undefined; + public creationDateTime: string = undefined; + public height: number = undefined; + public images: Image[] = undefined; + public latitude: number = undefined; + public location: string = undefined; + public longitude: number = undefined; public metadataType: number = MetadataType.PHOTO; - public title: string = null; + public title: string = undefined; public type: number = MetadataType.PHOTO; - public width: number = null; + public width: number = undefined; } diff --git a/ext/src/shim/cast/media/classes/TvShowMediaMetadata.ts b/ext/src/shim/cast/media/classes/TvShowMediaMetadata.ts index e9b70b8..878a017 100644 --- a/ext/src/shim/cast/media/classes/TvShowMediaMetadata.ts +++ b/ext/src/shim/cast/media/classes/TvShowMediaMetadata.ts @@ -6,16 +6,16 @@ import { MetadataType } from "../enums"; export default class TvShowMediaMetadata { - public episode: number = null; - public episodeNumber: number = null; - public episodeTitle: string = null; - public images: Image[] = null; + public episode: number = undefined; + public episodeNumber: number = undefined; + public episodeTitle: string = undefined; + public images: Image[] = undefined; public metadataType: number = MetadataType.TV_SHOW; - public originalAirdate: string = null; - public releaseYear: number = null; - public season: number = null; - public seasonNumber: number = null; - public seriesTitle: string = null; - public title: string = null; + public originalAirdate: string = undefined; + public releaseYear: number = undefined; + public season: number = undefined; + public seasonNumber: number = undefined; + public seriesTitle: string = undefined; + public title: string = undefined; public type: number = MetadataType.TV_SHOW; } diff --git a/test/spec/shim/media/GenericMediaMetadata.spec.js b/test/spec/shim/media/GenericMediaMetadata.spec.js index 5ad38f4..702d760 100644 --- a/test/spec/shim/media/GenericMediaMetadata.spec.js +++ b/test/spec/shim/media/GenericMediaMetadata.spec.js @@ -4,12 +4,12 @@ describe("chrome.cast.media.GenericMediaMetadata", () => { it("should have all properties", async () => { const genericMediaMetadata = new chrome.cast.media.GenericMediaMetadata(); - expect(genericMediaMetadata.images).toBe(null); + expect(genericMediaMetadata.images).toBe(undefined); expect(genericMediaMetadata.metadataType).toBe(0); - expect(genericMediaMetadata.releaseDate).toBe(null); - expect(genericMediaMetadata.releaseYear).toBe(null); - expect(genericMediaMetadata.subtitle).toBe(null); - expect(genericMediaMetadata.title).toBe(null); + expect(genericMediaMetadata.releaseDate).toBe(undefined); + expect(genericMediaMetadata.releaseYear).toBe(undefined); + expect(genericMediaMetadata.subtitle).toBe(undefined); + expect(genericMediaMetadata.title).toBe(undefined); expect(genericMediaMetadata.type).toBe(0); }); }); diff --git a/test/spec/shim/media/MovieMediaMetadata.spec.js b/test/spec/shim/media/MovieMediaMetadata.spec.js index f935e4c..7773820 100644 --- a/test/spec/shim/media/MovieMediaMetadata.spec.js +++ b/test/spec/shim/media/MovieMediaMetadata.spec.js @@ -4,13 +4,13 @@ describe("chrome.cast.media.MovieMediaMetadata", () => { it("should have all properties", async () => { const movieMediaMetadata = new chrome.cast.media.MovieMediaMetadata(); - expect(movieMediaMetadata.images).toBe(null); + expect(movieMediaMetadata.images).toBe(undefined); expect(movieMediaMetadata.metadataType).toBe(1); - expect(movieMediaMetadata.releaseDate).toBe(null); - expect(movieMediaMetadata.releaseYear).toBe(null); - expect(movieMediaMetadata.studio).toBe(null); - expect(movieMediaMetadata.subtitle).toBe(null); - expect(movieMediaMetadata.title).toBe(null); + expect(movieMediaMetadata.releaseDate).toBe(undefined); + expect(movieMediaMetadata.releaseYear).toBe(undefined); + expect(movieMediaMetadata.studio).toBe(undefined); + expect(movieMediaMetadata.subtitle).toBe(undefined); + expect(movieMediaMetadata.title).toBe(undefined); expect(movieMediaMetadata.type).toBe(1); }); }); diff --git a/test/spec/shim/media/MusicTrackMediaMetadata.spec.js b/test/spec/shim/media/MusicTrackMediaMetadata.spec.js index 0c0d7d9..e4fe6c0 100644 --- a/test/spec/shim/media/MusicTrackMediaMetadata.spec.js +++ b/test/spec/shim/media/MusicTrackMediaMetadata.spec.js @@ -4,19 +4,19 @@ describe("chrome.cast.media.MusicTrackMediaMetadata", () => { it("should have all properties", async () => { const musicTrackMediaMetadata = new chrome.cast.media.MusicTrackMediaMetadata(); - expect(musicTrackMediaMetadata.albumArtist).toBe(null); - expect(musicTrackMediaMetadata.albumName).toBe(null); - expect(musicTrackMediaMetadata.artist).toBe(null); - expect(musicTrackMediaMetadata.artistName).toBe(null); - expect(musicTrackMediaMetadata.composer).toBe(null); - expect(musicTrackMediaMetadata.discNumber).toBe(null); - expect(musicTrackMediaMetadata.images).toBe(null); + expect(musicTrackMediaMetadata.albumArtist).toBe(undefined); + expect(musicTrackMediaMetadata.albumName).toBe(undefined); + expect(musicTrackMediaMetadata.artist).toBe(undefined); + expect(musicTrackMediaMetadata.artistName).toBe(undefined); + expect(musicTrackMediaMetadata.composer).toBe(undefined); + expect(musicTrackMediaMetadata.discNumber).toBe(undefined); + expect(musicTrackMediaMetadata.images).toBe(undefined); expect(musicTrackMediaMetadata.metadataType).toBe(3); - expect(musicTrackMediaMetadata.releaseDate).toBe(null); - expect(musicTrackMediaMetadata.releaseYear).toBe(null); - expect(musicTrackMediaMetadata.songName).toBe(null); - expect(musicTrackMediaMetadata.title).toBe(null); - expect(musicTrackMediaMetadata.trackNumber).toBe(null); + expect(musicTrackMediaMetadata.releaseDate).toBe(undefined); + expect(musicTrackMediaMetadata.releaseYear).toBe(undefined); + expect(musicTrackMediaMetadata.songName).toBe(undefined); + expect(musicTrackMediaMetadata.title).toBe(undefined); + expect(musicTrackMediaMetadata.trackNumber).toBe(undefined); expect(musicTrackMediaMetadata.type).toBe(3); }); }); diff --git a/test/spec/shim/media/PhotoMediaMetadata.spec.js b/test/spec/shim/media/PhotoMediaMetadata.spec.js index 413520d..9c9a3e3 100644 --- a/test/spec/shim/media/PhotoMediaMetadata.spec.js +++ b/test/spec/shim/media/PhotoMediaMetadata.spec.js @@ -4,16 +4,16 @@ describe("chrome.cast.media.PhotoMediaMetadata", () => { it("should have all properties", async () => { const photoMediaMetadata = new chrome.cast.media.PhotoMediaMetadata(); - expect(photoMediaMetadata.artist).toBe(null); - expect(photoMediaMetadata.creationDateTime).toBe(null); - expect(photoMediaMetadata.height).toBe(null); - expect(photoMediaMetadata.images).toBe(null); - expect(photoMediaMetadata.latitude).toBe(null); - expect(photoMediaMetadata.location).toBe(null); - expect(photoMediaMetadata.longitude).toBe(null); + expect(photoMediaMetadata.artist).toBe(undefined); + expect(photoMediaMetadata.creationDateTime).toBe(undefined); + expect(photoMediaMetadata.height).toBe(undefined); + expect(photoMediaMetadata.images).toBe(undefined); + expect(photoMediaMetadata.latitude).toBe(undefined); + expect(photoMediaMetadata.location).toBe(undefined); + expect(photoMediaMetadata.longitude).toBe(undefined); expect(photoMediaMetadata.metadataType).toBe(4); - expect(photoMediaMetadata.title).toBe(null); + expect(photoMediaMetadata.title).toBe(undefined); expect(photoMediaMetadata.type).toBe(4); - expect(photoMediaMetadata.width).toBe(null); + expect(photoMediaMetadata.width).toBe(undefined); }); }); diff --git a/test/spec/shim/media/TvShowMediaMetadata.spec.js b/test/spec/shim/media/TvShowMediaMetadata.spec.js index 4e9cc35..37e4f15 100644 --- a/test/spec/shim/media/TvShowMediaMetadata.spec.js +++ b/test/spec/shim/media/TvShowMediaMetadata.spec.js @@ -4,17 +4,17 @@ describe("chrome.cast.media.TvShowMediaMetadata", () => { it("should have all properties", async () => { const tvShowMediaMetadata = new chrome.cast.media.TvShowMediaMetadata(); - expect(tvShowMediaMetadata.episode).toBe(null); - expect(tvShowMediaMetadata.episodeNumber).toBe(null); - expect(tvShowMediaMetadata.episodeTitle).toBe(null); - expect(tvShowMediaMetadata.images).toBe(null); + expect(tvShowMediaMetadata.episode).toBe(undefined); + expect(tvShowMediaMetadata.episodeNumber).toBe(undefined); + expect(tvShowMediaMetadata.episodeTitle).toBe(undefined); + expect(tvShowMediaMetadata.images).toBe(undefined); expect(tvShowMediaMetadata.metadataType).toBe(2); - expect(tvShowMediaMetadata.originalAirdate).toBe(null); - expect(tvShowMediaMetadata.releaseYear).toBe(null); - expect(tvShowMediaMetadata.season).toBe(null); - expect(tvShowMediaMetadata.seasonNumber).toBe(null); - expect(tvShowMediaMetadata.seriesTitle).toBe(null); - expect(tvShowMediaMetadata.title).toBe(null); + expect(tvShowMediaMetadata.originalAirdate).toBe(undefined); + expect(tvShowMediaMetadata.releaseYear).toBe(undefined); + expect(tvShowMediaMetadata.season).toBe(undefined); + expect(tvShowMediaMetadata.seasonNumber).toBe(undefined); + expect(tvShowMediaMetadata.seriesTitle).toBe(undefined); + expect(tvShowMediaMetadata.title).toBe(undefined); expect(tvShowMediaMetadata.type).toBe(2); }); });