test: updates tests that need fixing and upgrades to autoinject 2.1.0

chickensoft-games · Jul 6, 2024 · e94ab40 · e94ab40
1 parent c60c29c
commit e94ab40
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 12 deletions.
diff --git a/GameDemo.csproj b/GameDemo.csproj
@@ -45,7 +45,7 @@
     <PackageReference Include="EnvironmentAbstractions" Version="3.0.2" />
     <PackageReference Include="GodotSharp.SourceGenerators" Version="2.1.1" PrivateAssets="all" OutputItemType="analyzer" />
     <PackageReference Include="Chickensoft.SaveFileBuilder" Version="1.1.0" />
-    <PackageReference Include="Chickensoft.AutoInject" Version="2.0.0" PrivateAssets="all" />
+    <PackageReference Include="Chickensoft.AutoInject" Version="2.1.0" PrivateAssets="all" />
     <PackageReference Include="Chickensoft.Collections" Version="1.7.0" />
     <PackageReference Include="Chickensoft.GodotNodeInterfaces" Version="2.2.0" />
     <PackageReference Include="Chickensoft.Introspection" Version="1.3.0" />

diff --git a/src/app/App.cs b/src/app/App.cs
@@ -49,7 +49,7 @@ public partial class App : CanvasLayer, IApp {
 
   #endregion Nodes
 
-  public void Setup() {
+  public void Initialize() {
     Instantiator = new Instantiator(GetTree());
     AppRepo = new AppRepo();
     AppLogic = new AppLogic();

diff --git a/src/game/domain/GameRepo.cs b/src/game/domain/GameRepo.cs
@@ -1,7 +1,7 @@
 namespace GameDemo;
 
 using System;
-using Chickensoft.GoDotCollections;
+using Chickensoft.Collections;
 using Godot;
 
 public interface IGameRepo : IDisposable {

diff --git a/test/src/app/AppTest.cs b/test/src/app/AppTest.cs
@@ -64,7 +64,7 @@ public void Initializes() {
 
     _app.AppBinding = _binding;
 
-    _app.Setup();
+    _app.Initialize();
 
     _app.Instantiator.ShouldBeOfType<Instantiator>();
     _app.AppRepo.ShouldBeOfType<AppRepo>();

diff --git a/test/src/game/domain/GameRepoTest.cs b/test/src/game/domain/GameRepoTest.cs
@@ -1,6 +1,6 @@
 namespace GameDemo.Tests;
 
-using Chickensoft.GoDotCollections;
+using Chickensoft.Collections;
 using Chickensoft.GoDotTest;
 using Godot;
 using Moq;

diff --git a/test/src/game/state/GameLogic.StateTest.cs b/test/src/game/state/GameLogic.StateTest.cs
@@ -1,6 +1,6 @@
 namespace GameDemo.Tests;
 
-using Chickensoft.GoDotCollections;
+using Chickensoft.Collections;
 using Chickensoft.GoDotTest;
 using Chickensoft.Introspection;
 using Chickensoft.LogicBlocks;

diff --git a/test/src/game/state/states/MenuBackdropTest.cs b/test/src/game/state/states/MenuBackdropTest.cs
@@ -1,7 +1,7 @@
 namespace GameDemo.Tests;
 
 using System.Linq;
-using Chickensoft.GoDotCollections;
+using Chickensoft.Collections;
 using Chickensoft.GoDotTest;
 using Chickensoft.LogicBlocks;
 using Godot;

diff --git a/test/src/game/state/states/PlayingTest.cs b/test/src/game/state/states/PlayingTest.cs
@@ -1,7 +1,7 @@
 namespace GameDemo.Tests;
 
 using System.Linq;
-using Chickensoft.GoDotCollections;
+using Chickensoft.Collections;
 using Chickensoft.GoDotTest;
 using Chickensoft.LogicBlocks;
 using Godot;

diff --git a/test/src/in_game_ui/InGameUITest.cs b/test/src/in_game_ui/InGameUITest.cs
@@ -1,7 +1,7 @@
 namespace GameDemo.Tests;
 
 using Chickensoft.AutoInject;
-using Chickensoft.GoDotCollections;
+using Chickensoft.Collections;
 using Chickensoft.GodotNodeInterfaces;
 using Chickensoft.GoDotTest;
 using Godot;

diff --git a/test/src/in_game_ui/state/InGameUILogicStateTest.cs b/test/src/in_game_ui/state/InGameUILogicStateTest.cs
@@ -1,6 +1,6 @@
 namespace GameDemo.Tests;
 
-using Chickensoft.GoDotCollections;
+using Chickensoft.Collections;
 using Chickensoft.GoDotTest;
 using Chickensoft.LogicBlocks;
 using Godot;

diff --git a/test/src/player/PlayerTest.cs b/test/src/player/PlayerTest.cs
@@ -211,6 +211,7 @@ public void Loads() {
     var chunk = new Mock<ISaveChunk<PlayerData>>();
 
     var logic = new PlayerLogic();
+    logic.Set(_appRepo.Object);
     logic.Start();
 
     var data = new PlayerData {

diff --git a/test/src/player/state/states/PlayerLogic.State.AliveTest.cs b/test/src/player/state/states/PlayerLogic.State.AliveTest.cs
@@ -1,6 +1,6 @@
 namespace GameDemo.Tests;
 
-using Chickensoft.GoDotCollections;
+using Chickensoft.Collections;
 using Chickensoft.GoDotTest;
 using Chickensoft.Introspection;
 using Chickensoft.LogicBlocks;

diff --git a/test/src/player_camera/PlayerCameraTest.cs b/test/src/player_camera/PlayerCameraTest.cs
@@ -2,6 +2,7 @@ namespace GameDemo.Tests;
 
 using System.Threading.Tasks;
 using Chickensoft.AutoInject;
+using Chickensoft.Collections;
 using Chickensoft.GodotNodeInterfaces;
 using Chickensoft.GoDotTest;
 using Chickensoft.GodotTestDriver;
@@ -204,6 +205,8 @@ public void Saves() {
 
     var chunk = new Mock<ISaveChunk<PlayerCameraData>>();
 
+    _playerCam.CameraLogic.Get<PlayerCameraLogic.Data>().ShouldNotBeNull();
+
     var data = _playerCam.PlayerCameraChunk.OnSave(chunk.Object);
 
     data.GlobalTransform.ShouldBe(_playerCam.GlobalTransform);
@@ -219,6 +222,18 @@ public void Loads() {
     var chunk = new Mock<ISaveChunk<PlayerCameraData>>();
 
     var logic = new PlayerCameraLogic();
+    _gameRepo.Setup(g => g.IsMouseCaptured).Returns(new AutoProp<bool>(false));
+    _gameRepo.Setup(g => g.PlayerGlobalPosition)
+      .Returns(new AutoProp<Vector3>(Vector3.Zero));
+
+    logic.Set(_gameRepo.Object);
+    logic.Set(new PlayerCameraLogic.Data {
+      TargetPosition = Vector3.Zero,
+      TargetAngleHorizontal = 0f,
+      TargetAngleVertical = 0f,
+      TargetOffset = Vector3.Zero
+    });
+
     logic.Start();
 
     var data = new PlayerCameraData {

diff --git a/test/src/player_camera/state/PlayerCameraLogic.StateTest.cs b/test/src/player_camera/state/PlayerCameraLogic.StateTest.cs
@@ -1,6 +1,6 @@
 namespace GameDemo.Tests;
 
-using Chickensoft.GoDotCollections;
+using Chickensoft.Collections;
 using Chickensoft.GoDotTest;
 using Chickensoft.LogicBlocks;
 using Godot;