From 670dfcc43895ea0cd4ea944a76e45ad2794ee92d Mon Sep 17 00:00:00 2001
From: Christian Kauer <c.kauer@krah-gruppe.de>
Date: Sun, 24 Dec 2023 12:53:33 +0100
Subject: [PATCH] dev

---
 GameHandler.UnitTests/GameServiceTests.cs | 31 +++++++++++++++--------
 GameHandler/GameService.cs                |  8 +++---
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/GameHandler.UnitTests/GameServiceTests.cs b/GameHandler.UnitTests/GameServiceTests.cs
index c62c613..e66b6f1 100644
--- a/GameHandler.UnitTests/GameServiceTests.cs
+++ b/GameHandler.UnitTests/GameServiceTests.cs
@@ -1,6 +1,9 @@
-using GameHandler.DeathGame;
+using Autofac;
+using GameHandler.DeathGame;
 using GameModel;
+using GameModel.Contract;
 using GameModel.Exceptions;
+using GameModel.Mocks;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,33 +15,40 @@ namespace GameHandler.UnitTests
     [TestFixture]
     internal class GameServiceTests
     {
+        private GameService service;
+
+        [SetUp]
+        public void SetUp()
+        {
+            
+            var builder = new ContainerBuilder();
+            builder.RegisterType<FakeExpenseRepository>().As<IExpenseRepository>();            
+            service = new GameService(builder.Build());       
+        }
+
         [Test]
         public void Start_InvalidStartStatusThrowInvalidGameStateExcpetion()
-        {
-            GameService service = new GameService();
+        {            
             service.Start();
             Assert.That(() => service.Start(), Throws.TypeOf<InvalidGameStateExcpetion>());
         }
 
         [Test]
         public void Stop_InvalidStopStatusThrowInvalidGameStateExcpetion()
-        {
-            GameService service = new GameService();            
+        {            
             Assert.That(() => service.Stop(), Throws.TypeOf<InvalidGameStateExcpetion>());
         }
 
 
         [Test]
         public void HandleThrow_NotPossibleBeforeStart()
-        {
-            GameService service = new GameService();            
+        {         
             Assert.That(() => service.HandleThrow(null), Throws.TypeOf<InvalidGameStateExcpetion>());
         }
 
         [Test]
         public void HandleThrow_NotPossibleAfterStop()
-        {
-            GameService service = new GameService();
+        {         
             service.Start();
             service.Stop();
             Assert.That(() => service.HandleThrow(null), Throws.TypeOf<InvalidGameStateExcpetion>());
@@ -46,8 +56,7 @@ namespace GameHandler.UnitTests
 
         [Test]
         public void HandleThrow_UpdatesTheBoardState()
-        {
-            GameService service = new GameService();
+        {         
             var ts1 = service.Start(DeathGameHandler.GAMENAME_DEATHBOX);
             var bs1 = ts1.ThrowState.BoardState;
 
diff --git a/GameHandler/GameService.cs b/GameHandler/GameService.cs
index 2300532..c8379f6 100644
--- a/GameHandler/GameService.cs
+++ b/GameHandler/GameService.cs
@@ -21,18 +21,18 @@ namespace GameHandler
 {
     public class GameService
     {
-        private IContainer? _container { get; set; }
+        private IContainer _container { get; set; }
         private bool _isStarted = false;
-        private ILifetimeScope? _scope;
+        private ILifetimeScope _scope;
         private IGameHandler _gh;
         private ThrowHandler _th;
         private ExpenseHandler _eh;
         private GameState _lastState;
         public GameState GameModel { get => _lastState; }
 
-        private IExpenseRepository? _expenseRepository { get => _scope?.Resolve<IExpenseRepository>(); }
+        private IExpenseRepository _expenseRepository { get => _scope.Resolve<IExpenseRepository>(); }
 
-        public GameService(IContainer? container =null)
+        public GameService(IContainer container =null)
         {
             _container = container;
         }