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

Merge remote-tracking branch 'origin/1.6'

Browse source 
# Conflicts:
#	Submodules/agg-sharp
This commit is contained in:
Lars Brubaker 2017-01-10 18:49:54 -08:00
commit 174983ad7e
17 changed files with 651 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,7 @@ using MatterHackers.GuiAutomation;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrintLibrary.Provider;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.RenderOpenGl.OpenGl;
using MatterHackers.PrinterEmulator;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using NUnit.Framework;
@ -171,7 +171,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
}
}
public static Process LaunchAndConnectToPrinterEmulator(this AutomationRunner testRunner, string make = "Airwolf 3D", string model = "HD", bool runSlow = false)
public static IDisposable LaunchAndConnectToPrinterEmulator(this AutomationRunner testRunner, string make = "Airwolf 3D", string model = "HD", bool runSlow = false)
{
// Load the TestEnv config
var config = TestAutomationConfig.Load();
@ -179,19 +179,12 @@ namespace MatterHackers.MatterControl.Tests.Automation
// Create the printer
MatterControlUtilities.AddAndSelectPrinter(testRunner, make, model);
var process = new PrintEmulatorProcess();
process.StartInfo = new ProcessStartInfo()
{
FileName = "python",
Arguments = string.Format("{0} {1}{2}",
StaticData.Instance.MapPath("../PrinterEmulator.py"),
config.Printer,
runSlow ? " slow" : ""),
Emulator emulator = new Emulator();
WindowStyle = ProcessWindowStyle.Minimized
};
emulator.PortName = config.Printer;
emulator.RunSlow = runSlow;
process.Start();
emulator.Startup();
// edit the com port
SystemWindow containingWindow;
@ -211,8 +204,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.WaitForName("Disconnect from printer button", 5);
return process;
}
return emulator;
}
public static bool CompareExpectedSliceSettingValueWithActualVaue(string sliceSetting, string expectedValue)
{