Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-02-23 19:49:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

wait less

Browse Source
This commit is contained in:
seraphima
2023-11-29 15:53:59 +01:00
parent 0ab6f001c4
commit 285127020a
3 changed files with 33 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/modules/fancyzones/UITests-FancyZonesEditor/CustomLayoutsTests.cs
View File

@@ -220,9 +220,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual($"{expected}", slider?.Text);
_session?.Click_Cancel();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!);
}
}
@@ -244,9 +242,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual($"{expected}", slider?.Text);
_session?.Click_Save();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
// verify the file
var customLayouts = new CustomLayouts();
@@ -272,9 +268,7 @@ namespace Microsoft.FancyZonesEditor.UITests
new CustomLayouts().GridFromJsonElement(layout.Info.GetRawText()).SensitivityRadius;
_session?.Click_Cancel();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
// verify the file
var customLayouts = new CustomLayouts();
@@ -309,9 +303,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual($"{expected}", slider?.Text);
_session?.Click_Cancel();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
}
}
@@ -327,9 +319,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual($"{expected}", slider?.Text);
_session?.Click_Save();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
// verify the file
var customLayouts = new CustomLayouts();
@@ -348,9 +338,7 @@ namespace Microsoft.FancyZonesEditor.UITests
var slider = _session?.GetSpaceAroundZonesSlider();
slider?.SendKeys(Keys.Right);
_session?.Click_Cancel();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
// verify the file
var customLayouts = new CustomLayouts();
@@ -373,9 +361,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual(expected, _session?.GetSpaceAroundZonesSlider()?.Enabled);
_session?.Click_Save();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(toggle!); // let the dialog window close
// verify the file
var customLayouts = new CustomLayouts();
@@ -397,9 +383,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreNotEqual(expected, _session?.GetSpaceAroundZonesSlider()?.Enabled);
_session?.Click_Cancel();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(toggle!); // let the dialog window close
// verify the file
var customLayouts = new CustomLayouts();

44
src/modules/fancyzones/UITests-FancyZonesEditor/TemplateLayoutsTests.cs
View File

@@ -217,9 +217,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual($"{expected}", slider?.Text);
_session?.Click_Cancel();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
}
}
@@ -237,9 +235,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual($"{expected}", slider?.Text);
_session?.Click_Save();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
// verify the file
var templateLayouts = new LayoutTemplates();
@@ -260,9 +256,7 @@ namespace Microsoft.FancyZonesEditor.UITests
slider?.SendKeys(Keys.Left);
_session?.Click_Cancel();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
// verify the file
var templateLayouts = new LayoutTemplates();
@@ -288,9 +282,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual($"{expected}", slider?.Text);
_session?.Click_Cancel();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
}
}
@@ -309,9 +301,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual($"{expected}", slider?.Text);
_session?.Click_Save();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
// verify the file
var templateLayouts = new LayoutTemplates();
@@ -331,9 +321,7 @@ namespace Microsoft.FancyZonesEditor.UITests
var slider = _session?.GetSensitivitySlider();
slider?.SendKeys(Keys.Right);
_session?.Click_Cancel();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
// verify the file
var templateLayouts = new LayoutTemplates();
@@ -365,9 +353,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual($"{expected}", slider?.Text);
_session?.Click_Cancel();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
}
}
@@ -384,9 +370,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual($"{expected}", slider?.Text);
_session?.Click_Save();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
// verify the file
var templateLayouts = new LayoutTemplates();
@@ -408,9 +392,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual($"{expected + 1}", slider?.Text);
_session?.Click_Cancel();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(slider!); // let the dialog window close
// verify the file
var templateLayouts = new LayoutTemplates();
@@ -433,9 +415,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreEqual(expected, _session?.GetSpaceAroundZonesSlider()?.Enabled);
_session?.Click_Save();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(toggle!); // let the dialog window close
// verify the file
var templateLayouts = new LayoutTemplates();
@@ -458,9 +438,7 @@ namespace Microsoft.FancyZonesEditor.UITests
Assert.AreNotEqual(expected, _session?.GetSpaceAroundZonesSlider()?.Enabled);
_session?.Click_Cancel();
// let the dialog window close
_session?.WaitFor(0.5f);
_session?.WaitUntilHidden(toggle!); // let the dialog window close
// verify the file
var templateLayouts = new LayoutTemplates();

49
src/modules/fancyzones/UITests-FancyZonesEditor/Utils/FancyZonesEditorSession.cs
View File

@@ -275,25 +275,13 @@ namespace Microsoft.FancyZonesEditor.UnitTests.Utils
WebDriverWait wait = new WebDriverWait(Session, TimeSpan.FromSeconds(1));
wait.Until(pred =>
{
bool displayed = false;
try
{
var element = Session?.FindElementByName(name);
if (element != null)
{
displayed = element.Displayed;
}
}
catch
var element = Session?.FindElementByName(name);
if (element != null)
{
return element.Displayed;
}
if (!displayed)
{
context.WriteLine($"{name} not displayed");
}
return displayed;
return false;
});
}
@@ -302,32 +290,23 @@ namespace Microsoft.FancyZonesEditor.UnitTests.Utils
WebDriverWait wait = new WebDriverWait(Session, TimeSpan.FromSeconds(1));
wait.Until(pred =>
{
bool displayed = false;
try
{
var element = Session?.FindElementByAccessibilityId(id);
if (element != null)
{
displayed = element.Displayed;
}
}
catch
var element = Session?.FindElementByAccessibilityId(id);
if (element != null)
{
return element.Displayed;
}
if (!displayed)
{
context.WriteLine($"{id} not displayed");
}
return displayed;
return false;
});
}
public void WaitFor(float seconds)
public void WaitUntilHidden(WindowsElement element)
{
WebDriverWait wait = new WebDriverWait(Session, TimeSpan.FromSeconds(seconds * 2));
wait.Timeout = TimeSpan.FromSeconds(seconds);
WebDriverWait wait = new WebDriverWait(Session, TimeSpan.FromSeconds(0.5));
wait.Until(pred =>
{
return !element.Displayed;
});
}
public void ContextClick(WindowsElement element)