diff --git a/Sources/MaSoluction/Model/Die.cs b/Sources/MaSoluction/Model/Die.cs index f0e5b95..b9f8a17 100644 --- a/Sources/MaSoluction/Model/Die.cs +++ b/Sources/MaSoluction/Model/Die.cs @@ -27,7 +27,7 @@ Name = name; } - public abstract void RandomFace(); + public abstract object RandomFace(); } } \ No newline at end of file diff --git a/Sources/MaSoluction/Model/NumberDie.cs b/Sources/MaSoluction/Model/NumberDie.cs index 7290dd9..91647b0 100644 --- a/Sources/MaSoluction/Model/NumberDie.cs +++ b/Sources/MaSoluction/Model/NumberDie.cs @@ -42,10 +42,10 @@ namespace Model max = value; } } - public override void RandomFace() + public override int RandomFace() { int resultat = random.Next(min, max + 1); - + return resultat; } } } diff --git a/Sources/MaSoluction/Testeur/TestMethodeRandom.cs b/Sources/MaSoluction/Testeur/TestMethodeRandom.cs new file mode 100644 index 0000000..8ccf41b --- /dev/null +++ b/Sources/MaSoluction/Testeur/TestMethodeRandom.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Model; + +namespace Testeur +{ + class TestMethodeRandom + { + [Fact] + public void TesterMethodeRandom() + { + //Arrange + NumberDie nd = new NumberDie("de1",2,13); + //Act + int actual = nd.getRandom(); + int expectedMin = nd.Min; + int expectedMax = nd.Max; + + //Assert + + Assert.InRange(actual, expectedMin, expectedMax); + + + + + } + } +} diff --git a/Sources/MaSoluction/Testeur/UT_NumberDice.cs b/Sources/MaSoluction/Testeur/UT_NumberDice.cs index b146e02..e25d018 100644 --- a/Sources/MaSoluction/Testeur/UT_NumberDice.cs +++ b/Sources/MaSoluction/Testeur/UT_NumberDice.cs @@ -24,9 +24,9 @@ namespace Testeur NumberDie d = new NumberDie(name,min,max); Assert.Equal(expectedMin, d.Min); Assert.Equal (expectedMax, d.Max); - Assert.Equal( expectedName,d.Name); } + } }