Automation updates
- Revise skirt_distance label per support team - Remove CreateInstance(showWindow) out variable - Remove embedded tools requiring showWindow out variable - Remove queueItemFolderToAdd variable/parameter - Change AfterFirstDraw event to null conditional invoke - Removed unused AutomationTest from MatterControlApplication - Refactor for style consistency and document new methods - Change queueItemFolderToAdd type to custom enum to ensure optional parameters are not mixed up - Ensure TestExportZip file is deleted before attempting export
This commit is contained in:
John Lewin
parent
d9823416cb
commit
9a5d872486
8 changed files with 85 additions and 128 deletions
|
|
@ -24,7 +24,6 @@ namespace MatterHackers.MatterControl.UI
|
|||
{
|
||||
AutomationRunner testRunner = new AutomationRunner(MatterControlUtilities.DefaultTestImages);
|
||||
{
|
||||
|
||||
testRunner.ClickByName("SettingsAndControls", 5);
|
||||
testRunner.Wait(2);
|
||||
testRunner.ClickByName("Options Tab", 6);
|
||||
|
|
@ -33,7 +32,8 @@ namespace MatterHackers.MatterControl.UI
|
|||
resultsHarness.AddTestResult(terminalWindowExists1 == false, "Terminal Window does not exist");
|
||||
|
||||
testRunner.ClickByName("Show Terminal Button", 6);
|
||||
|
||||
testRunner.Wait(1);
|
||||
|
||||
SystemWindow containingWindow;
|
||||
GuiWidget terminalWindow = testRunner.GetWidgetByName("Gcode Terminal", out containingWindow, 3);
|
||||
resultsHarness.AddTestResult(terminalWindow != null, "Terminal Window exists after Show Terminal button is clicked");
|
||||
|
|
@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, "MC_Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun);
|
||||
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 2); // make sure we ran all our tests
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, "MC_Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 2); // make sure we ran all our tests
|
||||
|
|
@ -157,7 +157,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 2); // make sure we ran all our tests
|
||||
|
||||
|
|
@ -222,7 +222,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 2); // make sure we ran all our tests
|
||||
}
|
||||
|
|
@ -268,7 +268,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 2); // make sure we ran all our tests
|
||||
}
|
||||
|
|
@ -461,7 +461,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 3); // make sure we ran all our tests
|
||||
}
|
||||
|
|
@ -524,7 +524,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 3); // make sure we ran all our tests
|
||||
}
|
||||
|
|
@ -587,7 +587,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 3); // make sure we ran all our tests
|
||||
}
|
||||
|
|
@ -654,7 +654,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 4); // make sure we ran all our tests
|
||||
}
|
||||
|
|
@ -695,10 +695,15 @@ namespace MatterHackers.MatterControl.UI
|
|||
|
||||
testRunner.Wait(2);
|
||||
|
||||
|
||||
//Type in Absolute Path to Save
|
||||
string exportZipPath = MatterControlUtilities.PathToQueueItemsFolder("TestExportZip");
|
||||
|
||||
// Ensure file does not exist before save
|
||||
if(File.Exists(exportZipPath))
|
||||
{
|
||||
File.Delete(exportZipPath);
|
||||
}
|
||||
|
||||
testRunner.Type(exportZipPath);
|
||||
|
||||
testRunner.Wait(2);
|
||||
|
|
@ -745,7 +750,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 3); // make sure we ran all our tests
|
||||
}
|
||||
|
|
@ -796,7 +801,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 2); // make sure we ran all our tests
|
||||
}
|
||||
|
|
@ -867,7 +872,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 8); // make sure we ran all our tests
|
||||
}
|
||||
|
|
@ -931,7 +936,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 5); // make sure we ran all our tests
|
||||
}
|
||||
|
|
@ -1006,7 +1011,7 @@ namespace MatterHackers.MatterControl.UI
|
|||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, null, null, "Three_Queue_Items");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 7); // make sure we ran all our tests
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,13 +40,13 @@ namespace MatterHackers.MatterControl.UI
|
|||
resultsHarness.AddTestResult(testRunner.ClickByName("Save As Save Button", 1));
|
||||
|
||||
// ensure that it is now in the library folder (that the folder updated)
|
||||
resultsHarness.AddTestResult(testRunner.WaitForName("Row Item " + "Test Part", 5), "The part we added sholud be in the library");
|
||||
resultsHarness.AddTestResult(testRunner.WaitForName("Row Item " + "Test Part", 5), "The part we added should be in the library");
|
||||
|
||||
MatterControlUtilities.CloseMatterControl(testRunner);
|
||||
MatterControlUtilities.CloseMatterControl(testRunner);
|
||||
}
|
||||
};
|
||||
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, "MC_One_Queue_No_Library");
|
||||
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, queueItemFolderToAdd: QueueTemplate.Three_Queue_Items);
|
||||
|
||||
Assert.IsTrue(testHarness.AllTestsPassed);
|
||||
Assert.IsTrue(testHarness.TestCount == 8); // make sure we ran all our tests
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ namespace MatterControl.Tests
|
|||
[Test, RunInApplicationDomain]
|
||||
public void LibraryProviderSqlite_NavigationWorking()
|
||||
{
|
||||
MatterControlUtilities.MakeNewMatterControlAppDataFolderForTesting();
|
||||
MatterControlUtilities.OverrideAppDataLocation();
|
||||
|
||||
LibraryProviderSQLite testProvider = new LibraryProviderSQLite(null, null, null, "Local Library");
|
||||
testProvider.DataReloaded += (sender, e) => { dataReloaded = true; };
|
||||
|
|
|
|||
|
|
@ -50,6 +50,10 @@ namespace MatterHackers.MatterControl.UI
|
|||
{
|
||||
private static bool saveImagesForDebug = true;
|
||||
|
||||
private static int testID = 0;
|
||||
|
||||
private static string runName = DateTime.Now.ToString("yyyy-MM-ddTHH-mm-ss");
|
||||
|
||||
private static void RemoveAllFromQueue(AutomationRunner testRunner)
|
||||
{
|
||||
Assert.IsTrue(testRunner.ClickByName("Queue... Menu", 2));
|
||||
|
|
@ -66,11 +70,8 @@ namespace MatterHackers.MatterControl.UI
|
|||
|
||||
public static string PathToQueueItemsFolder(string queueItemToLoad)
|
||||
{
|
||||
string temnp = Directory.GetCurrentDirectory();
|
||||
string pathToQueueItemFolder = Path.Combine("..", "..", "..", "..", "Tests", "TestData", "QueueItems");
|
||||
string fullPathToQueueItem = Path.Combine(pathToQueueItemFolder, queueItemToLoad);
|
||||
|
||||
return Path.GetFullPath(fullPathToQueueItem);
|
||||
return Path.GetFullPath(Path.Combine(pathToQueueItemFolder, queueItemToLoad));
|
||||
}
|
||||
|
||||
public static void CloseMatterControl(AutomationRunner testRunner)
|
||||
|
|
@ -107,18 +108,17 @@ namespace MatterHackers.MatterControl.UI
|
|||
OutputImage(test, "image-test.tga");
|
||||
}
|
||||
|
||||
private static int testID = 0;
|
||||
private static string runName = DateTime.Now.ToString("yyyy-MM-ddTHH-mm-ss");
|
||||
|
||||
public static void MakeNewMatterControlAppDataFolderForTesting(string testDBFolderName = null)
|
||||
/// <summary>
|
||||
/// Overrides the AppData location, ensuring each test starts with a fresh MatterControl database.
|
||||
/// </summary>
|
||||
public static void OverrideAppDataLocation()
|
||||
{
|
||||
string tempFolderPath = Path.Combine("..", "..", "..", "..", "Tests","temp");
|
||||
|
||||
string temp = Path.Combine("..", "..", "..", "..", "Tests","temp");
|
||||
ApplicationDataStorage.Instance.OverrideApplicationPath(Path.Combine(temp, runName, $"Test{testID++}"));
|
||||
|
||||
ApplicationDataStorage.Instance.OverrideAppDataLocation(
|
||||
Path.Combine(tempFolderPath, runName, $"Test{testID++}"));
|
||||
}
|
||||
|
||||
|
||||
public static void AddItemsToQueue(string queueItemFolderToLoad)
|
||||
{
|
||||
|
||||
|
|
@ -142,7 +142,9 @@ namespace MatterHackers.MatterControl.UI
|
|||
//CREATE EMPTY TESTPARTS FOLDER
|
||||
Directory.CreateDirectory(queueData);
|
||||
|
||||
foreach (string file in Directory.GetFiles(Path.Combine("..", "..", "..", "TestData", "QueueItems", queueItemFolderToLoad)))
|
||||
string queueItemTestDataFolder = Path.Combine("..", "..", "..", "TestData", "QueueItems");
|
||||
|
||||
foreach (string file in Directory.GetFiles(Path.Combine(queueItemTestDataFolder, queueItemFolderToLoad)))
|
||||
{
|
||||
string newFilePath = Path.Combine(queueData, Path.GetFileName(file));
|
||||
File.Copy(file, newFilePath, true);
|
||||
|
|
@ -178,8 +180,13 @@ namespace MatterHackers.MatterControl.UI
|
|||
return goodNavigate;
|
||||
}
|
||||
|
||||
public static AutomationTesterHarness RunTest(Action<AutomationTesterHarness> testToRun, string testDbFolder = null, string staticDataPathOverride = null, string queueItemFolderToAdd = null, double maxTimeToRun = 60)
|
||||
public static AutomationTesterHarness RunTest(
|
||||
Action<AutomationTesterHarness> testToRun,
|
||||
string staticDataPathOverride = null,
|
||||
double maxTimeToRun = 60,
|
||||
QueueTemplate queueItemFolderToAdd = QueueTemplate.None)
|
||||
{
|
||||
// Walk back a step in the stack and output the callers name
|
||||
StackTrace st = new StackTrace(false);
|
||||
Console.WriteLine("\r\nRunning automation test: " + st.GetFrames().Skip(1).First().GetMethod().Name);
|
||||
|
||||
|
|
@ -187,22 +194,31 @@ namespace MatterHackers.MatterControl.UI
|
|||
{
|
||||
staticDataPathOverride = Path.Combine("..", "..", "..", "..", "StaticData");
|
||||
}
|
||||
|
||||
#if !__ANDROID__
|
||||
// Set the static data to point to the directory of MatterControl
|
||||
StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(staticDataPathOverride);
|
||||
#endif
|
||||
bool showWindow;
|
||||
/*MatterControlUtilities.DataFolderState staticDataState =*/MatterControlUtilities.MakeNewMatterControlAppDataFolderForTesting(testDbFolder);
|
||||
MatterControlUtilities.OverrideAppDataLocation();
|
||||
|
||||
if (queueItemFolderToAdd != null)
|
||||
if (queueItemFolderToAdd != QueueTemplate.None)
|
||||
{
|
||||
MatterControlUtilities.AddItemsToQueue(queueItemFolderToAdd);
|
||||
string queueTemplateDirectory = queueItemFolderToAdd.ToString();
|
||||
MatterControlUtilities.AddItemsToQueue(queueTemplateDirectory);
|
||||
}
|
||||
|
||||
MatterControlApplication matterControlWindow = MatterControlApplication.CreateInstance(out showWindow);
|
||||
AutomationTesterHarness testHarness = AutomationTesterHarness.ShowWindowAndExectueTests(matterControlWindow, testToRun, maxTimeToRun);
|
||||
|
||||
return testHarness;
|
||||
MatterControlApplication matterControlWindow = MatterControlApplication.CreateInstance();
|
||||
return AutomationTesterHarness.ShowWindowAndExectueTests(matterControlWindow, testToRun, maxTimeToRun);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Represents a queue template folder on disk (located at Tests/TestData/QueueItems) that should be synced into the default
|
||||
/// queue during test init. The enum name and folder name *must* be the same in order to function
|
||||
/// </summary>
|
||||
public enum QueueTemplate
|
||||
{
|
||||
None,
|
||||
Three_Queue_Items
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue