Fix : Croisade contre les code smells et désolée je niques un peu le réseau là
continuous-integration/drone/push Build is passing Details

Popup_qui_marche_pas
Jade VAN BRABANDT 2 years ago
parent 5aad8b81b5
commit 24d98d8603

@ -7,12 +7,12 @@ using System.Text;
namespace Model namespace Model
{ {
[DataContract] [DataContract]
public class Game : INotifyPropertyChanged, IEquatable<Game> public sealed class Game : INotifyPropertyChanged, IEquatable<Game>
{ {
[DataMember] [DataMember]
public string Name public string Name
{ {
get => name ?? "Default"; get => name;
private set private set
{ {
if (string.IsNullOrWhiteSpace(value)) name="Default"; if (string.IsNullOrWhiteSpace(value)) name="Default";
@ -28,7 +28,7 @@ namespace Model
[DataMember] [DataMember]
public string Description public string Description
{ {
get => description ?? "Pas de description"; get => description;
private set private set
{ {
if (string.IsNullOrWhiteSpace(value)) return; if (string.IsNullOrWhiteSpace(value)) return;
@ -60,7 +60,7 @@ namespace Model
[DataMember] [DataMember]
public string Cover public string Cover
{ {
get => cover ?? "no_cover.png"; get => cover;
private set private set
{ {
if (string.IsNullOrWhiteSpace(value)) cover="no_cover.png"; if (string.IsNullOrWhiteSpace(value)) cover="no_cover.png";
@ -101,7 +101,7 @@ namespace Model
[DataMember] [DataMember]
public string Lien { public string Lien {
get => lien ?? "Pas de lien"; get => lien;
private set private set
{ {
if (string.IsNullOrWhiteSpace(value)) return; if (string.IsNullOrWhiteSpace(value)) return;

@ -8,7 +8,7 @@ using System.Text.RegularExpressions;
namespace Model namespace Model
{ {
[DataContract] [DataContract]
public class User : INotifyPropertyChanged , IEquatable<User> public sealed class User : INotifyPropertyChanged , IEquatable<User>
{ {
[DataMember] [DataMember]
public string? Username public string? Username
@ -63,7 +63,7 @@ namespace Model
private set private set
{ {
Regex rg = new Regex("^(?=.*[A-Za-z])(?=.*[0-9@$!%*#?&])[A-Za-z-0-9@$!%*#?&]{8,}$"); Regex rg = new Regex("^(?=.*[A-Za-z])(?=.*[0-9@$!%*#?&])[A-Za-z-0-9@$!%*#?&]{8,}$");
if (string.IsNullOrWhiteSpace(value) || !rg.IsMatch(value)) throw new ArgumentNullException("password"); if (string.IsNullOrWhiteSpace(value) || !rg.IsMatch(value)) throw new ArgumentNullException(value);
else else
{ {
password = value; password = value;

@ -172,7 +172,7 @@ namespace Test
{ {
Game game = new("name", "description", 2012, new List<String> { "1", "2", "3" }, "cover", "www.link.com"); Game game = new("name", "description", 2012, new List<String> { "1", "2", "3" }, "cover", "www.link.com");
Game game2 = new("name2", "description", 2020, new List<String> { "1" }, "cover2", "www.link.com"); Game game2 = new("name2", "description", 2020, new List<String> { "1" }, "cover2", "www.link.com");
Game game3 = null; Game? game3 = null;
string game4 = ""; string game4 = "";
Assert.False(game.Equals(game2 as Game)); Assert.False(game.Equals(game2 as Game));

@ -100,8 +100,7 @@ namespace Test
User user = new("userimage", "username", "biographie", "adresse.mail@gmail.com", "Azerty123*"); User user = new("userimage", "username", "biographie", "adresse.mail@gmail.com", "Azerty123*");
User user2 = new("userimage", "username2", "biographie", "adresse.mail@gmail.com", "Azerty123*"); User user2 = new("userimage", "username2", "biographie", "adresse.mail@gmail.com", "Azerty123*");
User user3 = new("userimage", "username", "biographie", "adresse.mail@gmail.com", "Azerty123*"); User user3 = new("userimage", "username", "biographie", "adresse.mail@gmail.com", "Azerty123*");
User user4 = null; User? user4 = null;
string user5 = "";
Assert.False(user.Equals(user2 as User)); Assert.False(user.Equals(user2 as User));
Assert.False(user.Equals(user2 as object)); Assert.False(user.Equals(user2 as object));

Loading…
Cancel
Save