jade.van_brabandt
/
Projet_IHM
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 3 Releases Wiki Activity

merge

Browse Source
Popup_qui_marche_pas
Anthony RICHARD 2 years ago
parent cb1f33f32b 6463751131
commit 7d08a555cc
4 changed files with 80 additions and 42 deletions
Show Stats Download Patch File Download Diff File

25
Sources/Stim.Model/Game.cs
Unescape View File

@ -9,7 +9,7 @@ namespace Model
public class Game : INotifyPropertyChanged public class Game : INotifyPropertyChanged
{ {
[DataMember] [DataMember]
public string? Name public string Name
{ {
get => name; get => name;
private set private set
@ -18,10 +18,10 @@ namespace Model
name = value; name = value;
} }
} }
private string? name; private string name;
[DataMember] [DataMember]
public string? Description public string Description
{ {
get => description; get => description;
private set private set
@ -30,7 +30,7 @@ namespace Model
description = value; description = value;
} }
} }
private string? description; private string description;
[DataMember] [DataMember]
public int Year public int Year
@ -45,7 +45,7 @@ namespace Model
private int year; private int year;
[DataMember] [DataMember]
public string? Cover public string Cover
{ {
get => cover; get => cover;
set set
@ -54,7 +54,7 @@ namespace Model
cover = value; cover = value;
} }
} }
private string? cover; private string cover;
[DataMember] [DataMember]
public ObservableCollection<string> Tags public ObservableCollection<string> Tags
@ -76,6 +76,10 @@ namespace Model
public Game() public Game()
{ {
Name = "Default";
Description = "Default";
Cover = "Default";
Year = 2023;
tags = new ObservableCollection<string>(); tags = new ObservableCollection<string>();
Reviews = new List<Review>(); Reviews = new List<Review>();
Average = 0; Average = 0;
@ -83,11 +87,16 @@ namespace Model
public Game(string name, string description, int year, List<string> c_tags, string cover) public Game(string name, string description, int year, List<string> c_tags, string cover)
{ {
Name = name; if (name is null) Name = "Default";
Description = description; else Name= name;
if (description is null) Description = "Default";
else Description = description;
Year = year; Year = year;
if (c_tags != null) tags = new ObservableCollection<string>(c_tags); if (c_tags != null) tags = new ObservableCollection<string>(c_tags);
else tags = new ObservableCollection<string>(); else tags = new ObservableCollection<string>();
if (cover is null)
Cover = "Default";
else
Cover = cover; Cover = cover;
Reviews = new List<Review>(); Reviews = new List<Review>();
Average = 0; Average = 0;

9
Sources/Stim.Model/User.cs
Unescape View File

@ -66,6 +66,7 @@ namespace Model
Email = email; Email = email;
Password = password; Password = password;
Followed_Games = new List<Game>(); Followed_Games = new List<Game>();
Role = 0;
} }
public void AddReview(Game game, float rate, string text) public void AddReview(Game game, float rate, string text)
{ {
@ -73,9 +74,13 @@ namespace Model
} }
public void RemoveSelfReview(Game game, float rate, string 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) public void FollowAGame(Game game)

51
Sources/TestProject1/TestGame.cs
Unescape View File

@ -19,24 +19,30 @@ namespace Test
{ {
Game game = new("", "description", 2012, new List<String> {"1","2","3"}, "cover"); Game game = new("", "description", 2012, new List<String> {"1","2","3"}, "cover");
Assert.Null(game.Name); Assert.True(game.Name == "");
Game game2 = new(null, "description", 2012, new List<String> {"1","2","3"}, "cover"); Game game2 = new(null, "description", 2012, new List<String> {"1","2","3"}, "cover");
Assert.Null(game2.Name); Assert.True(game2.Name == "Default");
Game game3 = new("good", "description", 2012, new List<String> {"1","2","3"}, "cover"); Game game3 = new("good", "description", 2012, new List<String> {"1","2","3"}, "cover");
Assert.Equal("good", game3.Name); Assert.Equal("good", game3.Name);
} }
[Fact]
public void Cover()
{
Game game = new("game", "description", 2012, new List<String> { "1", "2", "3" }, "cover");
string coverofgame= game.Cover;
Assert.True(coverofgame == game.Cover);
}
[Fact] [Fact]
public void Description() public void Description()
{ {
Game game = new("name", "", 2012, new List<String> {"1","2","3"}, "cover"); Game game = new("name", "", 2012, new List<String> {"1","2","3"}, "cover");
Assert.Null(game.Description); Assert.True(game.Description == "");
Game game2 = new("name", null, 2012, new List<String> {"1","2","3"}, "cover"); Game game2 = new("name", null, 2012, new List<String> {"1","2","3"}, "cover");
Assert.Null(game2.Description); Assert.True(game2.Description=="Default");
Game game3 = new("name", "good", 2012, new List<String> {"1","2","3"}, "cover"); Game game3 = new("name", "good", 2012, new List<String> {"1","2","3"}, "cover");
Assert.Equal("good", game3.Description); Assert.Equal("good", game3.Description);
@ -75,13 +81,13 @@ namespace Test
[Fact] [Fact]
public void AddReview() public void AddReview()
{ {
Review r1 = new("User 1", 2.5f, "cool"), r2 = new("User 2", 4, "tres cool"), r3 = new("User 3", 1, "pas cool"); User user = new("username", "biographie", "email@email.com", "password");
Game game = new("name", "description", 2012, new List<String> {"1","2","3"}, "cover"); Game game = new("name", "description", 2012, new List<String> {"1","2","3"}, "cover");
game.AddReview(r1); user.AddReview(game, 2.5f, "bof");
game.AddReview(r2); user.AddReview(game, 4f, "bof++");
game.AddReview(r3); user.AddReview(game, 3f, "bof+");
Assert.NotEmpty(game.Reviews); Assert.NotEmpty(game.Reviews);
} }
@ -89,16 +95,17 @@ namespace Test
[Fact] [Fact]
public void RemoveReview() public void RemoveReview()
{ {
Review r1 = new("User 1", 2.5f, "cool"), r2 = new("User 2", 4, "tres cool"), r3 = new("User 3", 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<String> {"1","2","3"}, "cover"); Game game = new("name", "description", 2012, new List<String> {"1","2","3"}, "cover");
game.AddReview(r1); user.AddReview(game, 2.5f, "bof");
game.AddReview(r2); user.AddReview(game, 4f, "bof++");
game.AddReview(r3); user.AddReview(game, 3f, "bof+");
game.RemoveReview(r2); user2.RemoveSelfReview(game, 2.5f, "bof");
Assert.Equal(3, game.Reviews.Count);
Assert.DoesNotContain(r2, game.Reviews); user.RemoveSelfReview(game, 2.5f, "bof");
Assert.Equal(2, game.Reviews.Count);
} }
[Fact] [Fact]
@ -138,18 +145,20 @@ namespace Test
game.NameChange("newName"); game.NameChange("newName");
game.TagChange(new List<String> { "1", "2" }); game.TagChange(new List<String> { "1", "2" });
Assert.Equal(3, game.Tags.Count); Assert.Equal(3, game.Tags.Count);
game.TagChange(null);
Assert.Equal(3, game.Tags.Count);
} }
[Fact] [Fact]
public void Average() public void Average()
{ {
Review r1 = new("User 1", 2.5f, "cool"), r2 = new("User 2", 4, "tres cool"), r3 = new("User 3", 1, "pas cool"); User user = new("username", "biographie", "email@email.com", "password");
Game game = new("name", "description", 2012, new List<String> {"1","2","3"}, "cover"); Game game = new("name", "description", 2012, new List<String> {"1","2","3"}, "cover");
game.AddReview(r1); user.AddReview(game, 2.5f, "bof");
game.AddReview(r2); user.AddReview(game, 0f, "bof--");
game.AddReview(r3); user.AddReview(game, 5f, "bof++");
Assert.Equal(2.5f, game.GetAvgRate()); Assert.Equal(2.5f, game.GetAvgRate());
} }

35
Sources/TestProject1/TestUser.cs
Unescape View File

@ -29,6 +29,11 @@ namespace Test
User user2 = new("username", null, "adresse.mail@gmail.com", "Azerty123*"); User user2 = new("username", null, "adresse.mail@gmail.com", "Azerty123*");
Assert.Null(user2.Biographie); Assert.Null(user2.Biographie);
User user3 = new("username", "biographie", "adresse.mail@gmail.com", "Azerty123*");
string biographieOfAnUser = user3.Biographie;
Assert.NotNull(biographieOfAnUser);
} }
[Fact] [Fact]
@ -68,21 +73,31 @@ namespace Test
user.RemoveAGame(game); user.RemoveAGame(game);
Assert.Empty(user.Followed_Games); 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] [Fact]
//public void ReviewAddingAndRemovingFromAGameViaUser() public void ReviewAddingAndRemovingFromAGameViaUser()
//{ {
// User user = new("username", "biographie", "adresse.mail@gmail.com", "Azerty123*"); 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<String> { "1", "2", "3" },"cover");
// Assert.NotNull(user); Assert.NotNull(user);
// Assert.NotNull(game); Assert.NotNull(game);
// user.AddReview(game, 2.5f,"UwU"); // user.AddReview(game, 2.5f,"UwU");
// Assert.Single(game.Reviews); // Assert.Single(game.Reviews);
// user.RemoveSelfReview(game, 2.5f, "UwU"); user.RemoveSelfReview(game, 2.5f, "UwU");
// Assert.Empty(game.Reviews); Assert.Empty(game.Reviews);
//} }
} }
} }

Write Preview
Loading…
Cancel
Save