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

Fixed the test that had not been updated

Browse source
This commit is contained in:
larsbrubaker 2016-12-04 12:26:04 -08:00
parent 166325734e
commit 541e4ef7b1
3 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Tests/MatterControl.AutomationTests/FileMenuTest.cs
View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
string queueItemPath = MatterControlUtilities.GetTestItemPath("Fennec_Fox.stl");
int queueBeforeCount = QueueData.Instance.Count;
int queueBeforeCount = QueueData.Instance.ItemCount;
testRunner.Type(queueItemPath);
testRunner.Wait(1);
@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(2);
Assert.IsTrue(testRunner.WaitForName("Queue Item Fennec_Fox", 2));
int queueAfterCount = QueueData.Instance.Count;
int queueAfterCount = QueueData.Instance.ItemCount;
Assert.IsTrue(queueAfterCount == queueBeforeCount + 1);
@ -81,7 +81,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
string pathToSecondQueueItem = MatterControlUtilities.GetTestItemPath("Batman.stl");
string textForBothQueueItems = string.Format("\"{0}\" \"{1}\"", queueItemPath, pathToSecondQueueItem);
int queueBeforeAddCount = QueueData.Instance.Count;
int queueBeforeAddCount = QueueData.Instance.ItemCount;
testRunner.Type(textForBothQueueItems);
testRunner.Wait(2);
@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
Assert.IsTrue(testRunner.WaitForName("Queue Item Fennec_Fox", 2));
Assert.IsTrue(testRunner.WaitForName("Queue Item Batman", 2));
int queueAfterAddCount = QueueData.Instance.Count;
int queueAfterAddCount = QueueData.Instance.ItemCount;
Assert.IsTrue(queueAfterAddCount == queueBeforeAddCount + 2);
@ -112,7 +112,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Add File To Queue Menu Item");
testRunner.Wait(2);
int beforeCount = QueueData.Instance.Count;
int beforeCount = QueueData.Instance.ItemCount;
string pathToType = MatterControlUtilities.GetTestItemPath("Batman.zip");
testRunner.Type(pathToType);
@ -122,7 +122,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
Assert.IsTrue(testRunner.WaitForName("Queue Item Batman", 1));
Assert.IsTrue(testRunner.WaitForName("Queue Item 2013-01-25_Mouthpiece_v2", 1));
Assert.IsTrue(QueueData.Instance.Count == beforeCount + 2);
Assert.IsTrue(QueueData.Instance.ItemCount == beforeCount + 2);
return Task.FromResult(0);
};

8
Tests/MatterControl.AutomationTests/LocalLibraryTests.cs
View file

@ -383,7 +383,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(1);
int queueCountBeforeAdd = QueueData.Instance.Count;
int queueCountBeforeAdd = QueueData.Instance.ItemCount;
//Add Library Item to the Print Queue
MatterControlUtilities.LibraryAddSelectionToQueue(testRunner);
@ -391,7 +391,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(2);
//Make sure that the Queue Count increases by one
int queueCountAfterAdd = QueueData.Instance.Count;
int queueCountAfterAdd = QueueData.Instance.ItemCount;
Assert.IsTrue(queueCountAfterAdd == queueCountBeforeAdd + 1);
@ -435,7 +435,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Library Edit Button");
testRunner.Wait(1);
int queueCountBeforeAdd = QueueData.Instance.Count;
int queueCountBeforeAdd = QueueData.Instance.ItemCount;
//Select both Library Items
string rowItemOne = "Row Item Calibration - Box";
@ -450,7 +450,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(2);
//Make sure Queue Count increases by the correct amount
int queueCountAfterAdd = QueueData.Instance.Count;
int queueCountAfterAdd = QueueData.Instance.ItemCount;
Assert.IsTrue(queueCountAfterAdd == queueCountBeforeAdd + 2);

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

@ -164,7 +164,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
AutomationTest testToRun = (testRunner) =>
{
int expectedQueueCount = QueueData.Instance.Count + 1;
int expectedQueueCount = QueueData.Instance.ItemCount + 1;
testRunner.CloseSignInAndPrinterSelect();
@ -172,9 +172,9 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(.2);
testRunner.ClickByName("Queue Copy Button", 3);
testRunner.WaitUntil(() => QueueData.Instance.Count == expectedQueueCount, 3);
testRunner.WaitUntil(() => QueueData.Instance.ItemCount == expectedQueueCount, 3);
Assert.AreEqual(expectedQueueCount, QueueData.Instance.Count, "Copy button increases queue count by one");
Assert.AreEqual(expectedQueueCount, QueueData.Instance.ItemCount, "Copy button increases queue count by one");
Assert.IsTrue(testRunner.WaitForName("Queue Item Batman - copy", 2), "Copied Batman item exists with expected name");
testRunner.Wait(.3);
@ -197,7 +197,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
* 2. A QueueRowItem is created and added to the queue
*/
int queueCountBeforeAdd = QueueData.Instance.Count;
int queueCountBeforeAdd = QueueData.Instance.ItemCount;
//Click Add Button and Add Part To Queue
testRunner.ClickByName("Queue Add Button", 2);
@ -213,7 +213,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
bool fennecFoxPartWasAdded = testRunner.WaitForName("Queue Item Fennec_Fox", 2);
Assert.IsTrue(fennecFoxPartWasAdded == true);
int queueCountAfterAdd = QueueData.Instance.Count;
int queueCountAfterAdd = QueueData.Instance.ItemCount;
Assert.IsTrue(queueCountBeforeAdd + 1 == queueCountAfterAdd);
@ -236,7 +236,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
* 2. 2 QueueRowItems are created and added to the queue
*/
int queueCountBeforeAdd = QueueData.Instance.Count;
int queueCountBeforeAdd = QueueData.Instance.ItemCount;
//Click Add Button and Add Part To Queue
testRunner.ClickByName("Queue Add Button", 2);
@ -251,9 +251,9 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(2);
//Confirm that both items were added and that the queue count increases by the appropriate number
int queueCountAfterAdd = QueueData.Instance.Count;
int queueCountAfterAdd = QueueData.Instance.ItemCount;
Assert.IsTrue(QueueData.Instance.Count == queueCountBeforeAdd + 2);
Assert.IsTrue(QueueData.Instance.ItemCount == queueCountBeforeAdd + 2);
bool firstQueueItemWasAdded = testRunner.WaitForName("Queue Item Fennec_Fox", 2);
bool secondQueueItemWasAdded = testRunner.WaitForName("Queue Item Batman", 2);
@ -282,7 +282,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(1);
int expectedQueueCount = QueueData.Instance.Count - 1;
int expectedQueueCount = QueueData.Instance.ItemCount - 1;
// Assert exists
Assert.IsTrue(testRunner.NameExists("Queue Item 2013-01-25_Mouthpiece_v2"), "Target item should exist before Remove");
@ -292,7 +292,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(1);
// Assert removed
Assert.AreEqual(expectedQueueCount, QueueData.Instance.Count, "After Remove button click, Queue count should be 1 less");
Assert.AreEqual(expectedQueueCount, QueueData.Instance.ItemCount, "After Remove button click, Queue count should be 1 less");
Assert.IsFalse(testRunner.WaitForName("Queue Item 2013-01-25_Mouthpiece_v2", 1), "Target item should not exist after Remove");
return Task.FromResult(0);
@ -318,7 +318,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
Assert.IsTrue(checkboxExists == false);
Assert.IsTrue(QueueData.Instance.Count == 4);
Assert.IsTrue(QueueData.Instance.ItemCount == 4);
SystemWindow systemWindow;
string itemName = "Queue Item 2013-01-25_Mouthpiece_v2";
@ -399,7 +399,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
*3. Selecting multiple queue items and then clicking the Remove button decreases the queue tab count by one
*/
int queueItemCount = QueueData.Instance.Count;
int queueItemCount = QueueData.Instance.ItemCount;
testRunner.Wait(2);
@ -411,7 +411,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(1);
int queueItemCountAfterRemove = QueueData.Instance.Count;
int queueItemCountAfterRemove = QueueData.Instance.ItemCount;
Assert.IsTrue(queueItemCount - 2 == queueItemCountAfterRemove);
@ -445,7 +445,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.CloseSignInAndPrinterSelect();
Assert.AreEqual(4, QueueData.Instance.Count, "Queue should initially have 4 items");
Assert.AreEqual(4, QueueData.Instance.ItemCount, "Queue should initially have 4 items");
// Invoke Queue -> Export to Zip dialog
testRunner.ClickByName("Queue... Menu", 2);
@ -466,8 +466,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(1);
testRunner.Type("{Enter}");
testRunner.WaitUntil(() => QueueData.Instance.Count == 8, 5);
Assert.AreEqual(8, QueueData.Instance.Count, "All parts imported successfully from exported zip");
testRunner.WaitUntil(() => QueueData.Instance.ItemCount == 8, 5);
Assert.AreEqual(8, QueueData.Instance.ItemCount, "All parts imported successfully from exported zip");
testRunner.Wait(.3);
@ -495,7 +495,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.CloseSignInAndPrinterSelect();
Assert.IsTrue(QueueData.Instance.Count > 0, "Queue is not empty at test startup");
Assert.IsTrue(QueueData.Instance.ItemCount > 0, "Queue is not empty at test startup");
testRunner.ClickByName("More... Menu", 2);
testRunner.Wait(.2);
@ -531,7 +531,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
AutomationTest testToRun = (testRunner) =>
{
testRunner.CloseSignInAndPrinterSelect();
Assert.AreEqual(4, QueueData.Instance.Count, "Queue has expected 4 items, including default Coin");
Assert.AreEqual(4, QueueData.Instance.ItemCount, "Queue has expected 4 items, including default Coin");
// Assert that widgets exists
Assert.IsTrue(testRunner.WaitForName("Queue Item Batman"), "Batman part exists");
@ -541,10 +541,10 @@ namespace MatterHackers.MatterControl.Tests.Automation
// Act - remove all print queue items
testRunner.RemoveAllFromQueue();
testRunner.WaitUntil(() => QueueData.Instance.Count == 0, 5);
testRunner.WaitUntil(() => QueueData.Instance.ItemCount == 0, 5);
// Assert that object model has been cleared
Assert.AreEqual(0, QueueData.Instance.Count, "Queue is empty after RemoveAll action");
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");
@ -565,7 +565,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.CloseSignInAndPrinterSelect();
bool queueEmpty = true;
int queueItemCount = QueueData.Instance.Count;
int queueItemCount = QueueData.Instance.ItemCount;
if (queueItemCount == 3)
{
@ -618,7 +618,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
*/
testRunner.Wait(2);
int currentQueueItemCount = QueueData.Instance.Count;
int currentQueueItemCount = QueueData.Instance.ItemCount;
Assert.IsTrue(testRunner.WaitForName("Queue Item Batman", 1));
Assert.IsTrue(testRunner.WaitForName("Queue Item 2013-01-25_Mouthpiece_v2", 1));
@ -627,7 +627,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Queue Item Batman Remove");
testRunner.Wait(2);
int queueItemCountAfterRemove = QueueData.Instance.Count;
int queueItemCountAfterRemove = QueueData.Instance.ItemCount;
Assert.IsTrue(currentQueueItemCount - 1 == queueItemCountAfterRemove);
@ -661,7 +661,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
* 2. Add button can add single .amf file to the queue
* 3. Queue count inceases by one
*/
int queueCountBeforeTest = QueueData.Instance.Count;
int queueCountBeforeTest = QueueData.Instance.ItemCount;
//Click Add button
testRunner.ClickByName("Queue Add Button", 2);
@ -674,7 +674,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Type("{Enter}");
//Make sure Queue Count increases by one
int queueCountAfterAMFIsAdded = QueueData.Instance.Count;
int queueCountAfterAMFIsAdded = QueueData.Instance.ItemCount;
Assert.IsTrue(queueCountAfterAMFIsAdded == queueCountBeforeTest + 1);
@ -700,7 +700,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
* 2. Add button can add single .stl file to the queue
* 3. Queue count inceases by one
*/
int queueCountBeforeTest = QueueData.Instance.Count;
int queueCountBeforeTest = QueueData.Instance.ItemCount;
//Click Add button
testRunner.ClickByName("Queue Add Button", 2);
@ -712,7 +712,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(1);
testRunner.Type("{Enter}");
int queueCountAfterSTLIsAdded = QueueData.Instance.Count;
int queueCountAfterSTLIsAdded = QueueData.Instance.ItemCount;
Assert.IsTrue(queueCountAfterSTLIsAdded == queueCountBeforeTest + 1);
@ -733,7 +733,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
testRunner.CloseSignInAndPrinterSelect();
int queueCountBeforeTest = QueueData.Instance.Count;
int queueCountBeforeTest = QueueData.Instance.ItemCount;
//Click Add button
testRunner.ClickByName("Queue Add Button", 2);
@ -745,7 +745,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(1);
testRunner.Type("{Enter}");
int queueCountAfterGcodeIsAdded = QueueData.Instance.Count;
int queueCountAfterGcodeIsAdded = QueueData.Instance.ItemCount;
Assert.IsTrue(queueCountAfterGcodeIsAdded == queueCountBeforeTest + 1);