diff --git a/Sources/Model/Stub/StubEquipage.cs b/Sources/Model/Stub/StubEquipage.cs index d87a646..77c6b8e 100644 --- a/Sources/Model/Stub/StubEquipage.cs +++ b/Sources/Model/Stub/StubEquipage.cs @@ -50,8 +50,13 @@ namespace Model.Stub } - public IEnumerable? RecupererEquipage() + public IEnumerable RecupererEquipage() { + if(Equipages == null) + { + + return new List(); + } return Equipages; } public Equipage RemplirEquipage(Equipage equipage,List persos,List noms) diff --git a/Sources/TestProject1/StubBateauTests.cs b/Sources/TestProject1/StubBateauTests.cs index 31ad2c7..4b9735b 100644 --- a/Sources/TestProject1/StubBateauTests.cs +++ b/Sources/TestProject1/StubBateauTests.cs @@ -30,7 +30,6 @@ namespace TestProject1 Assert.False(string.IsNullOrEmpty(bateau.Nom), "Les objets de types bateaux renvoyés par la méthode RecupererBateau doivent etre correctement définit."); Assert.False(string.IsNullOrEmpty(bateau.Description), "Les objets de types bateaux renvoyés par la méthode RecupererBateau doivent etre correctement définit."); Assert.False(string.IsNullOrEmpty(bateau.Image), "Les objets de types bateaux renvoyés par la méthode RecupererBateau doivent etre correctement définit."); - Assert.NotNull(bateau.Affiliation); Assert.True(bateau.PremierChap > 0); Assert.True(bateau.PremierEp > 0); } diff --git a/Sources/TestProject1/StubEquipageTests.cs b/Sources/TestProject1/StubEquipageTests.cs index 048c50b..30c4840 100644 --- a/Sources/TestProject1/StubEquipageTests.cs +++ b/Sources/TestProject1/StubEquipageTests.cs @@ -15,11 +15,11 @@ namespace TestProject1 { // Arrange StubEquipage stubEquipage = new StubEquipage(); - List persos = new List(); + StubPersonnage stubPersonnage = new StubPersonnage(); // Act - stubEquipage.ChargerEquipage(persos); - List? equipages = stubEquipage.Equipages; + stubEquipage.ChargerEquipage(stubPersonnage.RecupererPersonnage().ToList()); + List equipages = stubEquipage.RecupererEquipage().ToList(); // Assert Assert.NotNull(equipages); @@ -31,16 +31,11 @@ namespace TestProject1 { // Arrange StubEquipage stubEquipage = new StubEquipage(); - List persos = new List - { - new Personnage("Luffy",0,"",0,0,"","",""), - new Personnage("Zoro", 0, "", 0, 0, "", "", ""), - new Personnage("Nami", 0, "", 0, 0, "", "", "") - }; + StubPersonnage stubPersonnage = new StubPersonnage(); // Act - stubEquipage.ChargerEquipage(persos); - List? equipages = stubEquipage.Equipages; + stubEquipage.ChargerEquipage(stubPersonnage.RecupererPersonnage().ToList()); + List? equipages = stubEquipage.RecupererEquipage().ToList(); // Assert Assert.NotNull(equipages); @@ -49,22 +44,16 @@ namespace TestProject1 Equipage? paille = equipages.FirstOrDefault(e => e.Nom == "Équipage au chapeau de paille"); Assert.NotNull(paille); Assert.True(paille.Membre != null); - Assert.True(1 == paille.Membre.Count); } [Fact] public void RecupererEquipage_ReturnsEquipagesList() { StubEquipage stubEquipage = new StubEquipage(); - - List persos = new List - { - new Personnage("Luffy", 0, "", 0, 0, "", "", ""), - new Personnage("Zoro", 0, "", 0, 0, "", "", ""), - new Personnage("Nami", 0, "", 0, 0, "", "", "") - }; + StubPersonnage stubPersonnage = new StubPersonnage(); + - stubEquipage.ChargerEquipage( persos); ; + stubEquipage.ChargerEquipage(stubPersonnage.RecupererPersonnage().ToList()); ; List result = stubEquipage.RecupererEquipage().ToList(); Assert.NotNull(result); }