Browse Source

LayoutTest: minor refactoring

Marcin Ziąbek 2 years ago
parent
commit
cbed63c035

+ 13 - 13
Source/QuestPDF.LayoutTests/UnitTest1.cs → Source/QuestPDF.LayoutTests/LayoutTestResult.cs

@@ -41,9 +41,9 @@ public class Tests
                     .TakenAreaSize(400, 300)
                     .Content(page =>
                     {
-                        page.Child("a").Position(0, 0).Size(250, 200);
-                        page.Child("b").Position(150, 50).Size(50, 150);
-                        page.Child("c").Position(200, 100).Size(100, 50);
+                        page.Mock("a").Position(0, 0).Size(250, 200);
+                        page.Mock("b").Position(150, 50).Size(50, 150);
+                        page.Mock("c").Position(200, 100).Size(100, 50);
                     });
                 
                 document
@@ -51,9 +51,9 @@ public class Tests
                     .TakenAreaSize(400, 300)
                     .Content(page =>
                     {
-                        page.Child("a").Position(0, 0).Size(150, 100);
-                        page.Child("b").Position(250, 150).Size(50, 150);
-                        page.Child("c").Position(300, 200).Size(100, 50);
+                        page.Mock("a").Position(0, 0).Size(150, 100);
+                        page.Mock("b").Position(250, 150).Size(50, 150);
+                        page.Mock("c").Position(300, 200).Size(100, 50);
                     });
             });
             //.CompareVisually();
@@ -81,8 +81,8 @@ public class Tests
                     .TakenAreaSize(150, 200)
                     .Content(page =>
                     {
-                        page.Child("a").Position(0, 0).Size(150, 150);
-                        page.Child("b").Position(0, 175).Size(125, 25);
+                        page.Mock("a").Position(0, 0).Size(150, 150);
+                        page.Mock("b").Position(0, 175).Size(125, 25);
                     });
                 
                 document
@@ -90,7 +90,7 @@ public class Tests
                     .TakenAreaSize(125, 75)
                     .Content(page =>
                     {
-                        page.Child("b").Position(0, 0).Size(125, 75);
+                        page.Mock("b").Position(0, 0).Size(125, 75);
                     });
             })
             .Validate();
@@ -116,12 +116,12 @@ public class Tests
                     .TakenAreaSize(150, 100)
                     .Content(page =>
                     {
-                        page.Child("b").Position(0, 0).Size(150, 100);
-                        page.Child("a").Position(0, 0).Size(100, 150);
+                        page.Mock("b").Position(0, 0).Size(150, 100);
+                        page.Mock("a").Position(0, 0).Size(100, 150);
                         
                     });
             })
-            .CompareVisually();
-           //.Validate();
+            //.CompareVisually();
+           .Validate();
     }
 }

+ 1 - 1
Source/QuestPDF.LayoutTests/TestEngine/LayoutTestException.cs

@@ -1,6 +1,6 @@
 namespace QuestPDF.LayoutTests.TestEngine;
 
-public class LayoutTestException : Exception
+public sealed class LayoutTestException : Exception
 {
     internal LayoutTestException(string message) : base(message)
     {

+ 1 - 1
Source/QuestPDF.LayoutTests/TestEngine/LayoutTestExecutor.cs

@@ -6,7 +6,7 @@ using QuestPDF.Infrastructure;
 
 namespace QuestPDF.LayoutTests.TestEngine;
 
-internal class LayoutTestExecutor
+internal static class LayoutTestExecutor
 {
     public static ICollection<LayoutTestResult.PageLayoutSnapshot> Execute(Size pageSize, Container container)
     {

+ 1 - 1
Source/QuestPDF.LayoutTests/TestEngine/LayoutTestOutputVisualization.cs

@@ -6,7 +6,7 @@ using SkiaSharp;
 
 namespace QuestPDF.LayoutTests.TestEngine;
 
-internal class LayoutTestResultVisualization
+internal static class LayoutTestResultVisualization
 {
     // visual settings
     private const string DocumentBackgroundColor = Colors.Grey.Lighten1;

+ 3 - 3
Source/QuestPDF.LayoutTests/TestEngine/LayoutTestResult.cs

@@ -2,20 +2,20 @@ using QuestPDF.Infrastructure;
 
 namespace QuestPDF.LayoutTests.TestEngine;
 
-internal class LayoutTestResult
+internal sealed class LayoutTestResult
 {
     public Size PageSize { get; set; }
     
     public ICollection<PageLayoutSnapshot> ActualLayout { get; set; }
     public ICollection<PageLayoutSnapshot> ExpectedLayout { get; set; }
 
-    public class PageLayoutSnapshot
+    public sealed class PageLayoutSnapshot
     {
         public Size RequiredArea { get; set; }
         public ICollection<MockLayoutPosition> MockPositions { get; set; }
     }
 
-    public class MockLayoutPosition
+    public sealed class MockLayoutPosition
     {
         public string MockId { get; set; }
         public Position Position { get; set; }

+ 1 - 1
Source/QuestPDF.LayoutTests/TestEngine/LayoutTestValidator.cs

@@ -2,7 +2,7 @@ using QuestPDF.Infrastructure;
 
 namespace QuestPDF.LayoutTests.TestEngine;
 
-internal class LayoutTestValidator
+internal static class LayoutTestValidator
 {
     public static void Validate(LayoutTestResult result)
     {

+ 0 - 60
Source/QuestPDF.LayoutTests/TestEngine/MockCanvas.cs

@@ -1,60 +0,0 @@
-using QuestPDF.Infrastructure;
-using SkiaSharp;
-
-namespace QuestPDF.LayoutTests.TestEngine;
-
-internal class MockCanvas : ICanvas
-{
-    private SKPictureRecorder PictureRecorder { get; }
-    private SKCanvas Canvas { get; }
-    
-    public MockCanvas()
-    {
-        
-    }
-    
-    public void Translate(Position vector)
-    {
-        
-    }
-
-    public void DrawRectangle(Position vector, Size size, string color)
-    {
-        
-    }
-
-    public void DrawText(SKTextBlob skTextBlob, Position position, TextStyle style)
-    {
-        
-    }
-
-    public void DrawImage(SKImage image, Position position, Size size)
-    {
-        
-    }
-
-    public void DrawHyperlink(string url, Size size)
-    {
-        
-    }
-
-    public void DrawSectionLink(string sectionName, Size size)
-    {
-        
-    }
-
-    public void DrawSection(string sectionName)
-    {
-        
-    }
-
-    public void Rotate(float angle)
-    {
-        
-    }
-
-    public void Scale(float scaleX, float scaleY)
-    {
-        
-    }
-}