From 39e061bb608a1856854eec70b2ff79aa6ccad5ba Mon Sep 17 00:00:00 2001 From: BelsethUwU Date: Mon, 22 May 2023 19:51:36 +0200 Subject: [PATCH 1/2] Feat : Review | Fix : Coverage Test --- Sources/Stim.Model/Review.cs | 5 ++--- Sources/Stim.Model/User.cs | 11 ++++++++--- Sources/TestProject1/TestGame.cs | 33 ++++++++++++++++---------------- Sources/TestProject1/TestUser.cs | 23 +++++++++++++++++----- 4 files changed, 45 insertions(+), 27 deletions(-) diff --git a/Sources/Stim.Model/Review.cs b/Sources/Stim.Model/Review.cs index 75ee176..5cf3b90 100644 --- a/Sources/Stim.Model/Review.cs +++ b/Sources/Stim.Model/Review.cs @@ -48,10 +48,9 @@ namespace Model } private string authorName; - public Review(/*string username,*/ float rate, string text) + public Review(string username, float rate, string text) { - //AuthorName = username; - AuthorName = authorName; + AuthorName = username; Rate = rate; Text = text; } diff --git a/Sources/Stim.Model/User.cs b/Sources/Stim.Model/User.cs index 640f649..afec974 100644 --- a/Sources/Stim.Model/User.cs +++ b/Sources/Stim.Model/User.cs @@ -66,16 +66,21 @@ namespace Model Email = email; Password = password; Followed_Games = new List(); + Role = 0; } public void AddReview(Game game, float rate, string text) { - game.AddReview(new Review(/*username,*/ rate, text)); + game.AddReview(new Review(username, rate, text)); } public void RemoveSelfReview(Game game, float rate, string text) { - foreach (Review review in game.Reviews) + for (int i = game.Reviews.Count - 1; i >= 0; i--) { - if (review.Rate == rate && review.Text == text && review.AuthorName == username) game.RemoveReview(review); + Review review = game.Reviews[i]; + if (review.Rate == rate && review.Text == text && review.AuthorName == username) + { + game.RemoveReview(review); + } } } public void FollowAGame(Game game) diff --git a/Sources/TestProject1/TestGame.cs b/Sources/TestProject1/TestGame.cs index 5396251..070ec45 100644 --- a/Sources/TestProject1/TestGame.cs +++ b/Sources/TestProject1/TestGame.cs @@ -72,13 +72,13 @@ namespace Test [Fact] public void AddReview() { - Review r1 = new(2.5f, "cool"), r2 = new(4, "tres cool"), r3 = new(1, "pas cool"); + User user = new("username", "biographie", "email@email.com", "password"); Game game = new("name", "description", 2012, new List {"1","2","3"}, "cover"); - game.AddReview(r1); - game.AddReview(r2); - game.AddReview(r3); + user.AddReview(game, 2.5f, "bof"); + user.AddReview(game, 4f, "bof++"); + user.AddReview(game, 3f, "bof+"); Assert.NotEmpty(game.Reviews); } @@ -86,16 +86,17 @@ namespace Test [Fact] public void RemoveReview() { - Review r1 = new(2.5f, "cool"), r2 = new(4, "tres cool"), r3 = new(1, "pas cool"); - + User user = new("username", "biographie", "email@email.com", "password"); + User user2 = new("username2", "biographie", "email2@email.com", "password"); Game game = new("name", "description", 2012, new List {"1","2","3"}, "cover"); - game.AddReview(r1); - game.AddReview(r2); - game.AddReview(r3); - game.RemoveReview(r2); - - Assert.DoesNotContain(r2, game.Reviews); + user.AddReview(game, 2.5f, "bof"); + user.AddReview(game, 4f, "bof++"); + user.AddReview(game, 3f, "bof+"); + user2.RemoveSelfReview(game, 2.5f, "bof"); + Assert.Equal(3, game.Reviews.Count); + user.RemoveSelfReview(game, 2.5f, "bof"); + Assert.Equal(2, game.Reviews.Count); } [Fact] @@ -140,13 +141,13 @@ namespace Test [Fact] public void Average() { - Review r1 = new(2.5f, "cool"), r2 = new(4, "tres cool"), r3 = new(1, "pas cool"); + User user = new("username", "biographie", "email@email.com", "password"); Game game = new("name", "description", 2012, new List {"1","2","3"}, "cover"); - game.AddReview(r1); - game.AddReview(r2); - game.AddReview(r3); + user.AddReview(game, 2.5f, "bof"); + user.AddReview(game, 0f, "bof--"); + user.AddReview(game, 5f, "bof++"); Assert.Equal(2.5f, game.GetAvgRate()); } diff --git a/Sources/TestProject1/TestUser.cs b/Sources/TestProject1/TestUser.cs index f8503bf..d6f2b46 100644 --- a/Sources/TestProject1/TestUser.cs +++ b/Sources/TestProject1/TestUser.cs @@ -26,7 +26,7 @@ namespace Test Assert.Null(user2.Username); } - /*[Fact] + [Fact] public void Biographie() { User user = new("username", "", "adresse.mail@gmail.com", "Azerty123*"); @@ -34,7 +34,12 @@ namespace Test User user2 = new("username", null, "adresse.mail@gmail.com", "Azerty123*"); Assert.Null(user2.Biographie); - }*/ + + User user3 = new("username", "biographie", "adresse.mail@gmail.com", "Azerty123*"); + + string biographieOfAnUser = user3.Biographie; + Assert.NotNull(biographieOfAnUser); + } [Fact] public void Email() @@ -73,13 +78,21 @@ namespace Test user.RemoveAGame(game); Assert.Empty(user.Followed_Games); } + [Fact] + public void Role() + { + User user = new("username", "biographie", "adresse.mail@gmail.com", "Azerty123*"); + Assert.Equal(0,user.Role); - /* + int Perm = user.Role; + Assert.True(user.Role == Perm); + } + [Fact] public void ReviewAddingAndRemovingFromAGameViaUser() { User user = new("username", "biographie", "adresse.mail@gmail.com", "Azerty123*"); - Game game = new("name", "description", 2012, new string[] { "1", "2", "3" }); + Game game = new("name", "description", 2012, new List { "1", "2", "3" },"cover"); Assert.NotNull(user); Assert.NotNull(game); @@ -90,6 +103,6 @@ namespace Test user.RemoveSelfReview(game, 2.5f, "UwU"); Assert.Empty(game.Reviews); } - */ + } } From 646375113138c808ca7d4c5cfa8e59b2fe4a4e11 Mon Sep 17 00:00:00 2001 From: BelsethUwU Date: Mon, 22 May 2023 20:09:42 +0200 Subject: [PATCH 2/2] Fix : Test coverage --- Sources/Stim.Model/Game.cs | 22 ++++++++++++++++------ Sources/TestProject1/TestGame.cs | 20 +++++++++++++++----- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/Sources/Stim.Model/Game.cs b/Sources/Stim.Model/Game.cs index bb29b01..6f9e2ff 100644 --- a/Sources/Stim.Model/Game.cs +++ b/Sources/Stim.Model/Game.cs @@ -13,7 +13,7 @@ namespace Model get { return name; } private set { - if (string.IsNullOrWhiteSpace(value)) return; + if (string.IsNullOrWhiteSpace(value)) name="Default"; name = value; } } @@ -25,7 +25,7 @@ namespace Model get { return description; } private set { - if (string.IsNullOrWhiteSpace(value)) return; + if (string.IsNullOrWhiteSpace(value)) description="Default"; description = value; } } @@ -49,7 +49,7 @@ namespace Model get => cover; set { - if (string.IsNullOrWhiteSpace(value)) return; + if (string.IsNullOrWhiteSpace(value)) cover = "Default"; cover = value; } } @@ -75,18 +75,28 @@ namespace Model public Game() { + Name = "Default"; + Description = "Default"; + Cover = "Default"; + Year = 2023; + tags = new ObservableCollection(); Reviews = new List(); Average = 0; } public Game(string name, string description, int year, List c_tags, string cover) { - Name = name; - Description = description; + if (name is null) Name = "Default"; + else Name= name; + if (description is null) Description = "Default"; + else Description = description; Year = year; if (c_tags != null) tags = new ObservableCollection(c_tags); else tags = new ObservableCollection(); - Cover = cover; + if (cover is null) + Cover = "Default"; + else + Cover = cover; Reviews = new List(); Average = 0; } diff --git a/Sources/TestProject1/TestGame.cs b/Sources/TestProject1/TestGame.cs index 070ec45..7491db0 100644 --- a/Sources/TestProject1/TestGame.cs +++ b/Sources/TestProject1/TestGame.cs @@ -10,6 +10,8 @@ namespace Test Game game = new("game", "description", 2012, new List {"1","2","3"}, "cover"); Assert.NotNull(game); + Game game2 = new(); + Assert.NotNull(game2); } [Fact] @@ -17,24 +19,30 @@ namespace Test { Game game = new("", "description", 2012, new List {"1","2","3"}, "cover"); - Assert.Null(game.Name); + Assert.True(game.Name == ""); Game game2 = new(null, "description", 2012, new List {"1","2","3"}, "cover"); - Assert.Null(game2.Name); + Assert.True(game2.Name == "Default"); Game game3 = new("good", "description", 2012, new List {"1","2","3"}, "cover"); Assert.Equal("good", game3.Name); } - + [Fact] + public void Cover() + { + Game game = new("game", "description", 2012, new List { "1", "2", "3" }, "cover"); + string coverofgame= game.Cover; + Assert.True(coverofgame == game.Cover); + } [Fact] public void Description() { Game game = new("name", "", 2012, new List {"1","2","3"}, "cover"); - Assert.Null(game.Description); + Assert.True(game.Description == ""); Game game2 = new("name", null, 2012, new List {"1","2","3"}, "cover"); - Assert.Null(game2.Description); + Assert.True(game2.Description=="Default"); Game game3 = new("name", "good", 2012, new List {"1","2","3"}, "cover"); Assert.Equal("good", game3.Description); @@ -136,6 +144,8 @@ namespace Test game.NameChange("newName"); game.TagChange(new List { "1", "2" }); Assert.Equal(3, game.Tags.Count); + game.TagChange(null); + Assert.Equal(3, game.Tags.Count); } [Fact]