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

Fix LibrarySelection -> Rename

Browse source 
- RenameButtonRenameLocalLibraryItem test passing
- Get LibrarySelection->Remove action to compile after refactoring
- Make LibraryRenameSelectedItem an extension method and update callers
This commit is contained in:
John Lewin 2017-06-03 13:29:36 -07:00
parent d8afb799ca
commit ce6a3834fc
8 changed files with 102 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -164,7 +164,9 @@ namespace MatterHackers.MatterControl.Tests.Automation
//Rename added item
testRunner.ClickByName("Library Edit Button", .5);
testRunner.ClickByName("Row Item Batman");
MatterControlUtilities.LibraryRenameSelectedItem(testRunner);
testRunner.LibraryRenameSelectedItem();
testRunner.Delay(.5);
testRunner.Type("Batman Renamed");
testRunner.ClickByName("Rename Button");

41
Tests/MatterControl.AutomationTests/LocalLibraryTests.cs
View file

@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
[Test]
public async Task RenameButtonRenameLocalLibraryItem()
{
AutomationTest testToRun = (testRunner) =>
await MatterControlUtilities.RunTest((testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
@ -143,31 +143,31 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Library Tab");
testRunner.NavigateToFolder("Local Library Row Item Collection");
testRunner.Delay(1);
string rowItemToRename = "Row Item Calibration - Box";
testRunner.ClickByName("Library Edit Button");
testRunner.Delay(1);
testRunner.ClickByName(rowItemToRename);
MatterControlUtilities.LibraryRenameSelectedItem(testRunner);
// Add Library item
testRunner.ClickByName("Library Add Button", 5);
testRunner.Delay(2);
testRunner.Type(MatterControlUtilities.GetTestItemPath("Rook.amf"));
testRunner.Delay(1);
testRunner.Type("{Enter}");
testRunner.Type("Library Item Renamed");
testRunner.ClickByName("Row Item Rook", 2);
// Open and wait rename window
testRunner.LibraryRenameSelectedItem();
testRunner.WaitForName("Rename Button");
testRunner.Delay(1);
// Rename item
testRunner.Type("Rook Renamed");
testRunner.ClickByName("Rename Button");
string renamedRowItem = "Row Item Library Item Renamed";
bool libraryItemWasRenamed = testRunner.WaitForName(renamedRowItem, 2);
bool libraryItemBeforeRenameExists = testRunner.WaitForName(rowItemToRename, 2);
Assert.IsTrue(libraryItemWasRenamed == true);
Assert.IsTrue(libraryItemBeforeRenameExists == false);
// Confirm
Assert.IsTrue(testRunner.WaitForName("Row Item Rook Renamed", 5));
Assert.IsFalse(testRunner.WaitForName("Row Item Rook", 2));
return Task.FromResult(0);
};
await MatterControlUtilities.RunTest(testToRun, overrideWidth: 600);
}, overrideWidth: 600);
}
[Test]
@ -201,7 +201,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("New Folder Row Item Collection");
testRunner.Delay(.2);
MatterControlUtilities.LibraryRenameSelectedItem(testRunner);
testRunner.LibraryRenameSelectedItem();
testRunner.Delay(.5);
testRunner.Type("Renamed Library Folder");

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

@ -378,7 +378,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName(partName, 1);
testRunner.ClickByName("Print Library Overflow Menu", 1);
testRunner.ClickByName("Add to Plate MenuItem");
testRunner.ClickByName("Add to Plate Menu Item");
}
public static void WaitForPrintFinished(this AutomationRunner testRunner)
@ -445,28 +445,28 @@ namespace MatterHackers.MatterControl.Tests.Automation
public static void LibraryAddSelectionToQueue(AutomationRunner testRunner)
{
testRunner.ClickByName("LibraryActionMenu");
testRunner.ClickByName("Print Library Overflow Menu");
testRunner.ClickByName("Add to Queue Menu Item", 1);
}
public static void LibraryEditSelectedItem(AutomationRunner testRunner)
{
testRunner.ClickByName("LibraryActionMenu");
testRunner.ClickByName("Edit Menu Item", 1);
testRunner.Delay(1); // wait for the new window to open
}
public static void LibraryRenameSelectedItem(AutomationRunner testRunner)
public static void LibraryRenameSelectedItem(this AutomationRunner testRunner)
{
testRunner.ClickByName("LibraryActionMenu");
testRunner.ClickByName("Print Library Overflow Menu");
testRunner.ClickByName("Rename Menu Item", 1);
}
public static void LibraryRemoveSelectedItem(AutomationRunner testRunner)
{
testRunner.ClickByName("LibraryActionMenu");
testRunner.ClickByName("Print Library Overflow Menu");
testRunner.ClickByName("Remove Menu Item", 1);
}
public static string ResolveProjectPath(this TestContext context, int stepsToProjectRoot, params string[] relativePathSteps)
{
string assemblyPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);

9
Tests/MatterControl.Tests/MatterControl/PerformanceTests.cs
View file

@ -141,7 +141,6 @@ namespace MatterHackers.MatterControl
container.BeforeDraw -= beforeDraw;
};
container.BeforeDraw += beforeDraw;
}
public static void AddLocalLibraryItemToQueue(GuiWidget container, double secondsBetweenClicks = .1)
@ -182,7 +181,9 @@ namespace MatterHackers.MatterControl
testRunner.ClickByName("Library Edit Button");
testRunner.ClickByName("Row Item Calibration - Box");
testRunner.Delay(.5);
MatterControlUtilities.LibraryRenameSelectedItem(testRunner);
testRunner.LibraryRenameSelectedItem();
testRunner.Delay(.5);
testRunner.Type("Renamed Calibration Cube");
testRunner.ClickByName("Rename Button");
@ -211,7 +212,9 @@ namespace MatterHackers.MatterControl
testRunner.ClickByName("Create Folder Button");
testRunner.ClickByName("Library Edit Button");
testRunner.ClickByName("Row Item New Folder");
MatterControlUtilities.LibraryRenameSelectedItem(testRunner);
testRunner.LibraryRenameSelectedItem();
testRunner.Delay(.5);
testRunner.Type("Renamed Folder");
testRunner.ClickByName("Rename Button");