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

Eliminate PrinterConnection.Instance

Browse source
This commit is contained in:
John Lewin 2017-09-17 21:08:16 -07:00
parent 928fed9efe
commit 76e7af0436
26 changed files with 265 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Tests/MatterControl.AutomationTests/PrintingTests.cs
View file

@ -45,12 +45,12 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.WaitForPrintFinished();
// Wait for expected temp
testRunner.Delay(() => PrinterConnection.Instance.GetActualHotendTemperature(0) <= 0, 5);
Assert.Less(PrinterConnection.Instance.GetActualHotendTemperature(0), 30);
testRunner.Delay(() => ApplicationController.Instance.ActivePrinter.Connection.GetActualHotendTemperature(0) <= 0, 5);
Assert.Less(ApplicationController.Instance.ActivePrinter.Connection.GetActualHotendTemperature(0), 30);
// Wait for expected temp
testRunner.Delay(() => PrinterConnection.Instance.ActualBedTemperature <= 10, 5);
Assert.Less(PrinterConnection.Instance.ActualBedTemperature, 10);
testRunner.Delay(() => ApplicationController.Instance.ActivePrinter.Connection.ActualBedTemperature <= 10, 5);
Assert.Less(ApplicationController.Instance.ActivePrinter.Connection.ActualBedTemperature, 10);
}
return Task.CompletedTask;
@ -278,7 +278,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
// Wait for printing to complete
var printFinishedResetEvent = new AutoResetEvent(false);
PrinterConnection.Instance.PrintFinished.RegisterEvent((s, e) => printFinishedResetEvent.Set(), ref unregisterEvents);
ApplicationController.Instance.ActivePrinter.Connection.PrintFinished.RegisterEvent((s, e) => printFinishedResetEvent.Set(), ref unregisterEvents);
testRunner.ClickByName("Start Print Button");
@ -312,7 +312,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
ConfirmExpectedSpeeds(testRunner, targetExtrusionRate, targetFeedRate);
// Wait for slicing to complete before setting target values
testRunner.Delay(() => PrinterConnection.Instance.DetailedPrintingState == DetailedPrintingState.Printing, 8);
testRunner.Delay(() => ApplicationController.Instance.ActivePrinter.Connection.DetailedPrintingState == DetailedPrintingState.Printing, 8);
testRunner.Delay();
ConfirmExpectedSpeeds(testRunner, targetExtrusionRate, targetFeedRate);
@ -369,7 +369,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.SwitchToControlsTab();
var printFinishedResetEvent = new AutoResetEvent(false);
PrinterConnection.Instance.PrintFinished.RegisterEvent((s, e) => printFinishedResetEvent.Set(), ref unregisterEvents);
ApplicationController.Instance.ActivePrinter.Connection.PrintFinished.RegisterEvent((s, e) => printFinishedResetEvent.Set(), ref unregisterEvents);
testRunner.ClickByName("Start Print Button");
@ -403,7 +403,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
ConfirmExpectedSpeeds(testRunner, targetExtrusionRate, targetFeedRate);
// Wait for slicing to complete before setting target values
testRunner.Delay(() => PrinterConnection.Instance.DetailedPrintingState == DetailedPrintingState.Printing, 8);
testRunner.Delay(() => ApplicationController.Instance.ActivePrinter.Connection.DetailedPrintingState == DetailedPrintingState.Printing, 8);
testRunner.Delay();
// Values should remain after print completes