From 8f406e220d4371de2bb4c7c34df69858b5f01369 Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Thu, 20 Aug 2015 10:24:28 -0700
Subject: [PATCH] Improving test suit.

---
 ApplicationView/MenuRow/MenuOptionFile.cs     |  1 +
 StaticData/Translations/Master.txt            |  3 ++
 Submodules/agg-sharp                          |  2 +-
 .../MatterControl/LibraryProviderTests.cs     |  2 +-
 .../MatterControl/MatterControl.UI.cs         | 42 ++++++++++---------
 .../Slicing/SliceMappingCLassesTets.cs        |  2 +-
 6 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/ApplicationView/MenuRow/MenuOptionFile.cs b/ApplicationView/MenuRow/MenuOptionFile.cs
index 9cb756f5a..68da10463 100644
--- a/ApplicationView/MenuRow/MenuOptionFile.cs
+++ b/ApplicationView/MenuRow/MenuOptionFile.cs
@@ -24,6 +24,7 @@ namespace MatterHackers.MatterControl
 		public MenuOptionFile()
 			: base("File".Localize())
 		{
+			Name = "File Menu";
 			CurrentMenuOptionFile = this;
 		}
 
diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt
index 34370b071..807643fef 100644
--- a/StaticData/Translations/Master.txt
+++ b/StaticData/Translations/Master.txt
@@ -3670,3 +3670,6 @@ Translated:Rotate (Alt + L. Mouse)
 English:Zoom (Ctrl + L. Mouse)
 Translated:Zoom (Ctrl + L. Mouse)
 
+English:Enter Multi Select mode
+Translated:Enter Multi Select mode
+
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 37faf9516..546545443 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 37faf951677fe2ae195e6b9093a02c353c4f6862
+Subproject commit 5465454435a8666d42e74768038cdc44f9f816d4
diff --git a/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs b/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs
index 38b041aa9..f69cfb3b1 100644
--- a/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs
+++ b/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs
@@ -51,7 +51,7 @@ namespace MatterControl.Tests
 		{
 			#if !__ANDROID__
 			// Set the static data to point to the directory of MatterControl
-			StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine("..", "..", "..", ".."));
+			StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine("..", "..", "..", "..", "StaticData"));
 			#endif
 		}
 
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControl.UI.cs b/Tests/MatterControl.Tests/MatterControl/MatterControl.UI.cs
index b9b1c473a..8bdb8043d 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControl.UI.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControl.UI.cs
@@ -46,41 +46,45 @@ namespace MatterHackers.MatterControl.UI
 
 		void RemoveAllFromQueue(AutomationRunner testRunner)
 		{
-			Assert.IsTrue(testRunner.ClickByName("Queue... Menu"));
-			testRunner.Wait(.2);
-			Assert.IsTrue(testRunner.ClickByName(" Remove All Menu Item"));
+			Assert.IsTrue(testRunner.ClickByName("Queue... Menu", secondsToWait: 2));
+			Assert.IsTrue(testRunner.ClickByName(" Remove All Menu Item", secondsToWait: 2));
+		}
+
+		void CloseMatterControl(AutomationRunner testRunner)
+		{
+			SystemWindow mcWindowLocal = MatterControlApplication.Instance;
+			Assert.IsTrue(testRunner.ClickByName("File Menu", secondsToWait: 2));
+			Assert.IsTrue(testRunner.ClickByName("Exit Menu Item", secondsToWait: 2));
 			testRunner.Wait(.2);
+			if (mcWindowLocal.Parent != null)
+			{
+				mcWindowLocal.CloseOnIdle();
+			}
 		}
 	
 		[Test]
 		[RequiresSTA]
-		public void UiAutomationTests()
+		public void ClearQueueTests()
 		{
 			// Run a copy of MatterControl
-			bool firstDraw = true;
 			MatterControlApplication.AfterFirstDraw = () =>
 			{
-				if (firstDraw)
+				Task.Run(() =>
 				{
-					firstDraw = false;
-					Task.Run(() =>
+					AutomationRunner testRunner = new AutomationRunner("");
+
+					// Now do the actions specific to this test. (replace this for new tests)
 					{
-						AutomationRunner testRunner = new AutomationRunner("");
-						testRunner.Wait(2);
+						RemoveAllFromQueue(testRunner);
+					}
 
-						// Now do the actions specific to this test. (replace this for new tests)
-						{
-							RemoveAllFromQueue(testRunner);
-						}
-
-						MatterControlApplication.Instance.CloseOnIdle();
-					});
-				}
+					CloseMatterControl(testRunner);
+				});
 			};
 
 #if !__ANDROID__
 			// Set the static data to point to the directory of MatterControl
-			StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine("..", "..", "..", ".."));
+			StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine("..", "..", "..", "..", "StaticData"));
 #endif
 			SystemWindow mcWindow = MatterControlApplication.Instance;
 		}
diff --git a/Tests/MatterControl.Tests/MatterControl/Slicing/SliceMappingCLassesTets.cs b/Tests/MatterControl.Tests/MatterControl/Slicing/SliceMappingCLassesTets.cs
index b946eafac..1220af57d 100644
--- a/Tests/MatterControl.Tests/MatterControl/Slicing/SliceMappingCLassesTets.cs
+++ b/Tests/MatterControl.Tests/MatterControl/Slicing/SliceMappingCLassesTets.cs
@@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.Tests
 		{
 #if !__ANDROID__
 			// Set the static data to point to the directory of MatterControl
-			StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine("..", "..", "..", ".."));
+			StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine("..", "..", "..", "..", "StaticData"));
 
 			// dirrect values work
 			{