From d19d4c7d25f28856d42c5b7c05a46f5302209700 Mon Sep 17 00:00:00 2001 From: Corentin LEMAIRE Date: Wed, 3 May 2023 18:42:58 +0200 Subject: [PATCH] Enhance Stub by creating stub classes --- Sources/Model/Album.cs | 2 +- Sources/Model/Artist.cs | 2 +- Sources/Model/Artiste.cs | 32 ------------------- Sources/Model/InfoTitle.cs | 2 +- Sources/Model/Manager.cs | 10 +++--- Sources/Model/Playlist.cs | 4 +-- Sources/Model/Stub/StubAlbum.cs | 6 ++++ Sources/Model/Stub/StubArtist.cs | 6 ++++ Sources/Model/Stub/StubCustomTitle.cs | 6 ++++ Sources/Model/Stub/StubInfoTitle.cs | 6 ++++ .../Model/Stub/{Stub.cs => StubManager.cs} | 12 +++---- Sources/Model/Stub/StubPlaylist.cs | 6 ++++ Sources/Model/Stub/StubTitle.cs | 6 ++++ 13 files changed, 52 insertions(+), 48 deletions(-) delete mode 100644 Sources/Model/Artiste.cs create mode 100644 Sources/Model/Stub/StubAlbum.cs create mode 100644 Sources/Model/Stub/StubArtist.cs create mode 100644 Sources/Model/Stub/StubCustomTitle.cs create mode 100644 Sources/Model/Stub/StubInfoTitle.cs rename Sources/Model/Stub/{Stub.cs => StubManager.cs} (90%) create mode 100644 Sources/Model/Stub/StubPlaylist.cs create mode 100644 Sources/Model/Stub/StubTitle.cs diff --git a/Sources/Model/Album.cs b/Sources/Model/Album.cs index 4ef7959..a2beba3 100644 --- a/Sources/Model/Album.cs +++ b/Sources/Model/Album.cs @@ -38,7 +38,7 @@ { get { - return Titles; + return titles.ToList(); } } diff --git a/Sources/Model/Artist.cs b/Sources/Model/Artist.cs index c638dfd..a5b8e48 100644 --- a/Sources/Model/Artist.cs +++ b/Sources/Model/Artist.cs @@ -23,7 +23,7 @@ public class Artist { get { - return albums; + return albums.ToList(); } } diff --git a/Sources/Model/Artiste.cs b/Sources/Model/Artiste.cs deleted file mode 100644 index bcab081..0000000 --- a/Sources/Model/Artiste.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace Model; - -public class Artiste -{ - public string Name - { - get => name; - - set - { - if (value != null && value.Length < 75) - { - name = value; - } - } - } - - private string name = "Unknown"; - - public IEnumerable Albums { get; set; } - - public Artiste(string name) - { - Name = name; - Albums = new List(); - } - - public void AddAlbum(Album album) - { - Albums.Prepend(album); - } -} diff --git a/Sources/Model/InfoTitle.cs b/Sources/Model/InfoTitle.cs index 8df3a81..2c6b46a 100644 --- a/Sources/Model/InfoTitle.cs +++ b/Sources/Model/InfoTitle.cs @@ -25,7 +25,7 @@ public class InfoTitle : Title { get { - return feat; + return feat.ToList(); } } diff --git a/Sources/Model/Manager.cs b/Sources/Model/Manager.cs index e6f11e9..02bb855 100644 --- a/Sources/Model/Manager.cs +++ b/Sources/Model/Manager.cs @@ -10,7 +10,7 @@ public class Manager { get { - return albums; + return albums.ToList(); } } @@ -20,7 +20,7 @@ public class Manager { get { - return titles; + return titles.ToList(); } } @@ -30,7 +30,7 @@ public class Manager { get { - return playlists; + return playlists.ToList(); } } @@ -40,13 +40,13 @@ public class Manager { get { - return artists; + return artists.ToList(); } } public Manager() { - DataManager = new Stub(); + DataManager = new StubManager(); albums = DataManager.GetAlbums(); titles = DataManager.GetTitles(); diff --git a/Sources/Model/Playlist.cs b/Sources/Model/Playlist.cs index 53265b7..3d30732 100644 --- a/Sources/Model/Playlist.cs +++ b/Sources/Model/Playlist.cs @@ -37,7 +37,7 @@ public class Playlist public IEnumerable Morceaux { get { - return morceaux; + return morceaux.ToList(); } } @@ -93,7 +93,7 @@ public class Playlist { get { - return played; + return played.ToList(); } } diff --git a/Sources/Model/Stub/StubAlbum.cs b/Sources/Model/Stub/StubAlbum.cs new file mode 100644 index 0000000..396733b --- /dev/null +++ b/Sources/Model/Stub/StubAlbum.cs @@ -0,0 +1,6 @@ +namespace Model.Stub; + +public class StubAlbum +{ + +} diff --git a/Sources/Model/Stub/StubArtist.cs b/Sources/Model/Stub/StubArtist.cs new file mode 100644 index 0000000..ef769b1 --- /dev/null +++ b/Sources/Model/Stub/StubArtist.cs @@ -0,0 +1,6 @@ +namespace Model.Stub; + +public class StubArtist +{ + +} diff --git a/Sources/Model/Stub/StubCustomTitle.cs b/Sources/Model/Stub/StubCustomTitle.cs new file mode 100644 index 0000000..b49a895 --- /dev/null +++ b/Sources/Model/Stub/StubCustomTitle.cs @@ -0,0 +1,6 @@ +namespace Model.Stub; + +public class StubCustomTitle +{ + +} diff --git a/Sources/Model/Stub/StubInfoTitle.cs b/Sources/Model/Stub/StubInfoTitle.cs new file mode 100644 index 0000000..8dbade2 --- /dev/null +++ b/Sources/Model/Stub/StubInfoTitle.cs @@ -0,0 +1,6 @@ +namespace Model.Stub; + +public class StubInfoTitle +{ + +} diff --git a/Sources/Model/Stub/Stub.cs b/Sources/Model/Stub/StubManager.cs similarity index 90% rename from Sources/Model/Stub/Stub.cs rename to Sources/Model/Stub/StubManager.cs index 672bdd4..4642fcd 100644 --- a/Sources/Model/Stub/Stub.cs +++ b/Sources/Model/Stub/StubManager.cs @@ -1,6 +1,6 @@ namespace Model.Stub; -public class Stub : IDataManager +public class StubManager : IDataManager { private List<Artist> artists = new List<Artist>(); @@ -9,7 +9,7 @@ public class Stub : IDataManager { get { - return artists; + return artists.ToList(); } } @@ -19,7 +19,7 @@ public class Stub : IDataManager { get { - return albums; + return albums.ToList(); } } @@ -29,7 +29,7 @@ public class Stub : IDataManager { get { - return playlists; + return playlists.ToList(); } } @@ -39,11 +39,11 @@ public class Stub : IDataManager { get { - return titles; + return titles.ToList(); } } - public Stub() + public StubManager() { Artist Artiste1 = new Artist("Critien"); Artist Artiste2 = new Artist("Gouriet"); diff --git a/Sources/Model/Stub/StubPlaylist.cs b/Sources/Model/Stub/StubPlaylist.cs new file mode 100644 index 0000000..b07415c --- /dev/null +++ b/Sources/Model/Stub/StubPlaylist.cs @@ -0,0 +1,6 @@ +namespace Model.Stub; + +public class StubPlaylist +{ + +} diff --git a/Sources/Model/Stub/StubTitle.cs b/Sources/Model/Stub/StubTitle.cs new file mode 100644 index 0000000..f403fe9 --- /dev/null +++ b/Sources/Model/Stub/StubTitle.cs @@ -0,0 +1,6 @@ +namespace Model.Stub; + +public class StubTitle +{ + +}