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

Support configuration based InputMethod selection

Browse source
This commit is contained in:
John Lewin 2016-10-19 13:27:27 -07:00
parent 1bc04cca05
commit 5cf774dd49
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,6 +42,7 @@ using MatterHackers.GuiAutomation;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrintLibrary.Provider;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using NUnit.Framework;
namespace MatterHackers.MatterControl.Tests.Automation
@ -383,7 +384,10 @@ namespace MatterHackers.MatterControl.Tests.Automation
}
MatterControlApplication matterControlWindow = MatterControlApplication.CreateInstance(overrideWidth, overrideHeight);
var testRunner = AutomationRunner.ShowWindowAndExecuteTests(matterControlWindow, testMethod, maxTimeToRun, defaultTestImages);
var config = TestAutomationConfig.Load();
var testRunner = AutomationRunner.ShowWindowAndExecuteTests(matterControlWindow, testMethod, maxTimeToRun, defaultTestImages, config.AutomationInputType);
MatterControlUtilities.CloseMatterControlViaMenu(testRunner);
@ -479,6 +483,9 @@ namespace MatterHackers.MatterControl.Tests.Automation
/// </summary>
public string Printer { get; set; }
[JsonConverter(typeof(StringEnumConverter))]
public AutomationRunner.InputType AutomationInputType { get; set; } = AutomationRunner.InputType.Native;
public static TestAutomationConfig Load()
{
TestAutomationConfig config = null;