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

Merge branch '1.6'

Browse source 
# Conflicts:
#	SlicerConfiguration/Settings/ProfileManager.cs
#	Tests/MatterControl.AutomationTests/PrintQueueTests.cs
#	Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
This commit is contained in:
Lars Brubaker 2016-12-07 16:14:56 -08:00
commit dbd2c20398
5 changed files with 75 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Tests/MatterControl.AutomationTests/PrintQueueTests.cs
View file

@ -547,9 +547,11 @@ namespace MatterHackers.MatterControl.Tests.Automation
Assert.AreEqual(0, QueueData.Instance.ItemCount, "Queue is empty after RemoveAll action");
// Assert that widgets have been removed
Assert.IsTrue(!testRunner.WaitForName("Queue Item Batman"), "Batman part removed");
Assert.IsTrue(!testRunner.WaitForName("Queue Item Fennec_Fox"), "Fox part removed");
Assert.IsTrue(!testRunner.WaitForName("Queue Item 2013-01-25_Mouthpiece_v2"), "Mouthpiece part removed");
testRunner.Wait(.5);
Assert.IsFalse(testRunner.NameExists("Queue Item Batman"), "Batman part removed");
Assert.IsFalse(testRunner.NameExists("Queue Item Fennec_Fox"), "Fox part removed");
Assert.IsFalse(testRunner.NameExists("Queue Item 2013-01-25_Mouthpiece_v2"), "Mouthpiece part removed");
return Task.FromResult(0);
};
@ -603,6 +605,13 @@ namespace MatterHackers.MatterControl.Tests.Automation
await MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
}
/// <summary>
/// *Tests:
/// *1. When the remove button on a queue item is clicked the queue tab count decreases by one
/// *2. When the remove button on a queue item is clicked the item is removed
/// *3. When the View button on a queue item is clicked the part preview window is opened
/// </summary>
/// <returns></returns>
[Test, Apartment(ApartmentState.STA)]
public async Task ClickQueueRowItemViewAndRemove()
{
@ -610,16 +619,9 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
testRunner.CloseSignInAndPrinterSelect();
/*
*Tests:
*1. When the remove button on a queue item is clicked the queue tab count decreases by one
*2. When the remove button on a queue item is clicked the item is removed
*3. When the View button on a queue item is clicked the part preview window is opened
*/
testRunner.Wait(2);
int currentQueueItemCount = QueueData.Instance.ItemCount;
Assert.AreEqual(4, QueueData.Instance.ItemCount, "Queue should initially have four items");
Assert.IsTrue(testRunner.WaitForName("Queue Item Batman", 1));
Assert.IsTrue(testRunner.WaitForName("Queue Item 2013-01-25_Mouthpiece_v2", 1));
@ -627,21 +629,15 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Queue Item Batman Remove");
testRunner.Wait(2);
int queueItemCountAfterRemove = QueueData.Instance.ItemCount;
Assert.AreEqual(3, QueueData.Instance.ItemCount, "Batman item removed");
Assert.IsFalse(testRunner.NameExists("Queue Item Batman"), "Batman item removed");
Assert.IsTrue(currentQueueItemCount - 1 == queueItemCountAfterRemove);
bool batmanQueueItemExists = testRunner.WaitForName("Queue Item Batman", 1);
Assert.IsTrue(batmanQueueItemExists == false);
bool partPreviewWindowExists1 = testRunner.WaitForName("Queue Item 2013-01-25_Mouthpiece_v2 Part Preview", 1);
Assert.IsTrue(partPreviewWindowExists1 == false);
Assert.IsFalse(testRunner.NameExists("Queue Item 2013-01-25_Mouthpiece_v2 Part Preview"), "Mouthpiece Part Preview should not initially be visible");
testRunner.ClickByName("Queue Item 2013-01-25_Mouthpiece_v2", 1);
testRunner.Wait(2);
testRunner.ClickByName("Queue Item 2013-01-25_Mouthpiece_v2 View", 1);
bool partPreviewWindowExists2 = testRunner.WaitForName("Queue Item 2013-01-25_Mouthpiece_v2 Part Preview", 2);
Assert.IsTrue(partPreviewWindowExists2 == true);
Assert.IsTrue(testRunner.WaitForName("Queue Item 2013-01-25_Mouthpiece_v2 Part Preview", 2), "The Mouthpiece Part Preview should appear after the view button is clicked");
return Task.FromResult(0);
};