From fbab278a3e4c1158c9febeb7650fb8797858453a Mon Sep 17 00:00:00 2001 From: Jade_VAN_BRABANDT Date: Tue, 30 May 2023 15:43:04 +0200 Subject: [PATCH] =?UTF-8?q?fix=20:=20l=C3=A0=20=C3=A7a=20marche?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/AppConsole/Program.cs | 2 +- Sources/Stim.Model/User.cs | 32 ++++++++++++++++---------------- Sources/TestProject1/TestUser.cs | 20 ++++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Sources/AppConsole/Program.cs b/Sources/AppConsole/Program.cs index f0ab41d..1ea3341 100644 --- a/Sources/AppConsole/Program.cs +++ b/Sources/AppConsole/Program.cs @@ -5,4 +5,4 @@ using System.Collections.ObjectModel; Manager stub = new(new Stub()); Manager persistance = new(new Persistance("../../../../")); -persistance._persistance.SaveGame(stub.GameList); \ No newline at end of file +persistance.Mgrpersistance.SaveGame(stub.GameList); \ No newline at end of file diff --git a/Sources/Stim.Model/User.cs b/Sources/Stim.Model/User.cs index 3c420f5..2cb6e1b 100644 --- a/Sources/Stim.Model/User.cs +++ b/Sources/Stim.Model/User.cs @@ -4,52 +4,52 @@ namespace Model { public class User { - public string? Username + public string Username { get => username; private set { - if (string.IsNullOrWhiteSpace(value)) return; + if (string.IsNullOrWhiteSpace(value)) value = "Default"; username = value; } } - private string? username; + private string username; - public string? Biographie + public string Biographie { get => biographie; private set { - if (string.IsNullOrWhiteSpace(value)) return; + if (string.IsNullOrWhiteSpace(value)) value = "Default"; biographie = value; } } - private string? biographie; + private string biographie; - public string? Email + public string Email { get => email; private set { Regex rg_email = new Regex("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$"); - if (!string.IsNullOrWhiteSpace(value) && rg_email.IsMatch(value)) + if (!(string.IsNullOrWhiteSpace(value)) && rg_email.IsMatch(value)) email = value; - return; + else email = "Default"; } } - private string? email; + private string email; - public string? Password + public string Password { get => password; private set { Regex rg = new Regex("^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,32}$"); - if (string.IsNullOrWhiteSpace(value) || !rg.IsMatch(value)) return; + if (string.IsNullOrWhiteSpace(value) || !rg.IsMatch(value)) value="Default"; password = value; } } - private string? password; + private string password; //public int Role { get; } //private int role; @@ -63,11 +63,11 @@ namespace Model { if (username == null) Username = "Default"; else Username = username; - if (biographie == null) biographie = "Default"; + if (biographie == null) Biographie = "Default"; else Biographie = biographie; - if (email == null) email = "Default"; + if (email == null) Email = "Default"; else Email = email; - if (password == null) password = "Default"; + if (password == null) Password = "Default"; else Password = password; Followed_Games = new List(); //Role = 0; diff --git a/Sources/TestProject1/TestUser.cs b/Sources/TestProject1/TestUser.cs index de8a556..d3346eb 100644 --- a/Sources/TestProject1/TestUser.cs +++ b/Sources/TestProject1/TestUser.cs @@ -15,48 +15,48 @@ namespace Test public void Username() { User user = new("", "biographie", "adresse.mail@gmail.com", "Azerty123*"); - Assert.Null(user.Username); + Assert.Equal("Default", user.Username); User user2 = new(null, "biographie", "adresse.mail@gmail.com", "Azerty123*"); - Assert.Null(user2.Username); + Assert.Equal("Default",user2.Username); } [Fact] public void Biographie() { User user = new("username", "", "adresse.mail@gmail.com", "Azerty123*"); - Assert.Null(user.Biographie); + Assert.Equal("Default", user.Biographie); User user2 = new("username", null, "adresse.mail@gmail.com", "Azerty123*"); - Assert.Null(user2.Biographie); + Assert.Equal("Default", user2.Biographie); User user3 = new("username", "biographie", "adresse.mail@gmail.com", "Azerty123*"); string biographieOfAnUser = user3.Biographie; - Assert.NotNull(biographieOfAnUser); + Assert.Equal("biographie", biographieOfAnUser); } [Fact] public void Email() { User user = new("username", "biographie", "", "Azerty123*"); - Assert.Null(user.Email); + Assert.Equal("Default", user.Email); User user2 = new("username", "biographie", null, "Azerty123*"); - Assert.Null(user2.Email); + Assert.Equal("Default", user2.Email); } [Fact] public void Password() { User user = new("username", "biographie", "adresse.mail@gmail.com", ""); - Assert.Null(user.Password); + Assert.Equal("Default",user.Password); User user2 = new("username", "biographie", "adresse.mail@gmail.com", null); - Assert.Null(user2.Password); + Assert.Equal("Default", user2.Password); User user3 = new("username", "biographie", "adresse.mail@gmail.com", "54az6e"); - Assert.Null(user3.Password); + Assert.Equal("Default", user3.Password); } [Fact]