Fixes for tests to succeed

erri120 · Nov 28, 2019 · d2654f5 · d2654f5
1 parent afa5711
commit d2654f5
Show file tree

Hide file tree

Showing 6 changed files with 218 additions and 208 deletions.
diff --git a/OMODFramework.Test/ATest.cs b/OMODFramework.Test/ATest.cs
@@ -36,13 +36,16 @@ public abstract class ATest
 
         public abstract HashSet<NexusFile> Files { get; set; }
 
-        public abstract bool DeleteOnFinish { get; set; }
-
         [TestInitialize]
         public void Setup()
         {
             Framework.TempDir = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "TestTempDir");
 
+            if (!Directory.Exists(Framework.TempDir))
+                Directory.CreateDirectory(Framework.TempDir);
+            else
+                Framework.CleanTempDir();
+
             if (Files.All(f => File.Exists(f.DownloadFileName) && File.Exists(f.FileName)))
                 return;
 
@@ -81,12 +84,5 @@ public void Setup()
                 }
             });
         }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            if(DeleteOnFinish)
-                Framework.CleanTempDir(true);
-        }
     }
 }
diff --git a/OMODFramework.Test/OMODTests.cs b/OMODFramework.Test/OMODTests.cs
@@ -38,7 +38,7 @@ public class OMODTests : ATest
             }
         };
 
-        public override bool DeleteOnFinish { get; set; } = true;
+        public virtual bool DeleteOnFinish { get; set; } = true;
 
         [TestMethod]
         public void TestOMOD()

diff --git a/OMODFramework.Test/ScriptFunctions.cs b/OMODFramework.Test/ScriptFunctions.cs
@@ -124,7 +124,7 @@ public Version GraphicsExtenderVersion()
 
         public Version OblivionVersion()
         {
-            return new Version(1, 2, 0, 416);
+            return new Version(1, 2, 416, 0);
         }
     }
 }
diff --git a/OMODFramework.Test/ScriptTest.cs b/OMODFramework.Test/ScriptTest.cs
@@ -70,7 +70,7 @@ public class ScriptTest : ATest
             }*/
         };
 
-        public override bool DeleteOnFinish { get; set; } = false; 
+        public virtual bool DeleteOnFinish { get; set; } = false; 
 
         [TestMethod]
         public void TestOBMMScript()

diff --git a/OMODFramework/Framework.cs b/OMODFramework/Framework.cs
@@ -111,7 +111,21 @@ public static void CleanTempDir(bool deleteRoot = false)
                 return;
 
             var dInfo = new DirectoryInfo(TempDir);
-            dInfo.GetFiles().Do(f => {if(f.Exists && !f.IsReadOnly) f.Delete();});
+            dInfo.GetFiles().Do(f =>
+            {
+                if (!f.Exists || f.IsReadOnly)
+                    return;
+
+                try
+                {
+                    f.Delete();
+                }
+                catch
+                {
+                    // ignored
+                }
+
+            });
             dInfo.GetDirectories().Do(d => {if(d.Exists && !d.Attributes.HasFlag(FileAttributes.ReadOnly)) d.Delete(true);});
 
             if(deleteRoot)