diff --git a/Tests/MatterControl.AutomationTests/CheckBoxInLibraryIsClickable.cs b/Tests/MatterControl.AutomationTests/CheckBoxInLibraryIsClickable.cs index 299c31a3e..438092449 100644 --- a/Tests/MatterControl.AutomationTests/CheckBoxInLibraryIsClickable.cs +++ b/Tests/MatterControl.AutomationTests/CheckBoxInLibraryIsClickable.cs @@ -27,20 +27,15 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using MatterHackers.Agg; -using MatterHackers.Agg.Image; using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI.Tests; +using MatterHackers.GuiAutomation; using NUnit.Framework; using System; -using System.Threading.Tasks; -using MatterHackers.GuiAutomation; -using MatterHackers.Agg.PlatformAbstract; -using System.IO; -using MatterHackers.Agg.UI.Tests; -namespace MatterHackers.MatterControl.UI +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class CheckBoxInLibraryIsClickable { [Test, RequiresSTA, RunInApplicationDomain] diff --git a/Tests/MatterControl.AutomationTests/CreateLibraryFolder.cs b/Tests/MatterControl.AutomationTests/CreateLibraryFolder.cs index f70656f00..43b8ca886 100644 --- a/Tests/MatterControl.AutomationTests/CreateLibraryFolder.cs +++ b/Tests/MatterControl.AutomationTests/CreateLibraryFolder.cs @@ -27,20 +27,15 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using MatterHackers.Agg; -using MatterHackers.Agg.Image; using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI.Tests; +using MatterHackers.GuiAutomation; using NUnit.Framework; using System; -using System.Threading.Tasks; -using MatterHackers.GuiAutomation; -using MatterHackers.Agg.PlatformAbstract; -using System.IO; -using MatterHackers.Agg.UI.Tests; -namespace MatterHackers.MatterControl.UI +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class CreateLibraryFolder { [Test, RequiresSTA, RunInApplicationDomain] diff --git a/Tests/MatterControl.AutomationTests/ExportItemWindowTests.cs b/Tests/MatterControl.AutomationTests/ExportItemWindowTests.cs index d3b017c9e..4330359e6 100644 --- a/Tests/MatterControl.AutomationTests/ExportItemWindowTests.cs +++ b/Tests/MatterControl.AutomationTests/ExportItemWindowTests.cs @@ -1,23 +1,13 @@ -using MatterHackers.Agg; -using MatterHackers.Agg.Image; -using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI.Tests; +using MatterHackers.GuiAutomation; using NUnit.Framework; using System; -using System.Linq; -using System.Threading.Tasks; -using MatterHackers.GuiAutomation; -using MatterHackers.Agg.PlatformAbstract; -using System.IO; -using MatterHackers.MatterControl.CreatorPlugins; -using MatterHackers.Agg.UI.Tests; -using MatterHackers.MatterControl.PrintQueue; -using MatterHackers.MatterControl.DataStorage; using System.Diagnostics; -using System.Collections.Generic; -using MatterHackers.MatterControl.UI; -namespace MatterControl.AutomationTests +using System.IO; + +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain, Ignore("Not Finished")] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain, Ignore("Not Finished")] public class ExportItemsFromDownloads { diff --git a/Tests/MatterControl.AutomationTests/FileMenuTest.cs b/Tests/MatterControl.AutomationTests/FileMenuTest.cs index e95c6ae8b..727be439e 100644 --- a/Tests/MatterControl.AutomationTests/FileMenuTest.cs +++ b/Tests/MatterControl.AutomationTests/FileMenuTest.cs @@ -1,22 +1,12 @@ -using MatterHackers.Agg; -using MatterHackers.Agg.Image; -using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI.Tests; +using MatterHackers.GuiAutomation; +using MatterHackers.MatterControl.PrintQueue; using NUnit.Framework; using System; -using System.Linq; -using System.Threading.Tasks; -using MatterHackers.GuiAutomation; -using MatterHackers.Agg.PlatformAbstract; -using System.IO; -using MatterHackers.MatterControl.CreatorPlugins; -using MatterHackers.Agg.UI.Tests; -using MatterHackers.MatterControl.PrintQueue; -using MatterHackers.MatterControl.DataStorage; -using System.Diagnostics; -namespace MatterHackers.MatterControl.UI +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class FileMenuTest { [Test, RequiresSTA, RunInApplicationDomain] diff --git a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs index 8cffce46f..516e7574e 100644 --- a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs +++ b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs @@ -1,26 +1,12 @@ -using MatterHackers.Agg; -using MatterHackers.Agg.Image; -using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI.Tests; +using MatterHackers.GuiAutomation; using NUnit.Framework; using System; -using System.Linq; -using System.Threading.Tasks; -using MatterHackers.GuiAutomation; -using MatterHackers.Agg.PlatformAbstract; -using System.IO; -using MatterHackers.MatterControl.CreatorPlugins; -using MatterHackers.Agg.UI.Tests; -using MatterHackers.MatterControl.PrintQueue; -using MatterHackers.MatterControl.DataStorage; -using System.Diagnostics; -using System.Collections.Generic; -using MatterHackers.MatterControl.UI; -using MatterHackers.MatterControl.PrintLibrary.Provider; -namespace MatterHackers.MatterControl.UI +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class HardwareLevelingUITests { [Test, RequiresSTA, RunInApplicationDomain] diff --git a/Tests/MatterControl.AutomationTests/LibraryDownloadsTest.cs b/Tests/MatterControl.AutomationTests/LibraryDownloadsTest.cs index 4e104b28f..13c5abb40 100644 --- a/Tests/MatterControl.AutomationTests/LibraryDownloadsTest.cs +++ b/Tests/MatterControl.AutomationTests/LibraryDownloadsTest.cs @@ -1,28 +1,13 @@ -using MatterHackers.Agg; -using MatterHackers.Agg.Image; -using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI.Tests; +using MatterHackers.GuiAutomation; using NUnit.Framework; using System; -using System.Linq; -using System.Threading.Tasks; -using MatterHackers.GuiAutomation; -using MatterHackers.Agg.PlatformAbstract; -using System.IO; -using MatterHackers.MatterControl.CreatorPlugins; -using MatterHackers.Agg.UI.Tests; -using MatterHackers.MatterControl.PrintQueue; -using MatterHackers.MatterControl.DataStorage; -using System.Diagnostics; -using System.Collections.Generic; -using MatterHackers.MatterControl.UI; -using MatterHackers.MatterControl.PrintLibrary.Provider; -namespace MatterControl.MatterControl.UI +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class AddMultipleFilesToDownloads { - [Test, RequiresSTA, RunInApplicationDomain] public void DownloadsAddButtonAddsMultipleFiles() { @@ -75,7 +60,7 @@ namespace MatterControl.MatterControl.UI } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class AddAMFToDownloads { @@ -128,7 +113,7 @@ namespace MatterControl.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class AddZipFileToDownloads { @@ -182,7 +167,7 @@ namespace MatterControl.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class RenameDownloadsItem { @@ -240,7 +225,7 @@ namespace MatterControl.MatterControl.UI } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class CreateSubFolderLibraryDownloads { diff --git a/Tests/MatterControl.AutomationTests/LocalLibraryTests.cs b/Tests/MatterControl.AutomationTests/LocalLibraryTests.cs index a8be0828a..d7b254f70 100644 --- a/Tests/MatterControl.AutomationTests/LocalLibraryTests.cs +++ b/Tests/MatterControl.AutomationTests/LocalLibraryTests.cs @@ -1,22 +1,12 @@ -using MatterHackers.Agg; -using MatterHackers.Agg.Image; -using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI.Tests; +using MatterHackers.GuiAutomation; +using MatterHackers.MatterControl.PrintQueue; using NUnit.Framework; using System; -using System.Linq; -using System.Threading.Tasks; -using MatterHackers.GuiAutomation; -using MatterHackers.Agg.PlatformAbstract; -using System.IO; -using MatterHackers.MatterControl.CreatorPlugins; -using MatterHackers.Agg.UI.Tests; -using MatterHackers.MatterControl.PrintQueue; -using MatterHackers.MatterControl.DataStorage; -using System.Diagnostics; -namespace MatterHackers.MatterControl.UI +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class AddSingleItemToLocalLibrary { [Test, RequiresSTA, RunInApplicationDomain] @@ -30,7 +20,6 @@ namespace MatterHackers.MatterControl.UI string itemName = "Row Item " + "Fennec Fox"; - //Navigate to Local Library testRunner.ClickByName("Library Tab"); MatterControlUtilities.NavigateToFolder(testRunner, "Local Library Row Item Collection"); @@ -64,7 +53,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class AddMultipleItemsToLocalLibrary { [Test, RequiresSTA, RunInApplicationDomain] @@ -122,7 +111,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class AddAMFItemToLocalLibrary { [Test, RequiresSTA, RunInApplicationDomain] @@ -169,7 +158,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class AddZipFileToLocalLibrary { [Test, RequiresSTA, RunInApplicationDomain] @@ -222,7 +211,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class RenameButtonRenamesLibraryRowItem { [Test, RequiresSTA, RunInApplicationDomain] @@ -272,7 +261,7 @@ namespace MatterHackers.MatterControl.UI } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class UserCanSuccessfullyCreateAndRenameLibraryFolder { [Test, RequiresSTA, RunInApplicationDomain] @@ -321,7 +310,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class LibraryEditButtonOpensUpPartPreviewWindow { [Test, RequiresSTA, RunInApplicationDomain] @@ -360,7 +349,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class OneLibraryItemSelectedRemoveButtonRemovesItem { [Test, RequiresSTA, RunInApplicationDomain] @@ -402,7 +391,7 @@ namespace MatterHackers.MatterControl.UI } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class MultipleLibraryItemsSelectedRemoveButtonRemovesItem { [Test, RequiresSTA, RunInApplicationDomain] @@ -463,7 +452,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class AddToQueueButtonAddsSingleItemToQueue { [Test, RequiresSTA, RunInApplicationDomain] @@ -526,7 +515,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class AddToQueueButtonAddsMultipleItemsToQueue { [Test, RequiresSTA, RunInApplicationDomain] @@ -604,7 +593,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class ClickLibraryTumbnailWidgetOpensPartPreview { [Test, RequiresSTA, RunInApplicationDomain] diff --git a/Tests/MatterControl.AutomationTests/OptionsTabTests.cs b/Tests/MatterControl.AutomationTests/OptionsTabTests.cs index aad38a139..ce2e6511a 100644 --- a/Tests/MatterControl.AutomationTests/OptionsTabTests.cs +++ b/Tests/MatterControl.AutomationTests/OptionsTabTests.cs @@ -1,19 +1,12 @@ -using MatterHackers.Agg; -using MatterHackers.Agg.Image; -using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI.Tests; +using MatterHackers.GuiAutomation; using NUnit.Framework; using System; -using System.Threading.Tasks; -using MatterHackers.GuiAutomation; -using MatterHackers.Agg.PlatformAbstract; -using System.IO; -using MatterHackers.MatterControl.CreatorPlugins; -using MatterHackers.Agg.UI.Tests; - -namespace MatterHackers.MatterControl.UI +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class ShowTerminalButtonClickedOpensTerminal { [Test, RequiresSTA, RunInApplicationDomain] @@ -51,7 +44,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class ConfigureNotificationSettingsButtonClickedOpensNotificationWindow { [Test, RequiresSTA, RunInApplicationDomain, Ignore("Not Finished")] diff --git a/Tests/MatterControl.AutomationTests/PartPreviewTests.cs b/Tests/MatterControl.AutomationTests/PartPreviewTests.cs index 427e232ed..4a6669763 100644 --- a/Tests/MatterControl.AutomationTests/PartPreviewTests.cs +++ b/Tests/MatterControl.AutomationTests/PartPreviewTests.cs @@ -1,25 +1,15 @@ -using MatterHackers.Agg; -using MatterHackers.Agg.Image; -using MatterHackers.PolygonMesh; -using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI.Tests; +using MatterHackers.GuiAutomation; +using MatterHackers.MatterControl.PartPreviewWindow; using NUnit.Framework; using System; using System.Linq; -using System.Threading.Tasks; -using MatterHackers.GuiAutomation; -using MatterHackers.Agg.PlatformAbstract; -using MatterHackers.MatterControl.PartPreviewWindow; -using System.IO; -using MatterHackers.MatterControl.CreatorPlugins; -using MatterHackers.Agg.UI.Tests; -using MatterHackers.MatterControl.PrintQueue; -using MatterHackers.MatterControl.DataStorage; -using System.Diagnostics; -namespace MatterHackers.MatterControl.UI +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class PartPreviewTests { [Test, RequiresSTA, RunInApplicationDomain] diff --git a/Tests/MatterControl.AutomationTests/PrintQueueTests.cs b/Tests/MatterControl.AutomationTests/PrintQueueTests.cs index b60210802..9d45ac599 100644 --- a/Tests/MatterControl.AutomationTests/PrintQueueTests.cs +++ b/Tests/MatterControl.AutomationTests/PrintQueueTests.cs @@ -27,25 +27,17 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using MatterHackers.Agg; -using MatterHackers.Agg.Image; using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI.Tests; +using MatterHackers.GuiAutomation; +using MatterHackers.MatterControl.PrintQueue; using NUnit.Framework; using System; -using System.Linq; -using System.Threading.Tasks; -using MatterHackers.GuiAutomation; -using MatterHackers.Agg.PlatformAbstract; using System.IO; -using MatterHackers.MatterControl.CreatorPlugins; -using MatterHackers.Agg.UI.Tests; -using MatterHackers.MatterControl.PrintQueue; -using MatterHackers.MatterControl.DataStorage; -using System.Diagnostics; -namespace MatterHackers.MatterControl.UI +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), Category("MatterControl.Automation"), RunInApplicationDomain] public class BuyButtonTests { [Test, RequiresSTA, RunInApplicationDomain, Ignore("Not Finished")] @@ -78,7 +70,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class ClickingCreateButtonOpensPluginWindow { [Test, RequiresSTA, RunInApplicationDomain] @@ -121,7 +113,7 @@ namespace MatterHackers.MatterControl.UI } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class ExportButtonTest { [Test, RequiresSTA, RunInApplicationDomain] @@ -164,7 +156,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain, Ignore("Not Finished")] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain, Ignore("Not Finished")] public class ExportButtonDisabledNoQueueItems { [Test, RequiresSTA, RunInApplicationDomain] @@ -191,7 +183,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class QueueItemThumnailWidget { [Test, RequiresSTA, RunInApplicationDomain] @@ -228,7 +220,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class ClickCopyButtonMakesACopyOfPrintItemInQueue { [Test, RequiresSTA, RunInApplicationDomain] @@ -274,7 +266,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class AddSingleItemToQueueAddsItem { [Test, RequiresSTA, RunInApplicationDomain] @@ -339,7 +331,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class AddButtonAddsMuiltipleItemsToQueue { [Test, RequiresSTA, RunInApplicationDomain] @@ -409,7 +401,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class RemoveButtonClickedRemovesSingleItem { @@ -467,7 +459,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class EditButtonClickedTurnsOnEditMode { @@ -530,7 +522,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain, Ignore("Not Finished")] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain, Ignore("Not Finished")] public class DoneButtonClickedTurnsOffEditMode { @@ -594,7 +586,7 @@ namespace MatterHackers.MatterControl.UI } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class RemoveButtonClickedRemovesMultipleItems { @@ -661,7 +653,7 @@ namespace MatterHackers.MatterControl.UI } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class ExportToZipMenuItemClickedExportsQueueToZip { @@ -757,7 +749,7 @@ namespace MatterHackers.MatterControl.UI } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class SendMenuItemClickedWhileNotLoggedIn { @@ -808,7 +800,7 @@ namespace MatterHackers.MatterControl.UI } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class RemoveAllMenuItemClicked { @@ -878,7 +870,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain, Ignore("Not Finished")] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain, Ignore("Not Finished")] public class CreatePartSheetMenuItemClickedCreatesPartSheet { @@ -943,7 +935,7 @@ namespace MatterHackers.MatterControl.UI } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class QueueRowItemRemoveViewButtons { [Test, RequiresSTA, RunInApplicationDomain] @@ -1018,7 +1010,7 @@ namespace MatterHackers.MatterControl.UI } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class QueueAddButtonAddsZipToQueue { [Test, RequiresSTA, RunInApplicationDomain] @@ -1086,7 +1078,7 @@ namespace MatterHackers.MatterControl.UI } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class QueueAddButtonAddsAMFFileToQueue { [Test, RequiresSTA, RunInApplicationDomain] @@ -1153,7 +1145,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class QueueAddButtonAddsSTLFileToQueue { [Test, RequiresSTA, RunInApplicationDomain] @@ -1217,7 +1209,7 @@ namespace MatterHackers.MatterControl.UI } } - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class QueueAddButtonAddsGcodeFileToQueue { [Test, RequiresSTA, RunInApplicationDomain] diff --git a/Tests/MatterControl.AutomationTests/SliceSetingsTests.cs b/Tests/MatterControl.AutomationTests/SliceSetingsTests.cs index c60314ba0..6f127bdbb 100644 --- a/Tests/MatterControl.AutomationTests/SliceSetingsTests.cs +++ b/Tests/MatterControl.AutomationTests/SliceSetingsTests.cs @@ -1,22 +1,11 @@ -using MatterHackers.Agg; -using MatterHackers.Agg.Image; -using MatterHackers.Agg.UI; +using MatterHackers.Agg.UI.Tests; +using MatterHackers.GuiAutomation; using NUnit.Framework; using System; -using System.Linq; -using System.Threading.Tasks; -using MatterHackers.GuiAutomation; -using MatterHackers.Agg.PlatformAbstract; -using System.IO; -using MatterHackers.MatterControl.CreatorPlugins; -using MatterHackers.Agg.UI.Tests; -using MatterHackers.MatterControl.PrintQueue; -using MatterHackers.MatterControl.DataStorage; -using System.Diagnostics; -namespace MatterHackers.MatterControl.UI +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class SliceSetingsTests { [Test, RequiresSTA, RunInApplicationDomain] @@ -27,8 +16,6 @@ namespace MatterHackers.MatterControl.UI { AutomationRunner testRunner = new AutomationRunner(MatterControlUtilities.DefaultTestImages); { - - MatterControlUtilities.SelectAndAddPrinter(testRunner, "Airwolf 3D", "HD", true); //Navigate to Local Library diff --git a/Tests/MatterControl.AutomationTests/SqLiteLibraryProvider.cs b/Tests/MatterControl.AutomationTests/SqLiteLibraryProvider.cs index 1e7a0e83d..28a5cf3f0 100644 --- a/Tests/MatterControl.AutomationTests/SqLiteLibraryProvider.cs +++ b/Tests/MatterControl.AutomationTests/SqLiteLibraryProvider.cs @@ -1,14 +1,11 @@ -using MatterHackers.Agg.PlatformAbstract; -using MatterHackers.Agg.UI; -using MatterHackers.Agg.UI.Tests; +using MatterHackers.Agg.UI.Tests; using MatterHackers.GuiAutomation; using NUnit.Framework; using System; -using System.IO; -namespace MatterHackers.MatterControl.UI +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI"), RunInApplicationDomain] + [TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain] public class SqLiteLibraryProviderTests { [Test, RequiresSTA, RunInApplicationDomain] diff --git a/Tests/MatterControl.Tests/MatterControl/LibraryProviderSqliteTests.cs b/Tests/MatterControl.Tests/MatterControl/LibraryProviderSqliteTests.cs index 1b3f985da..05b31b9c1 100644 --- a/Tests/MatterControl.Tests/MatterControl/LibraryProviderSqliteTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/LibraryProviderSqliteTests.cs @@ -32,15 +32,13 @@ using MatterHackers.Agg.UI; using MatterHackers.MatterControl.DataStorage; using MatterHackers.MatterControl.PrintLibrary.Provider; using MatterHackers.MatterControl.PrintQueue; -using MatterHackers.MatterControl.UI; +using MatterHackers.MatterControl.Tests.Automation; using NUnit.Framework; using System; -using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Threading; -namespace MatterControl.Tests +namespace MatterHackers.MatterControl.Tests { [TestFixture, RunInApplicationDomain] public class LibraryProviderSqliteTests diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index bc18d500a..854b8a64f 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -35,19 +35,15 @@ using MatterHackers.GuiAutomation; using MatterHackers.MatterControl.DataStorage; using MatterHackers.MatterControl.PrintLibrary.Provider; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using NUnit.Framework; using System; -using System.Threading.Tasks; using System.Diagnostics; using System.IO; -using System.Threading; using System.Linq; -using System.Collections.Generic; -namespace MatterHackers.MatterControl.UI +namespace MatterHackers.MatterControl.Tests.Automation { - [TestFixture, Category("MatterControl.UI")] + [TestFixture, Category("MatterControl.UI.Automation")] public static class MatterControlUtilities { private static bool saveImagesForDebug = true;