Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #2559. BackgroundWorkerCollection scenario is broken. (#2560)

Browse Source
This commit is contained in:
BDisp
2023-04-17 16:32:35 +01:00
committed by GitHub
parent 1bc25900e7
commit 962ccc6c0a
3 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Terminal.Gui/Views/ToplevelEventArgs.cs
View File

@@ -9,10 +9,10 @@ namespace Terminal.Gui {
/// <summary>
/// Creates a new instance of the <see cref="ToplevelClosingEventArgs"/> class.
/// </summary>
/// <param name="Toplevel"></param>
public ToplevelEventArgs (Toplevel Toplevel)
/// <param name="toplevel"></param>
public ToplevelEventArgs (Toplevel toplevel)
{
Toplevel = Toplevel;
Toplevel = toplevel;
}
/// <summary>

4
UICatalog/Scenarios/BackgroundWorkerCollection.cs
View File

@@ -107,7 +107,7 @@ namespace UICatalog.Scenarios {
var top = Application.OverlappedChildren.Find ((x) => x.Data.ToString () == "WorkerApp");
item.Checked = top.Visible = (bool)!item.Checked;
if (top.Visible) {
Application.MoveToOverlappedChild (null);
Application.MoveToOverlappedChild (top);
} else {
Application.OverlappedTop.SetNeedsDisplay ();
}
@@ -139,7 +139,7 @@ namespace UICatalog.Scenarios {
item.Checked = false;
}
item.Action += () => {
Application.MoveToOverlappedChild (null);
Application.MoveToOverlappedChild (top);
};
menuItems.Add (item);
}

40
UnitTests/Views/OverlappedTests.cs
View File

@@ -90,15 +90,15 @@ namespace Terminal.Gui.ViewsTests {
Assert.True (Application.Current == d);
};
d.Closed += (s,e) => Application.RequestStop (top1);
d.Closed += (s, e) => Application.RequestStop (top1);
Application.Iteration += () => {
Assert.Null (Application.OverlappedChildren);
if (iterations == 4) Assert.True (Application.Current == d);
else if (iterations == 3) Assert.True (Application.Current == top4);
else if (iterations == 2) Assert.True (Application.Current == top3);
else if (iterations == 1) Assert.True (Application.Current == top2);
else Assert.True (Application.Current == top1);
if (iterations == 4) Assert.True (Application.Current == d);
else if (iterations == 3) Assert.True (Application.Current == top4);
else if (iterations == 2) Assert.True (Application.Current == top3);
else if (iterations == 1) Assert.True (Application.Current == top2);
else Assert.True (Application.Current == top1);
Application.RequestStop (top1);
iterations--;
};
@@ -154,7 +154,7 @@ else Assert.True (Application.Current == top1);
};
// Now this will close the OverlappedContainer propagating through the OverlappedChildren.
d.Closed += (s,e) => {
d.Closed += (s, e) => {
overlapped.RequestStop ();
};
@@ -165,7 +165,7 @@ else Assert.True (Application.Current == top1);
Assert.False (d.Running);
} else {
Assert.Equal (iterations, Application.OverlappedChildren.Count);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + 1).ToString (), Application.OverlappedChildren [i].Id);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + 1).ToString (), Application.OverlappedChildren [i].Id);
}
iterations--;
};
@@ -214,7 +214,7 @@ else Assert.True (Application.Current == top1);
};
// Now this will close the OverlappedContainer propagating through the OverlappedChildren.
d.Closed += (s,e) => Application.RequestStop (overlapped);
d.Closed += (s, e) => Application.RequestStop (overlapped);
Application.Iteration += () => {
if (iterations == 4) {
@@ -223,7 +223,7 @@ else Assert.True (Application.Current == top1);
Assert.False (d.Running);
} else {
Assert.Equal (iterations, Application.OverlappedChildren.Count);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + 1).ToString (), Application.OverlappedChildren [i].Id);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + 1).ToString (), Application.OverlappedChildren [i].Id);
}
iterations--;
};
@@ -282,7 +282,7 @@ else Assert.True (Application.Current == top1);
Assert.False (d.Running);
} else {
Assert.Equal (iterations, Application.OverlappedChildren.Count);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + 1).ToString (), Application.OverlappedChildren [i].Id);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + 1).ToString (), Application.OverlappedChildren [i].Id);
}
iterations--;
};
@@ -380,7 +380,7 @@ else Assert.True (Application.Current == top1);
Assert.False (Application.Current.Running);
} else {
Assert.Equal (iterations, Application.OverlappedChildren.Count);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + 1).ToString (), Application.OverlappedChildren [i].Id);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + 1).ToString (), Application.OverlappedChildren [i].Id);
}
iterations--;
};
@@ -447,7 +447,7 @@ else Assert.True (Application.Current == top1);
Assert.True (c4.Running);
} else {
Assert.Equal (iterations, Application.OverlappedChildren.Count);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + (iterations == 4 && i == 0 ? 2 : 1)).ToString (),
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + (iterations == 4 && i == 0 ? 2 : 1)).ToString (),
Application.OverlappedChildren [i].Id);
}
iterations--;
@@ -570,7 +570,7 @@ else Assert.True (Application.Current == top1);
};
stage.Closed += (_, _) => {
if (iterations == 11) allStageClosed = true;
if (iterations == 11) allStageClosed = true;
Assert.Equal (iterations, Application.OverlappedChildren.Count);
if (running) {
stageCompleted = true;
@@ -592,12 +592,12 @@ else Assert.True (Application.Current == top1);
running = false;
Assert.Equal (iterations, Application.OverlappedChildren.Count);
} else if (!overlappedRequestStop && running && !allStageClosed) Assert.Equal (iterations, Application.OverlappedChildren.Count);
else if (!overlappedRequestStop && !running && allStageClosed) {
} else if (!overlappedRequestStop && running && !allStageClosed) Assert.Equal (iterations, Application.OverlappedChildren.Count);
else if (!overlappedRequestStop && !running && allStageClosed) {
Assert.Equal (iterations, Application.OverlappedChildren.Count);
overlappedRequestStop = true;
overlapped.RequestStop ();
} else Assert.Empty (Application.OverlappedChildren);
} else Assert.Empty (Application.OverlappedChildren);
};
Application.Run (overlapped);
@@ -672,5 +672,11 @@ else if (!overlappedRequestStop && !running && allStageClosed) {
Assert.Empty (Application.OverlappedChildren);
}
[Fact]
public void MoveToOverlappedChild_Throw_NullReferenceException_Passing_Null_Parameter ()
{
Assert.Throws<NullReferenceException> (delegate { Application.MoveToOverlappedChild (null); });
}
}
}