Merge branch 'master' of https://codefirst.iut.uca.fr/git/jade.van_brabandt/Projet_IHM

Sources/Stim.Model/Game.cs

@@ -23,7 +23,7 @@ namespace Model
                 }
             }
         }
-        private string name;
+        private string name = default!;
 
         [DataMember]
         public string Description
@@ -39,7 +39,7 @@ namespace Model
                 }
             }
         }
-        private string description;
+        private string description = default!;
 
         [DataMember]
         public int Year
@@ -55,7 +55,7 @@ namespace Model
                 }
             }
         }
-        private int year;
+        private int year = default!;
 
         [DataMember]
         public string Cover
@@ -71,7 +71,7 @@ namespace Model
                 }
             }
         }
-        private string cover;
+        private string cover = default!;
 
         [DataMember]
         public ObservableCollection<string> Tags
@@ -112,7 +112,7 @@ namespace Model
                 }
             }
         }
-        private string lien;
+        private string lien = default!;
 
         public Game(string name, string description, int year, List<string> c_tags, string cover, string c_lien)
         {

Sources/Stim.Model/Manager.cs

@@ -1,4 +1,5 @@
 using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
 namespace Model
@@ -24,13 +25,13 @@ namespace Model
             IEnumerable<Game> retList;
             retList = GameList;
             if (filterName != null) retList = retList
-                .Where(game => game.Name.IndexOf(filterName, StringComparison.OrdinalIgnoreCase) >= 0
+                .Where(game => game.Name.Contains(filterName, StringComparison.OrdinalIgnoreCase)
                 );
             if (filterTag1 != null) retList = retList
-                .Where(game => game.Tags != null && game.Tags.Any(tag => tag != null && tag.IndexOf(filterTag1, StringComparison.OrdinalIgnoreCase) >= 0)
+                .Where(game => game.Tags != null && game.Tags.Any(tag => tag != null && tag.Contains(filterTag1, StringComparison.OrdinalIgnoreCase))
                 );
             if (filterTag2 != null) retList = retList
-                .Where(game => game.Tags != null && game.Tags.Any(tag => tag != null && tag.IndexOf(filterTag2, StringComparison.OrdinalIgnoreCase) >= 0)
+                .Where(game => game.Tags != null && game.Tags.Any(tag => tag != null && tag.Contains(filterTag2, StringComparison.OrdinalIgnoreCase))
                 );
             return retList;
         }
@@ -51,7 +52,7 @@ namespace Model
             gameList.Remove(game);
             mgrpersistance.SaveGame(gameList);
         }
-
+        [ExcludeFromCodeCoverage]
         public void SaveGames()
         {
             mgrpersistance.SaveGame(gameList);
@@ -64,6 +65,7 @@ namespace Model
             }
             return null;
         }
+        [ExcludeFromCodeCoverage]
         public void SaveUser()
         {
             mgrpersistance.SaveUser(Users);

Sources/Stim.Model/User.cs

@@ -10,6 +10,17 @@ namespace Model
     [DataContract]
     public sealed class User : INotifyPropertyChanged , IEquatable<User>
     {
+        [DataMember]
+        public string UserImage
+        {
+            get => userImage;
+            private set
+            {
+                if (!string.IsNullOrWhiteSpace(value)) userImage = value;
+                else userImage = "no_cover.png";
+            }
+        }
+        private string userImage = default!;
         [DataMember]
         public string? Username
         {
@@ -24,11 +35,11 @@ namespace Model
                 }
             }
         }
-        private string username;
+        private string username=default!;
         [DataMember]
         public string Biographie 
         {
-            get => biographie ?? "Pas de biographie"; 
+            get => biographie; 
             private set
             {
                 if (string.IsNullOrWhiteSpace(value)) biographie = "Pas de biographie";
@@ -39,7 +50,7 @@ namespace Model
                 }
             }
         }
-        private string biographie;
+        private string biographie = default!;
         [DataMember]
         public string Email
         {
@@ -55,7 +66,7 @@ namespace Model
                 else email = "Default";
             }
         }
-        private string email;
+        private string email = default!;
         [DataMember]
         public string Password
         {
@@ -71,7 +82,7 @@ namespace Model
                 }
             }
         }
-        private string password;
+        private string password = default!;
 
         public event PropertyChangedEventHandler? PropertyChanged;
 
@@ -89,17 +100,6 @@ namespace Model
             get;
             private init;
         }
-        [DataMember]
-        public string? UserImage 
-        {   
-            get => userImage;
-            private set
-            {
-                if (!string.IsNullOrWhiteSpace(value)) userImage = value;
-                else userImage = "no_cover.png";
-            }
-        }
-        private string? userImage;
 
         public User(string userImage,string username, string biographie, string email, string password)
         {
@@ -111,7 +111,7 @@ namespace Model
             else Biographie = biographie;
             if (email == null) Email = "Default";
             else Email = email;
-            if (password == null) throw new ArgumentNullException("password");
+            if (password == null) throw new ArgumentNullException(nameof(password));
             else Password = password;
             Followed_Games = new ObservableCollection<Game>();
         }

Sources/Stub/Stub.cs

@@ -7,16 +7,11 @@ namespace StimStub
     [ExcludeFromCodeCoverage]
     public class Stub : IPersistance
     {
-        public List<Game> Games
+        public List<Game> Games { get; set; }
-        {
-            get { return games; }
-            set { games = value; }
-        }
-        private List<Game> games;
 
         public Stub()
         {
-            Games = LoadGame();
+            Games = LoadGame() ?? new();
         }
 
         public void SaveGame(List<Game> games)

Sources/TestProject1/TestManager.cs

@@ -121,7 +121,8 @@ namespace Test
 
             compListAsList = compList.ToList();
             compListAsList.Clear();
-            compList = compListAsList; list = manager.FilterGames("Elden Ring", "Action", "Solo");
+            compList = compListAsList;
+            list = manager.FilterGames("Elden Ring", "Action", "Solo");
             foreach (var game in manager.GameList)
             {
                 if (game.Name=="Elden Ring" && game.Tags.Any(tag => tag == "Action" && game.Tags.Any(tag => tag == "Solo")))
@@ -133,6 +134,31 @@ namespace Test
                 }
             }
             Assert.Equal(compList, list);
+            list = manager.FilterGames(null, "Action", "Solo");
+            compListAsList = compList.ToList();
+            compListAsList.Clear();
+            compList = compListAsList;
+            compList = compListAsList; list = manager.FilterGames("Elden Ring", "Action", null);
+            foreach (var game in manager.GameList)
+            {
+                if (game.Name == "Elden Ring" && game.Tags.Any(tag => tag == "Action"))
+                {
+                    compListAsList = compList.ToList();
+                    compListAsList.Add(game);
+                    compList = compListAsList;
+                    break;
+                }
+            }
+            Assert.Equal(compList, list);
+        }
+        [Fact]
+        public void Search()
+        {
+            IPersistance persistance = new Stub();
+            Manager manager = new(persistance);
+            User user = new(null, "username", "biographie", "adresse.mail@gmail.com", "Azerty123*");
+            manager.AddUsertoUserList(user);
+            Assert.Equal(user, manager.SearchUser("username"));
         }
     }
 }

Sources/TestProject1/TestUser.cs

@@ -108,5 +108,10 @@ namespace Test
             Assert.False(user.Equals(user4 as object));
             Assert.False(user.Equals(user2 as object));
         }
+        [Fact]
+        public void Hashcode()
+        {
+            User user = new("userimage", "username", "biographie", "adresse.mail@gmail.com", "Azerty123*");
+        }
     }
 }