Fixed tests

PixiEditor/Models/Controllers/BitmapManager.cs

@@ -176,7 +176,10 @@ namespace PixiEditor.Models.Controllers
         private void MouseController_StartedRecordingChanges(object sender, EventArgs e)
         {
             SelectedTool.OnRecordingLeftMouseDown(new MouseEventArgs(Mouse.PrimaryDevice, (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()));
-            ActiveDocument.PreviewLayer = null;
+            if (ActiveDocument != null)
+            {
+                ActiveDocument.PreviewLayer = null;
+            }
         }
 
         private void MouseController_StoppedRecordingChanges(object sender, EventArgs e)

PixiEditorTests/ModelsTests/ControllersTests/BitmapManagerTests.cs

@@ -52,12 +52,12 @@ namespace PixiEditorTests.ModelsTests.ControllersTests
             {
                 ActiveDocument = new Document(10, 10)
             };
-            bitmapManager.GeneratePreviewLayer();
-            Assert.NotNull(bitmapManager.PreviewLayer);
-            Assert.Equal(0, bitmapManager.PreviewLayer.Width + bitmapManager.PreviewLayer.Height); // Size is zero
-            Assert.Equal(0, bitmapManager.PreviewLayer.OffsetX + bitmapManager.PreviewLayer.OffsetY); // Offset is zero
-            Assert.Equal(bitmapManager.ActiveDocument.Width, bitmapManager.PreviewLayer.MaxWidth);
-            Assert.Equal(bitmapManager.ActiveDocument.Height, bitmapManager.PreviewLayer.MaxHeight);
+            bitmapManager.ActiveDocument.GeneratePreviewLayer();
+            Assert.NotNull(bitmapManager.ActiveDocument.PreviewLayer);
+            Assert.Equal(0, bitmapManager.ActiveDocument.PreviewLayer.Width + bitmapManager.ActiveDocument.PreviewLayer.Height); // Size is zero
+            Assert.Equal(0, bitmapManager.ActiveDocument.PreviewLayer.OffsetX + bitmapManager.ActiveDocument.PreviewLayer.OffsetY); // Offset is zero
+            Assert.Equal(bitmapManager.ActiveDocument.Width, bitmapManager.ActiveDocument.PreviewLayer.MaxWidth);
+            Assert.Equal(bitmapManager.ActiveDocument.Height, bitmapManager.ActiveDocument.PreviewLayer.MaxHeight);
         }
 
         [Fact]

PixiEditorTests/ModelsTests/ToolsTests/ZoomToolTests.cs

@@ -8,13 +8,14 @@ namespace PixiEditorTests.ModelsTests.ToolsTests
     public class ZoomToolTests
     {
         [StaFact]
-        public void TestThatZoomSetsViewModelsZoomPercentage()
+        public void TestThatZoomSetsActiveDocumentZoomPercentage()
         {
             ViewModelMain vm = new ViewModelMain();
+            vm.BitmapManager.ActiveDocument = new PixiEditor.Models.DataHolders.Document(10, 10);
             ZoomTool zoomTool = new ZoomTool();
             double zoom = 110;
             zoomTool.Zoom(zoom);
-            Assert.Equal(zoom, vm.ViewportSubViewModel.ZoomPercentage);
+            Assert.Equal(zoom, vm.BitmapManager.ActiveDocument.ZoomPercentage);
         }
     }
 }

PixiEditorTests/ViewModelsTests/ViewModelMainTests.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using System.Windows.Input;
 using System.Windows.Media;
 using PixiEditor.Models.Controllers;
 using PixiEditor.Models.DataHolders;
@@ -54,11 +55,12 @@ namespace PixiEditorTests.ViewModelsTests
         public void TestThatMouseMoveCommandUpdatesCurrentCoordinates()
         {
             ViewModelMain viewModel = new ViewModelMain();
+            viewModel.BitmapManager.ActiveDocument = new Document(10, 10);
 
             Assert.Equal(new Coordinates(0, 0), MousePositionConverter.CurrentCoordinates);
 
-            viewModel.IoSubViewModel.MouseXOnCanvas = 5;
-            viewModel.IoSubViewModel.MouseYOnCanvas = 5;
+            viewModel.BitmapManager.ActiveDocument.MouseXOnCanvas = 5;
+            viewModel.BitmapManager.ActiveDocument.MouseYOnCanvas = 5;
 
             viewModel.IoSubViewModel.MouseMoveCommand.Execute(null);
 
@@ -86,7 +88,7 @@ namespace PixiEditorTests.ViewModelsTests
 
             Assert.True(viewModel.BitmapManager.MouseController.IsRecordingChanges);
 
-            viewModel.IoSubViewModel.MouseHook_OnMouseUp(default, default, default);
+            viewModel.IoSubViewModel.MouseHook_OnMouseUp(default, default, MouseButton.Left);
 
             Assert.False(viewModel.BitmapManager.MouseController.IsRecordingChanges);
         }