From 3e80afc3dd1f9e08c6e92f05006bc337a64eda5d Mon Sep 17 00:00:00 2001 From: victor perez ngounou Date: Sat, 24 Sep 2022 15:10:05 +0200 Subject: [PATCH 01/13] Test unitaire joueur --- Sources/BowlingLib/Class1.cs | 11 --------- Sources/BowlingLib/Model/Joueur.cs | 2 +- Sources/Tests/BowlingAppUnitTest/UnitTest1.cs | 16 ------------- .../BowlingAppUnitTest/UnitTestJoueur.cs | 24 +++++++++++++++++++ Sources/global.json | 7 ++++++ 5 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 Sources/BowlingLib/Class1.cs delete mode 100644 Sources/Tests/BowlingAppUnitTest/UnitTest1.cs create mode 100644 Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs create mode 100644 Sources/global.json diff --git a/Sources/BowlingLib/Class1.cs b/Sources/BowlingLib/Class1.cs deleted file mode 100644 index 31eb072..0000000 --- a/Sources/BowlingLib/Class1.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace HelloWorldLib -{ - /// - ///a sample class - /// - public class Class1 - { - } -} diff --git a/Sources/BowlingLib/Model/Joueur.cs b/Sources/BowlingLib/Model/Joueur.cs index 879038f..5bfd53d 100644 --- a/Sources/BowlingLib/Model/Joueur.cs +++ b/Sources/BowlingLib/Model/Joueur.cs @@ -16,7 +16,7 @@ namespace BowlingLib.Model if (pseudo == null || pseudo == "") { - throw new Exception("Le pseudo ne peut pas être vide"); + throw new ArgumentException("Le pseudo ne peut pas être vide"); } } diff --git a/Sources/Tests/BowlingAppUnitTest/UnitTest1.cs b/Sources/Tests/BowlingAppUnitTest/UnitTest1.cs deleted file mode 100644 index 69d7a2a..0000000 --- a/Sources/Tests/BowlingAppUnitTest/UnitTest1.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using HelloWorldLib; -using Xunit; - -namespace HelloWordLib_UnitTests -{ - public class UnitTest1 - { - [Fact] - public void Test1() - { - Class1 c = new Class1(); - Assert.NotNull(c); - } - } -} diff --git a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs new file mode 100644 index 0000000..510031d --- /dev/null +++ b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs @@ -0,0 +1,24 @@ +using System; +using BowlingLib.Model; +using Xunit; + +namespace Test.BowlingAppUnitTest +{ + public class UnitTestJoueur + { + [Fact] + public void TestConstructeur() + { + Joueur j = new Joueur("Paul"); + Assert.NotNull(j); + Assert.Equal(j.Pseudo, "Paul"); + Assert.NotEqual(j.Pseudo, "joel"); + } + + [Fact] + public void TestInvalidJoueur() + { + Assert.Throws(() => new Joueur(null)); + } + } +} diff --git a/Sources/global.json b/Sources/global.json new file mode 100644 index 0000000..87aef9f --- /dev/null +++ b/Sources/global.json @@ -0,0 +1,7 @@ +{ + "sdk": { + "version": "6.0.0", + "rollForward": "latestMajor", + "allowPrerelease": false + } +} \ No newline at end of file From dd3c216052b7bab9333ddd9ef8820e7dd32e44f2 Mon Sep 17 00:00:00 2001 From: AUGUSTIN_100 Date: Sun, 25 Sep 2022 18:33:29 +0200 Subject: [PATCH 02/13] Test Sur Joueur --- Sources/BowlingLib/Model/Joueur.cs | 2 +- .../BowlingAppUnitTest/UnitTestJoueur.cs | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Sources/BowlingLib/Model/Joueur.cs b/Sources/BowlingLib/Model/Joueur.cs index 5bfd53d..cf10721 100644 --- a/Sources/BowlingLib/Model/Joueur.cs +++ b/Sources/BowlingLib/Model/Joueur.cs @@ -14,7 +14,7 @@ namespace BowlingLib.Model { this.pseudo = pseudo; - if (pseudo == null || pseudo == "") + if (pseudo == null || pseudo == "" || pseudo.Length < 3) { throw new ArgumentException("Le pseudo ne peut pas être vide"); } diff --git a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs index 510031d..b346d82 100644 --- a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs +++ b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs @@ -20,5 +20,30 @@ namespace Test.BowlingAppUnitTest { Assert.Throws(() => new Joueur(null)); } + + [Theory] + [InlineData(false,"Augustin","Augustinn")]; + [InlineData(true,"Amir","Amir")]; + [InlineData(false,"Amir","")]; + [InlineData(false,"Amir",null)]; + [InlineData(false,null,null)]; + [InlineData(false,null,"")]; + [InlineData(false,"",null)]; + [InlineData(false,"","")]; + [InlineData(false,"f2","f2")]; + + public void TestContructeur(bool isValid, string expectedPseudo, String pseudo ) + { + if (!isValid) + { + Assert.Throws( + () => new Joueur(pseudo) + ); + return; + + Joueur j = new Joueur(pseudo); + Assert.Equal(pseudo, j.Pseudo); + } + } } } From 8b829d57ff3951d149477f28461896a4e42fd011 Mon Sep 17 00:00:00 2001 From: victor perez ngounou Date: Wed, 28 Sep 2022 11:38:32 +0200 Subject: [PATCH 03/13] Update test Project --- Sources/Tests/BowlingAppUnitTest/BowlingAppUnitTest.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/Tests/BowlingAppUnitTest/BowlingAppUnitTest.csproj b/Sources/Tests/BowlingAppUnitTest/BowlingAppUnitTest.csproj index 73961d6..bb6074e 100644 --- a/Sources/Tests/BowlingAppUnitTest/BowlingAppUnitTest.csproj +++ b/Sources/Tests/BowlingAppUnitTest/BowlingAppUnitTest.csproj @@ -21,5 +21,6 @@ + From 043401dba4b8cee51f45b21da77e277799984737 Mon Sep 17 00:00:00 2001 From: Arafamamadouelaphi <92931011+Arafamamadouelaphi@users.noreply.github.com> Date: Wed, 28 Sep 2022 10:51:22 +0100 Subject: [PATCH 04/13] Creation de test pour la classe Equipe --- .../Tests/BowlingAppUnitTest/testequipe.cs | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 Sources/Tests/BowlingAppUnitTest/testequipe.cs diff --git a/Sources/Tests/BowlingAppUnitTest/testequipe.cs b/Sources/Tests/BowlingAppUnitTest/testequipe.cs new file mode 100644 index 0000000..63de4e3 --- /dev/null +++ b/Sources/Tests/BowlingAppUnitTest/testequipe.cs @@ -0,0 +1,30 @@ +using BowlingLib.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Xunit; + +namespace BowlingAppUnitTest +{ + public class TestEquipe + { + [Fact] + public void testConstructeur() + { + Equipe p = new Equipe("sao"); + Assert.NotNull("p"); + Assert.Equal(p.Nom, "sao"); + Assert.NotEqual(p.Nom, "sao"); + + } + [Fact] + public void TestInvalideEquipe() + { + Assert.Throws(() => new Equipe(null)); + } + + + } +} From 63a4515565d1b445be429258976f8ce4b203f449 Mon Sep 17 00:00:00 2001 From: Victor Perez NGOUNOU Date: Thu, 29 Sep 2022 08:24:40 +0000 Subject: [PATCH 05/13] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Sources/Test?= =?UTF-8?q?s/BowlingAppUnitTest/BowlingAppUnitTest.csproj'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BowlingAppUnitTest.csproj | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/Sources/Tests/BowlingAppUnitTest/BowlingAppUnitTest.csproj b/Sources/Tests/BowlingAppUnitTest/BowlingAppUnitTest.csproj index bb6074e..13f9b25 100644 --- a/Sources/Tests/BowlingAppUnitTest/BowlingAppUnitTest.csproj +++ b/Sources/Tests/BowlingAppUnitTest/BowlingAppUnitTest.csproj @@ -1,26 +1,25 @@ - - - - net6.0 - - false - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - + + + + net6.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + From aee02a15d3868e3c652fda0d491f25214797031b Mon Sep 17 00:00:00 2001 From: Victor Perez NGOUNOU Date: Thu, 29 Sep 2022 08:26:28 +0000 Subject: [PATCH 06/13] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Sources/Test?= =?UTF-8?q?s/BowlingAppUnitTest/UnitTestJoueur.cs'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tests/BowlingAppUnitTest/UnitTestJoueur.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs index b346d82..e4e1be0 100644 --- a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs +++ b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs @@ -22,15 +22,15 @@ namespace Test.BowlingAppUnitTest } [Theory] - [InlineData(false,"Augustin","Augustinn")]; - [InlineData(true,"Amir","Amir")]; - [InlineData(false,"Amir","")]; - [InlineData(false,"Amir",null)]; - [InlineData(false,null,null)]; - [InlineData(false,null,"")]; - [InlineData(false,"",null)]; - [InlineData(false,"","")]; - [InlineData(false,"f2","f2")]; + [InlineData(false,"Augustin","Augustinn")] + [InlineData(true,"Amir","Amir")] + [InlineData(false,"Amir","")] + [InlineData(false,"Amir",null)] + [InlineData(false,null,null)] + [InlineData(false,null,"")] + [InlineData(false,"",null)] + [InlineData(false,"","")] + [InlineData(false,"f2","f2")] public void TestContructeur(bool isValid, string expectedPseudo, String pseudo ) { From 2860ff75165a2187e7922580562b48b4c8276794 Mon Sep 17 00:00:00 2001 From: Augustin AFFOGNON Date: Thu, 29 Sep 2022 08:50:43 +0000 Subject: [PATCH 07/13] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Sources/Test?= =?UTF-8?q?s/BowlingAppUnitTest/UnitTestJoueur.cs'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs index e4e1be0..1e904b9 100644 --- a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs +++ b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs @@ -6,10 +6,10 @@ namespace Test.BowlingAppUnitTest { public class UnitTestJoueur { + Joueur j = new Joueur("Paul"); [Fact] public void TestConstructeur() - { - Joueur j = new Joueur("Paul"); + { Assert.NotNull(j); Assert.Equal(j.Pseudo, "Paul"); Assert.NotEqual(j.Pseudo, "joel"); From 3112216572587bd05483df157a6824e9520cf98d Mon Sep 17 00:00:00 2001 From: Augustin AFFOGNON Date: Thu, 29 Sep 2022 08:59:35 +0000 Subject: [PATCH 08/13] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Sources/Test?= =?UTF-8?q?s/BowlingAppUnitTest/UnitTestJoueur.cs'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs index 1e904b9..cecec70 100644 --- a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs +++ b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs @@ -11,8 +11,8 @@ namespace Test.BowlingAppUnitTest public void TestConstructeur() { Assert.NotNull(j); - Assert.Equal(j.Pseudo, "Paul"); - Assert.NotEqual(j.Pseudo, "joel"); + Assert.Equal( "Paul",j.Pseudo); + Assert.NotEqual("joel",j.Pseudo ); } [Fact] From 507963153355b7ab05b338d77953b4a3a15e028a Mon Sep 17 00:00:00 2001 From: Augustin AFFOGNON Date: Thu, 29 Sep 2022 09:02:53 +0000 Subject: [PATCH 09/13] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Sources/Test?= =?UTF-8?q?s/BowlingAppUnitTest/UnitTestJoueur.cs'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs index cecec70..508c2c6 100644 --- a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs +++ b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs @@ -42,7 +42,7 @@ namespace Test.BowlingAppUnitTest return; Joueur j = new Joueur(pseudo); - Assert.Equal(pseudo, j.Pseudo); + Assert.Equal(expectedPseudo, j.Pseudo); } } } From 507f56f2140ac04d5710458b5c2a13e8e7dc9e9e Mon Sep 17 00:00:00 2001 From: Augustin AFFOGNON Date: Thu, 29 Sep 2022 09:05:21 +0000 Subject: [PATCH 10/13] Ajouter 'Sources/BowlingLib/Model/Equipe.cs' --- Sources/BowlingLib/Model/Equipe.cs | 48 ++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Sources/BowlingLib/Model/Equipe.cs diff --git a/Sources/BowlingLib/Model/Equipe.cs b/Sources/BowlingLib/Model/Equipe.cs new file mode 100644 index 0000000..a9f67d9 --- /dev/null +++ b/Sources/BowlingLib/Model/Equipe.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BowlingLib.Model +{ + public class Equipe + { + private string nom; + private List joueurs; + + public string Nom + { + get { return nom; } + set { nom = value; } + } + + public List Joueurs + { + get { return joueurs; } + set { joueurs = value; } + } + + public Equipe(string nom) + { + this.nom = nom; + joueurs = new List(); + } + + public void AjouterJoueur(Joueur joueur) + { + joueurs.Add(joueur); + } + + public void SupprimerJoueur(Joueur joueur) + { + joueurs.Remove(joueur); + } + + //retourner la liste non modifiable des joueurs de l'équipe + public List GetJoueurs() + { + return joueurs.AsReadOnly().ToList(); + } + } +} From 0407d22840e1f60f23a2679fba8b00d84754ec4d Mon Sep 17 00:00:00 2001 From: Augustin AFFOGNON Date: Thu, 29 Sep 2022 09:14:48 +0000 Subject: [PATCH 11/13] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Sources/Test?= =?UTF-8?q?s/BowlingAppUnitTest/UnitTestJoueur.cs'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs index 508c2c6..9cdcbd2 100644 --- a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs +++ b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs @@ -22,7 +22,7 @@ namespace Test.BowlingAppUnitTest } [Theory] - [InlineData(false,"Augustin","Augustinn")] + // [InlineData(false,"Augustin","Augustinn")] [InlineData(true,"Amir","Amir")] [InlineData(false,"Amir","")] [InlineData(false,"Amir",null)] @@ -36,6 +36,7 @@ namespace Test.BowlingAppUnitTest { if (!isValid) { + Assert.Throws( () => new Joueur(pseudo) ); @@ -44,6 +45,7 @@ namespace Test.BowlingAppUnitTest Joueur j = new Joueur(pseudo); Assert.Equal(expectedPseudo, j.Pseudo); } + } } } From 0b5ea00e06cc5bc265d514b213b7715c8de41873 Mon Sep 17 00:00:00 2001 From: Augustin AFFOGNON Date: Thu, 29 Sep 2022 09:22:37 +0000 Subject: [PATCH 12/13] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Sources/Test?= =?UTF-8?q?s/BowlingAppUnitTest/UnitTestJoueur.cs'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs index 9cdcbd2..3d735d3 100644 --- a/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs +++ b/Sources/Tests/BowlingAppUnitTest/UnitTestJoueur.cs @@ -35,16 +35,15 @@ namespace Test.BowlingAppUnitTest public void TestContructeur(bool isValid, string expectedPseudo, String pseudo ) { if (!isValid) - { - + { Assert.Throws( () => new Joueur(pseudo) ); return; - + } Joueur j = new Joueur(pseudo); Assert.Equal(expectedPseudo, j.Pseudo); - } + } } From 28a963226c8a59e6e51f345eca878092b5bca615 Mon Sep 17 00:00:00 2001 From: Augustin AFFOGNON Date: Thu, 29 Sep 2022 09:22:52 +0000 Subject: [PATCH 13/13] Supprimer 'Sources/Tests/BowlingAppUnitTest/testequipe.cs' --- .../Tests/BowlingAppUnitTest/testequipe.cs | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 Sources/Tests/BowlingAppUnitTest/testequipe.cs diff --git a/Sources/Tests/BowlingAppUnitTest/testequipe.cs b/Sources/Tests/BowlingAppUnitTest/testequipe.cs deleted file mode 100644 index 63de4e3..0000000 --- a/Sources/Tests/BowlingAppUnitTest/testequipe.cs +++ /dev/null @@ -1,30 +0,0 @@ -using BowlingLib.Model; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Xunit; - -namespace BowlingAppUnitTest -{ - public class TestEquipe - { - [Fact] - public void testConstructeur() - { - Equipe p = new Equipe("sao"); - Assert.NotNull("p"); - Assert.Equal(p.Nom, "sao"); - Assert.NotEqual(p.Nom, "sao"); - - } - [Fact] - public void TestInvalideEquipe() - { - Assert.Throws(() => new Equipe(null)); - } - - - } -}