diff --git a/Sources/Console/Program.cs b/Sources/Console/Program.cs index fb87e4e..4c93076 100644 --- a/Sources/Console/Program.cs +++ b/Sources/Console/Program.cs @@ -1,6 +1,6 @@ using Model; - +Console.WriteLine("---"); // See https://aka.ms/new-console-template for more information /*Album a = new Album("Adios Bahamas", "album1.jpg", "Népal"); diff --git a/Sources/Linaris/FooterPage.xaml.cs b/Sources/Linaris/FooterPage.xaml.cs index a36c9e9..8176381 100644 --- a/Sources/Linaris/FooterPage.xaml.cs +++ b/Sources/Linaris/FooterPage.xaml.cs @@ -9,7 +9,7 @@ public partial class FooterPage : ContentView System.Timers.Timer timer; bool changementManuel = true; bool closing = false; - string morceauEnCours; + // string morceauEnCours; public FooterPage() { diff --git a/Sources/Model/Album.cs b/Sources/Model/Album.cs index 7dab8f9..32a57eb 100644 --- a/Sources/Model/Album.cs +++ b/Sources/Model/Album.cs @@ -40,7 +40,16 @@ set { - if (value != null && value.Contains('.')) + if (value == null || !value.Contains('.')) + { + value = "none.png"; + imageURL = value; + } + if (value.Contains(' ')) + { + imageURL = value.Replace(' ', '\\'); + } + if (value.Contains('.')) { imageURL = value; } diff --git a/Sources/TestUnitaires/TU_Album.cs b/Sources/TestUnitaires/TU_Album.cs index 13861be..3c7966a 100644 --- a/Sources/TestUnitaires/TU_Album.cs +++ b/Sources/TestUnitaires/TU_Album.cs @@ -7,8 +7,8 @@ namespace TestUnitaires public class TU_Album { [Theory] - [InlineData("Fenêtre sur Rue","album2.jpg","Un banger","Sortie : 2012")] - [InlineData("Adios Bahamas", "album. jpg", "Un banger", "Sortie : 2012")] + [InlineData("Fenêtre sur Rue","album2. jpg","Un banger","Sortie : 2012")] + [InlineData("Adios Bahamas", "album.jpg", "Un banger", "Sortie : 2012")] [InlineData(null, "album2.jpg", "Un banger", "Sortie : 2012")] [InlineData("Dans La Légende", null, "Un banger", "Sortie : 2012")] [InlineData("Dans La Légende","album1.jpg", null, "Sortie : 2012")] @@ -16,12 +16,12 @@ namespace TestUnitaires [InlineData("Dans La Légende", "album1jpg", "Un banger", "Sortie : 2012")] public void TU_Attributes(string nameAlbum, string url, string desc, string info) { - Assert.True(nameAlbum != null && nameAlbum.Length < 75); - Assert.True(url != null && url.Contains('.')); - Assert.False(url.Contains(' ')); - Assert.True(desc != null && desc.Length < 500); - Assert.True(info != null && info.Length < 500); - + Album album = new Album(nameAlbum, url, new Artiste("test"), desc, info); + Assert.True(album.Name != null && album.Name.Length < 75); + Assert.True(album.ImageURL != null && album.ImageURL.Contains('.')); + Assert.False(album.ImageURL.Contains(' ')); + Assert.True(album.Description != null && album.Description.Length < 500); + Assert.True(album.Information != null && album.Information.Length < 500); } }