nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2149 from jlewin/design_tools

Browse source 
Revise PrinterNameChangePersists test, fix blocking test issue
This commit is contained in:
johnlewin 2017-06-09 20:35:53 -07:00 • committed by GitHub
commit 7126e1c9fa
5 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SlicerConfiguration/SliceSettingsDetailControl.cs
View file

@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
var overflowDropdown = new OverflowDropdown(false)
{
AlignToRightEdge = true,
Name = "Slice Settings Options Menu"
Name = "Slice Settings Overflow Menu"
};
showHelpBox = new CheckBox("Show Help".Localize());

3
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -276,7 +276,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
string settingsLevel = UserSettings.Instance.get(UserSettingsKey.SliceSettingsLevel);
if (SliceSettingsOrganizer.Instance.UserLevels.ContainsKey(settingsLevel))
if (!string.IsNullOrEmpty(settingsLevel)
&& SliceSettingsOrganizer.Instance.UserLevels.ContainsKey(settingsLevel))
{
return settingsLevel;
}

4
Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs
View file

@ -68,8 +68,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
// reset to defaults and make sure print leveling is cleared
testRunner.SwitchToAdvancedSliceSettings();
testRunner.ClickByName("Slice Settings Options Menu", 1);
testRunner.ClickByName("Reset to Defaults Menu Item", 1);
testRunner.ClickByName("Slice Settings Overflow Menu");
testRunner.ClickByName("Reset to Defaults Menu Item");
testRunner.ClickByName("Yes Button", .5);
testRunner.Delay(1);

22
Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs
View file

@ -9,30 +9,26 @@ using NUnit.Framework;
namespace MatterHackers.MatterControl.Tests.Automation
{
[TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain]
[TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain, Apartment(ApartmentState.STA)]
public class PrinterNameChangePersists
{
[Test, Apartment(ApartmentState.STA)]
[Test]
public async Task PrinterNameStaysChanged()
{
AutomationTest testToRun = (testRunner) =>
await MatterControlUtilities.RunTest((testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
testRunner.AddAndSelectPrinter("Airwolf 3D", "HD");
testRunner.SwitchToAdvancedSliceSettings();
testRunner.ClickByName("Printer Tab", 1);
string widgetName = "Printer Name Edit";
testRunner.ClickByName(widgetName);
testRunner.ClickByName("Printer Name Edit");
SystemWindow window;
var textWidget = testRunner.GetWidgetByName(widgetName, out window);
var textWidget = testRunner.GetWidgetByName("Printer Name Edit", out _);
string newName = "Updated name";
textWidget.Text = newName;
testRunner.ClickByName("Printer Tab", 1);
testRunner.ClickByName("Printer Tab");
testRunner.Delay(4);
//Check to make sure the Printer dropdown gets the name change
@ -40,12 +36,10 @@ namespace MatterHackers.MatterControl.Tests.Automation
Assert.IsTrue(testRunner.WaitForName(newName + " Menu Item"), "Widget with updated printer name exists");
//Make sure the Active profile name changes as well
Assert.IsTrue(ProfileManager.Instance.ActiveProfile.Name == newName, "ActiveProfile has updated name");
Assert.AreEqual(newName, ProfileManager.Instance.ActiveProfile.Name, "ActiveProfile has updated name");
return Task.CompletedTask;
};
await MatterControlUtilities.RunTest(testToRun);
});
}
}
}

3
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -541,6 +541,9 @@ namespace MatterHackers.MatterControl.Tests.Automation
// Switch to Slice Settings Tab
testRunner.ClickByName("Slice Settings Tab");
// Show the overflow menu
testRunner.ClickByName("Slice Settings Overflow Menu");
// Change to Advanced view
testRunner.ClickByName("User Level Dropdown");
testRunner.ClickByName("Advanced Menu Item");