Merge pull request #1402 from TestCentric/issue-1396-2

Fix bug when loading tcproj files

Author: rowo360

src/GuiRunner/TestModel/TestCentricProject.cs

@@ -98,27 +98,22 @@ public void Load(string path)
         {
             ProjectPath = path;
 
-            using (StreamReader reader = new StreamReader(ProjectPath))
+            try
             {
-                XmlSerializer serializer = new XmlSerializer(typeof(NUnit.Engine.TestPackage));
+                string fileContent = File.ReadAllText(ProjectPath);
+                TestPackage newPackage = PackageHelper.FromXml(fileContent);
 
-                try
-                {
-                    var newPackage = (NUnit.Engine.TestPackage)serializer.Deserialize(reader);
-
-                    foreach (var subPackage in newPackage.SubPackages)
-                    {
-                        AddSubPackage(subPackage.FullName);
-                    }
+                foreach (var subPackage in newPackage.SubPackages)
+                    AddSubPackage(subPackage.FullName);
 
-                    LoadTests();
-                }
-                catch (Exception ex)
-                {
-                    throw new Exception("Unable to deserialize TestProject.", ex);
-                }
+                LoadTests();
+            }
+            catch (Exception ex)
+            {
+                throw new Exception($"Unable to load TestProject from {path}", ex);
             }
 
+
             IsDirty = false;
         }
 
@@ -134,22 +129,6 @@ public void Save()
                 writer.Write(this.ToXml());
         }
 
-        //public void Save(TextWriter writer)
-        //{
-        //    XmlSerializer serializer = new XmlSerializer(typeof(NUnit.Engine.TestPackage));
-
-        //    try
-        //    {
-        //        serializer.Serialize(writer, this);
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        throw new Exception("Unable to serialize TestProject.", ex);
-        //    }
-
-        //    IsDirty = false;
-        //}
-
         public void LoadTests()
         {
             _model.LoadTests(TestFiles);