diff --git a/Sources/MaSoluction/Data/Class1.cs b/Sources/MaSoluction/Data/Class1.cs deleted file mode 100644 index e53eae4..0000000 --- a/Sources/MaSoluction/Data/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Data -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/Sources/MaSoluction/Data/DBManager.cs b/Sources/MaSoluction/Data/DBManager.cs new file mode 100644 index 0000000..b1fa54b --- /dev/null +++ b/Sources/MaSoluction/Data/DBManager.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Data +{ + public class DBManager + { + + } + + +} diff --git a/Sources/MaSoluction/Data/Data.csproj b/Sources/MaSoluction/Data/Data.csproj index bafd05b..bcb5f29 100644 --- a/Sources/MaSoluction/Data/Data.csproj +++ b/Sources/MaSoluction/Data/Data.csproj @@ -6,4 +6,8 @@ enable + + + + diff --git a/Sources/MaSoluction/Data/IDataManager.cs b/Sources/MaSoluction/Data/IDataManager.cs index 7afceac..555ed3e 100644 --- a/Sources/MaSoluction/Data/IDataManager.cs +++ b/Sources/MaSoluction/Data/IDataManager.cs @@ -1,4 +1,5 @@ -using System; +using Model; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,9 +9,10 @@ namespace Data { public interface IDataManager { - public void AddDice(); - public void RemoveDice(); + public void AddDice(Die addD); + public void RemoveDice(Die removeD); public void clear(); - public void AddDices(); + public void AddDices(Die addDs); + public void GetDices(); } } diff --git a/Sources/MaSoluction/Data/Manager.cs b/Sources/MaSoluction/Data/Manager.cs new file mode 100644 index 0000000..ef28313 --- /dev/null +++ b/Sources/MaSoluction/Data/Manager.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Model; + + +namespace Data +{ + public class Manager + { + Manager m = new Manager(new Stub()); + + public Manager(IDataManager data) + { + + } + + + + + + } +} diff --git a/Sources/MaSoluction/Data/Stub.cs b/Sources/MaSoluction/Data/Stub.cs new file mode 100644 index 0000000..13d7b80 --- /dev/null +++ b/Sources/MaSoluction/Data/Stub.cs @@ -0,0 +1,37 @@ +using Model; + + +namespace Data +{ + public class Stub : IDataManager + { + private List listDice = new List(); + public void AddDice(Die addD) + { + listDice.Add(addD); + + } + + public void AddDices(Die addDs) + { + + } + + public void clear() + { + listDice.Clear(); + } + + + + public void GetDices() + { + + } + + public void RemoveDice(Die removeD) + { + listDice.Remove(removeD); + } + } +} \ No newline at end of file diff --git a/Sources/MaSoluction/Model/Manager.cs b/Sources/MaSoluction/Model/Manager.cs deleted file mode 100644 index fb76ac0..0000000 --- a/Sources/MaSoluction/Model/Manager.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model -{ - public class Manager - { - List listDices = new List(); - - public void AddDice(Die d) - { - listDices.Add(d); - } - public void RemoveDice(Die d) - { - listDices.Remove(d); - } - } -} diff --git a/Sources/MaSoluction/Testeur/TestMethodeRandom.cs b/Sources/MaSoluction/Testeur/TestMethodeRandom.cs index c8b54b1..ae7ed8c 100644 --- a/Sources/MaSoluction/Testeur/TestMethodeRandom.cs +++ b/Sources/MaSoluction/Testeur/TestMethodeRandom.cs @@ -12,16 +12,20 @@ namespace Testeur [Fact] public void TesterMethodeRandom() { - //Arrange - NumberDie nd = new NumberDie("de1",2,13); - //Act - int actual = nd.RandomFace(); - int expectedMin = nd.Min; - int expectedMax = nd.Max; - - //Assert - - Assert.InRange(actual, expectedMin, expectedMax); + for (int i=0;i>100;i++) + { + //Arrange + NumberDie nd = new NumberDie("de1", 2, 13); + //Act + int actual = nd.RandomFace(); + int expectedMin = nd.Min; + int expectedMax = nd.Max; + + //Assert + + Assert.InRange(actual, expectedMin, expectedMax); + } +