Upgrade to NUnit3

- Revise hard-coded paths for compatibility with new VS adapter
- Add utility functions for path generation
- Extract SHA1 computation from Save function
- Add ToJson helper function
- Don't save SHA1 in computed document
- Remove Asserts from CloseMatterControl, extend wait period
- Add TestAutomationConfig type replacing serialized Dictionary

SlicerConfiguration/Settings/PrinterSettings.cs

@@ -27,26 +27,25 @@ of the authors and should not be interpreted as representing official policies,
 either expressed or implied, of the FreeBSD Project.
 */
 
-using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
-using System;
-using System.IO;
-using Newtonsoft.Json.Linq;
 using System.Text;
-using System.Collections.ObjectModel;
-using MatterHackers.MatterControl.DataStorage;
-using MatterHackers.MatterControl.SettingsManagement;
-using System.Diagnostics;
-using MatterHackers.Agg.UI;
-using MatterHackers.MatterControl.ContactForm;
-using MatterHackers.Localizations;
-using MatterHackers.Agg;
-using MatterHackers.VectorMath;
-using MatterHackers.MeshVisualizer;
-using MatterHackers.Agg.PlatformAbstract;
 using System.Threading.Tasks;
+using MatterHackers.Agg;
+using MatterHackers.Agg.PlatformAbstract;
+using MatterHackers.Agg.UI;
+using MatterHackers.Localizations;
+using MatterHackers.MatterControl.ContactForm;
+using MatterHackers.MatterControl.SettingsManagement;
+using MatterHackers.MeshVisualizer;
+using MatterHackers.VectorMath;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace MatterHackers.MatterControl.SlicerConfiguration
 {
@@ -195,22 +194,13 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 				return;
 			}
 
-			string json = JsonConvert.SerializeObject(this, Formatting.Indented);
+			string json = this.ToJson();
 
-			// SHA1 value is based on UTF8 encoded file contents
-			using (var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(json)))
+			var printerInfo = ProfileManager.Instance[this.ID];
+			if (printerInfo != null)
 			{
-				string contentSHA1 = GenerateSha1(memoryStream);
-				this.UserLayer["profile_sha1"] = contentSHA1;
-
-				var printerInfo = ProfileManager.Instance[this.ID];
-				if (printerInfo != null)
-				{
-					string beforeSaveSHA1 = printerInfo.ContentSHA1;
-
-					printerInfo.ContentSHA1 = contentSHA1;
-					ProfileManager.Instance.Save();
-				}
+				printerInfo.ContentSHA1 = this.ComputeSha1(json);
+				ProfileManager.Instance.Save();
 			}
 
 			lock (writeLock)
@@ -224,6 +214,20 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 			}
 		}
 
+		public string ComputeSha1()
+		{
+			return ComputeSha1(this.ToJson());
+		}
+
+		private string ComputeSha1(string json)
+		{
+			// SHA1 value is based on UTF8 encoded file contents
+			using (var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(json)))
+			{
+				return GenerateSha1(memoryStream);
+			}
+		}
+
 		/// <summary>
 		/// User settings overrides
 		/// </summary>
@@ -896,6 +900,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 			Save();
 		}
 
+		public string ToJson(Formatting formatting = Formatting.Indented)
+		{
+			return JsonConvert.SerializeObject(this, formatting);
+		}
+
 		internal void ClearValue(string sliceSetting, PrinterSettingsLayer layer = null)
 		{
 			var persistenceLayer = layer ?? UserLayer;

SlicerConfiguration/Settings/ProfileManager.cs

@@ -27,23 +27,21 @@ of the authors and should not be interpreted as representing official policies,
 either expressed or implied, of the FreeBSD Project.
 */
 
-using MatterHackers.Agg.UI;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using MatterHackers.Agg.UI;
+using Newtonsoft.Json;
 
 namespace MatterHackers.MatterControl.SlicerConfiguration
 {
-	using Agg;
-	using Localizations;
-	using DataStorage;
-	using SettingsManagement;
 	using System.Collections.ObjectModel;
-	using System.Net;
-	using VersionManagement;
 	using System.Threading.Tasks;
+	using Agg;
+	using DataStorage;
+	using Localizations;
+	using SettingsManagement;
 
 	public class ProfileManager
 	{

SlicerConfiguration/Settings/ProfileMigrations.cs

@@ -209,10 +209,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 								layer.Add("manual_movement_speeds", item.Value);
 								break;
 
-							case "MatterControl.SHA1":
-								layer.Add("profile_sha1", item.Value);
-								break;
-
 							case "MatterControl.SlicingEngine":
 								layer.Add("slicing_engine", item.Value);
 								break;