Selaa lähdekoodia

Fixed test bug.

Tig 4 viikkoa sitten
vanhempi
sitoutus
a5a68823aa

+ 4 - 0
Tests/UnitTestsParallelizable/Drawing/ThicknessTests.cs

@@ -754,6 +754,7 @@ public class ThicknessTests (ITestOutputHelper output) : FakeDriverBase
         var r = new Rectangle (2, 2, 40, 15);
 
         top.Draw ();
+        top.SetClipToScreen ();
         t.Draw (r, ViewDiagnosticFlags.Ruler, "Test", driver);
 
         DriverAssert.AssertDriverContentsAre (
@@ -786,6 +787,7 @@ public class ThicknessTests (ITestOutputHelper output) : FakeDriverBase
         r = new (1, 1, 40, 15);
         top.SetNeedsDraw ();
         top.Draw ();
+        top.SetClipToScreen ();
         t.Draw (r, ViewDiagnosticFlags.Ruler, "Test", driver);
 
         DriverAssert.AssertDriverContentsAre (
@@ -818,6 +820,7 @@ public class ThicknessTests (ITestOutputHelper output) : FakeDriverBase
         r = new (2, 2, 40, 15);
         top.SetNeedsDraw ();
         top.Draw ();
+        top.SetClipToScreen ();
         t.Draw (r, ViewDiagnosticFlags.Ruler, "Test", driver);
 
         DriverAssert.AssertDriverContentsWithFrameAre (
@@ -850,6 +853,7 @@ public class ThicknessTests (ITestOutputHelper output) : FakeDriverBase
         r = new (5, 5, 40, 15);
         top.SetNeedsDraw ();
         top.Draw ();
+        top.SetClipToScreen ();
         t.Draw (r, ViewDiagnosticFlags.Ruler, "Test", driver);
 
         DriverAssert.AssertDriverContentsWithFrameAre (

+ 5 - 3
Tests/UnitTestsParallelizable/View/Draw/ViewDrawingClippingTests.cs

@@ -629,7 +629,7 @@ public class ViewDrawingClippingTests (ITestOutputHelper output) : FakeDriverBas
     }
 
     [Fact]
-    public void Draw_RestoresOriginalClip ()
+    public void Draw_Excludes_View_From_Clip ()
     {
         IDriver driver = CreateFakeDriver (80, 25);
         var originalClip = new Region (driver.Screen);
@@ -647,10 +647,12 @@ public class ViewDrawingClippingTests (ITestOutputHelper output) : FakeDriverBas
         view.EndInit ();
         view.LayoutSubViews ();
 
+        Region clipWithViewExcluded = originalClip.Clone ();
+        clipWithViewExcluded.Exclude (view.Frame);
+
         view.Draw ();
 
-        Assert.Equal (originalClip, driver.Clip);
-        // After draw, clip should be restored (though it may be modified)
+        Assert.Equal (clipWithViewExcluded, driver.Clip);
         Assert.NotNull (driver.Clip);
     }