Fixed tests

PixiEditorTests/ModelsTests/ToolsTests/ZoomToolTests.cs

@@ -17,7 +17,7 @@ namespace PixiEditorTests.ModelsTests.ToolsTests
             ZoomTool zoomTool = new ZoomTool();
             double zoom = 110;
             zoomTool.Zoom(zoom);
-            Assert.Equal(zoom, vm.ZoomPercentage);
+            Assert.Equal(zoom, vm.ViewportSubViewModel.ZoomPercentage);
         }
 
     }

PixiEditorTests/ViewModelsTests/ViewModelMainTests.cs

@@ -32,13 +32,13 @@ namespace PixiEditorTests.ViewModelsTests
         {
             ViewModelMain viewModel = new ViewModelMain();
 
-            viewModel.PrimaryColor = Colors.Black;
-            viewModel.SecondaryColor = Colors.White;
+            viewModel.ColorsSubViewModel.PrimaryColor = Colors.Black;
+            viewModel.ColorsSubViewModel.SecondaryColor = Colors.White;
 
-            viewModel.SwapColorsCommand.Execute(null);
+            viewModel.ColorsSubViewModel.SwapColorsCommand.Execute(null);
 
-            Assert.Equal(Colors.White, viewModel.PrimaryColor);
-            Assert.Equal(Colors.Black, viewModel.SecondaryColor);
+            Assert.Equal(Colors.White, viewModel.ColorsSubViewModel.PrimaryColor);
+            Assert.Equal(Colors.Black, viewModel.ColorsSubViewModel.SecondaryColor);
         }
 
         [StaFact]
@@ -59,10 +59,10 @@ namespace PixiEditorTests.ViewModelsTests
 
             Assert.Equal(new Coordinates(0, 0), MousePositionConverter.CurrentCoordinates);
 
-            viewModel.MouseXOnCanvas = 5;
-            viewModel.MouseYOnCanvas = 5;
+            viewModel.IoSubViewModel.MouseXOnCanvas = 5;
+            viewModel.IoSubViewModel.MouseYOnCanvas = 5;
 
-            viewModel.MouseMoveCommand.Execute(null);
+            viewModel.IoSubViewModel.MouseMoveCommand.Execute(null);
 
             Assert.Equal(new Coordinates(5,5), MousePositionConverter.CurrentCoordinates);
         }
@@ -74,7 +74,7 @@ namespace PixiEditorTests.ViewModelsTests
 
             Assert.Equal(ToolType.Move,viewModel.BitmapManager.SelectedTool.ToolType);
 
-            viewModel.SelectToolCommand.Execute(ToolType.Line);
+            viewModel.ToolsSubViewModel.SelectToolCommand.Execute(ToolType.Line);
 
             Assert.Equal(ToolType.Line, viewModel.BitmapManager.SelectedTool.ToolType);
         }
@@ -88,7 +88,7 @@ namespace PixiEditorTests.ViewModelsTests
 
             Assert.True(viewModel.BitmapManager.MouseController.IsRecordingChanges);
 
-            viewModel.MouseHook_OnMouseUp(default, default, default);
+            viewModel.IoSubViewModel.MouseHook_OnMouseUp(default, default, default);
 
             Assert.False(viewModel.BitmapManager.MouseController.IsRecordingChanges);
         }
@@ -102,7 +102,7 @@ namespace PixiEditorTests.ViewModelsTests
 
             Assert.Empty(viewModel.BitmapManager.ActiveDocument.Layers);
 
-            viewModel.NewLayerCommand.Execute(null);
+            viewModel.LayersSubViewModel.NewLayerCommand.Execute(null);
 
             Assert.Single(viewModel.BitmapManager.ActiveDocument.Layers);
         }
@@ -130,8 +130,8 @@ namespace PixiEditorTests.ViewModelsTests
             ViewModelMain viewModel = new ViewModelMain();
             viewModel.BitmapManager.ActiveDocument = new Document(1,1);
 
-            viewModel.AddSwatch(Colors.Green);
-            viewModel.AddSwatch(Colors.Green);
+            viewModel.ColorsSubViewModel.AddSwatch(Colors.Green);
+            viewModel.ColorsSubViewModel.AddSwatch(Colors.Green);
 
             Assert.Single(viewModel.BitmapManager.ActiveDocument.Swatches);
             Assert.Equal(Colors.Green,viewModel.BitmapManager.ActiveDocument.Swatches[0]);
@@ -153,10 +153,10 @@ namespace PixiEditorTests.ViewModelsTests
             };
             viewModel.BitmapManager.AddNewLayer("layer");
             
-            viewModel.SelectAllCommand.Execute(null);
+            viewModel.SelectionSubViewModel.SelectAllCommand.Execute(null);
 
             Assert.Equal(viewModel.BitmapManager.ActiveDocument.Width * viewModel.BitmapManager.ActiveDocument.Height,
-                viewModel.ActiveSelection.SelectedPoints.Count);
+                viewModel.SelectionSubViewModel.ActiveSelection.SelectedPoints.Count);
         }
 
         [StaFact]