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

Remove defaultTestImages parameter

Browse source 
- Leave as null, fall back to default on null
This commit is contained in:
John Lewin 2016-10-19 11:49:52 -07:00
parent 222535b107
commit 28699c9197
15 changed files with 64 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,14 +61,6 @@ namespace MatterHackers.MatterControl.Tests.Automation
Assert.IsTrue(testRunner.ClickByName(" Remove All Menu Item", 2));
}
public static string DefaultTestImages
{
get
{
return TestContext.CurrentContext.ResolveProjectPath(4, "Tests", "TestData", "TestImages");
}
}
public static void CreateDownloadsSubFolder()
{
Directory.CreateDirectory(PathToDownloadsSubFolder);
@ -385,6 +377,11 @@ namespace MatterHackers.MatterControl.Tests.Automation
MatterControlUtilities.AddItemsToQueue(queueTemplateDirectory);
}
if (defaultTestImages == null)
{
defaultTestImages = TestContext.CurrentContext.ResolveProjectPath(4, "Tests", "TestData", "TestImages");
}
MatterControlApplication matterControlWindow = MatterControlApplication.CreateInstance(overrideWidth, overrideHeight);
return AutomationRunner.ShowWindowAndExecuteTests(matterControlWindow, testMethod, maxTimeToRun, defaultTestImages);
}