Browse Source

Fix some tests

Equbuxu 3 years ago
parent
commit
e1cf47b515

+ 4 - 2
PixiEditorTests/ModelsTests/ControllersTests/BitmapManagerTests.cs

@@ -27,7 +27,8 @@ namespace PixiEditorTests.ModelsTests.ControllersTests
             bitmapManager.ActiveDocument.AddNewLayer(layerName);
             bitmapManager.ActiveDocument.AddNewLayer(layerName);
             Assert.Single(bitmapManager.ActiveDocument.Layers);
             Assert.Single(bitmapManager.ActiveDocument.Layers);
             Assert.Equal(layerName, bitmapManager.ActiveDocument.ActiveLayer.Name);
             Assert.Equal(layerName, bitmapManager.ActiveDocument.ActiveLayer.Name);
-            Assert.Equal(0, bitmapManager.ActiveDocument.ActiveLayer.Width + bitmapManager.ActiveDocument.ActiveLayer.Height);
+            Assert.Equal(1, bitmapManager.ActiveDocument.ActiveLayer.Width);
+            Assert.Equal(1, bitmapManager.ActiveDocument.ActiveLayer.Height);
         }
         }
 
 
         [Fact]
         [Fact]
@@ -53,7 +54,8 @@ namespace PixiEditorTests.ModelsTests.ControllersTests
             };
             };
             bitmapManager.ActiveDocument.GeneratePreviewLayer();
             bitmapManager.ActiveDocument.GeneratePreviewLayer();
             Assert.NotNull(bitmapManager.ActiveDocument.PreviewLayer);
             Assert.NotNull(bitmapManager.ActiveDocument.PreviewLayer);
-            Assert.Equal(0, bitmapManager.ActiveDocument.PreviewLayer.Width + bitmapManager.ActiveDocument.PreviewLayer.Height); // Size is zero
+            Assert.Equal(1, bitmapManager.ActiveDocument.PreviewLayer.Width); // Size is 1x1
+            Assert.Equal(1, bitmapManager.ActiveDocument.PreviewLayer.Height);
             Assert.Equal(0, bitmapManager.ActiveDocument.PreviewLayer.OffsetX + bitmapManager.ActiveDocument.PreviewLayer.OffsetY); // Offset 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.Width, bitmapManager.ActiveDocument.PreviewLayer.MaxWidth);
             Assert.Equal(bitmapManager.ActiveDocument.Height, bitmapManager.ActiveDocument.PreviewLayer.MaxHeight);
             Assert.Equal(bitmapManager.ActiveDocument.Height, bitmapManager.ActiveDocument.PreviewLayer.MaxHeight);

+ 1 - 1
PixiEditorTests/ModelsTests/DataHoldersTests/BitmapPixelChangesTests.cs

@@ -29,7 +29,7 @@ namespace PixiEditorTests.ModelsTests.DataHoldersTests
             BitmapPixelChanges output = BitmapPixelChanges.CombineOverride(new[] { changes, changes2 });
             BitmapPixelChanges output = BitmapPixelChanges.CombineOverride(new[] { changes, changes2 });
             Assert.Equal(4, output.ChangedPixels.Count);
             Assert.Equal(4, output.ChangedPixels.Count);
             Assert.Equal(SKColors.Red, output.ChangedPixels[new Coordinates(3, 2)]);
             Assert.Equal(SKColors.Red, output.ChangedPixels[new Coordinates(3, 2)]);
-            Assert.Equal(SKColors.Black, output.ChangedPixels[new Coordinates(0, 0)]);
+            Assert.Equal(SKColors.Red, output.ChangedPixels[new Coordinates(0, 0)]);
             Assert.Equal(SKColors.Lime, output.ChangedPixels[new Coordinates(1, 0)]);
             Assert.Equal(SKColors.Lime, output.ChangedPixels[new Coordinates(1, 0)]);
         }
         }
 
 

+ 1 - 1
PixiEditorTests/ModelsTests/DataHoldersTests/SurfaceTests.cs

@@ -2,7 +2,7 @@ using PixiEditor.Models.DataHolders;
 using SkiaSharp;
 using SkiaSharp;
 using Xunit;
 using Xunit;
 
 
-namespace PixiEditorSkiaRewrite
+namespace PixiEditorTests.ModelsTests.DataHoldersTests
 {
 {
     public class SurfaceTests
     public class SurfaceTests
     {
     {