fix : là ça marche

Popup_qui_marche_pas
Jade VAN BRABANDT 2 years ago
parent 93d48f0f1d
commit fbab278a3e

@ -5,4 +5,4 @@ using System.Collections.ObjectModel;
Manager stub = new(new Stub()); Manager stub = new(new Stub());
Manager persistance = new(new Persistance("../../../../")); Manager persistance = new(new Persistance("../../../../"));
persistance._persistance.SaveGame(stub.GameList); persistance.Mgrpersistance.SaveGame(stub.GameList);

@ -4,52 +4,52 @@ namespace Model
{ {
public class User public class User
{ {
public string? Username public string Username
{ {
get => username; get => username;
private set private set
{ {
if (string.IsNullOrWhiteSpace(value)) return; if (string.IsNullOrWhiteSpace(value)) value = "Default";
username = value; username = value;
} }
} }
private string? username; private string username;
public string? Biographie public string Biographie
{ {
get => biographie; get => biographie;
private set private set
{ {
if (string.IsNullOrWhiteSpace(value)) return; if (string.IsNullOrWhiteSpace(value)) value = "Default";
biographie = value; biographie = value;
} }
} }
private string? biographie; private string biographie;
public string? Email public string Email
{ {
get => email; get => email;
private set private set
{ {
Regex rg_email = new Regex("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$"); 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; email = value;
return; else email = "Default";
} }
} }
private string? email; private string email;
public string? Password public string Password
{ {
get => password; get => password;
private set private set
{ {
Regex rg = new Regex("^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,32}$"); 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; password = value;
} }
} }
private string? password; private string password;
//public int Role { get; } //public int Role { get; }
//private int role; //private int role;
@ -63,11 +63,11 @@ namespace Model
{ {
if (username == null) Username = "Default"; if (username == null) Username = "Default";
else Username = username; else Username = username;
if (biographie == null) biographie = "Default"; if (biographie == null) Biographie = "Default";
else Biographie = biographie; else Biographie = biographie;
if (email == null) email = "Default"; if (email == null) Email = "Default";
else Email = email; else Email = email;
if (password == null) password = "Default"; if (password == null) Password = "Default";
else Password = password; else Password = password;
Followed_Games = new List<Game>(); Followed_Games = new List<Game>();
//Role = 0; //Role = 0;

@ -15,48 +15,48 @@ namespace Test
public void Username() public void Username()
{ {
User user = new("", "biographie", "adresse.mail@gmail.com", "Azerty123*"); 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*"); User user2 = new(null, "biographie", "adresse.mail@gmail.com", "Azerty123*");
Assert.Null(user2.Username); Assert.Equal("Default",user2.Username);
} }
[Fact] [Fact]
public void Biographie() public void Biographie()
{ {
User user = new("username", "", "adresse.mail@gmail.com", "Azerty123*"); 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*"); 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*"); User user3 = new("username", "biographie", "adresse.mail@gmail.com", "Azerty123*");
string biographieOfAnUser = user3.Biographie; string biographieOfAnUser = user3.Biographie;
Assert.NotNull(biographieOfAnUser); Assert.Equal("biographie", biographieOfAnUser);
} }
[Fact] [Fact]
public void Email() public void Email()
{ {
User user = new("username", "biographie", "", "Azerty123*"); User user = new("username", "biographie", "", "Azerty123*");
Assert.Null(user.Email); Assert.Equal("Default", user.Email);
User user2 = new("username", "biographie", null, "Azerty123*"); User user2 = new("username", "biographie", null, "Azerty123*");
Assert.Null(user2.Email); Assert.Equal("Default", user2.Email);
} }
[Fact] [Fact]
public void Password() public void Password()
{ {
User user = new("username", "biographie", "adresse.mail@gmail.com", ""); 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); 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"); User user3 = new("username", "biographie", "adresse.mail@gmail.com", "54az6e");
Assert.Null(user3.Password); Assert.Equal("Default", user3.Password);
} }
[Fact] [Fact]

Loading…
Cancel
Save