Improved unit tests

danielpalme · Oct 27, 2016 · da1a151 · da1a151
1 parent 5ba47ba
commit da1a151
Show file tree

Hide file tree

Showing 22 changed files with 40 additions and 334 deletions.
diff --git a/ReportGeneratorTest/FileManager.cs b/ReportGeneratorTest/FileManager.cs
@@ -1,31 +1,16 @@
 using System.IO;
 using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Palmmedia.ReportGeneratorTest
 {
-    internal static class FileManager
+    [TestClass]
+    public static class FileManager
     {
         private const string TEMPDIRECTORY = @"C:\temp";
 
-        internal static string GetCSharpReportDirectory() => Path.Combine(GetFilesDirectory(), "CSharp", "Reports");
-
-        internal static string GetFSharpReportDirectory() => Path.Combine(GetFilesDirectory(), "FSharp", "Reports");
-
-        internal static string GetJavaReportDirectory() => Path.Combine(GetFilesDirectory(), "Java", "Reports");
-
-        internal static string GetCSharpCodeDirectory() => Path.Combine(GetFilesDirectory(), "CSharp", "Project");
-
-        internal static string GetFSharpCodeDirectory() => Path.Combine(GetFilesDirectory(), "FSharp", "Project");
-
-        internal static string GetJavaCodeDirectory() => Path.Combine(GetFilesDirectory(), "Java", "Project");
-
-        internal static string GetFilesDirectory()
-        {
-            var baseDirectory = new DirectoryInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).Parent.Parent.Parent.Parent.FullName;
-            return Path.Combine(baseDirectory, "ReportGenerator.Testprojects");
-        }
-
-        internal static void CopyTestClasses()
+        [AssemblyInitialize]
+        public static void CopyTestClasses(TestContext context)
         {
             if (!Directory.Exists(TEMPDIRECTORY))
             {
@@ -54,7 +39,8 @@ internal static void CopyTestClasses()
             }
         }
 
-        internal static void DeleteTestClasses()
+        [AssemblyCleanup]
+        public static void DeleteTestClasses()
         {
             if (Directory.Exists(TEMPDIRECTORY))
             {
@@ -66,7 +52,40 @@ internal static void DeleteTestClasses()
                 {
                     File.Delete(fileInfo.FullName);
                 }
+
+                string javaDir = Path.Combine(TEMPDIRECTORY, "test");
+                files = new DirectoryInfo(javaDir).GetFiles("*.java");
+
+                foreach (var fileInfo in files)
+                {
+                    File.Delete(fileInfo.FullName);
+                }
+
+                Directory.Delete(javaDir);
+
+                if (!Directory.EnumerateFiles(TEMPDIRECTORY).Any())
+                {
+                    Directory.Delete(TEMPDIRECTORY);
+                }
             }
         }
+
+        internal static string GetCSharpReportDirectory() => Path.Combine(GetFilesDirectory(), "CSharp", "Reports");
+
+        internal static string GetFSharpReportDirectory() => Path.Combine(GetFilesDirectory(), "FSharp", "Reports");
+
+        internal static string GetJavaReportDirectory() => Path.Combine(GetFilesDirectory(), "Java", "Reports");
+
+        internal static string GetCSharpCodeDirectory() => Path.Combine(GetFilesDirectory(), "CSharp", "Project");
+
+        internal static string GetFSharpCodeDirectory() => Path.Combine(GetFilesDirectory(), "FSharp", "Project");
+
+        internal static string GetJavaCodeDirectory() => Path.Combine(GetFilesDirectory(), "Java", "Project");
+
+        internal static string GetFilesDirectory()
+        {
+            var baseDirectory = new DirectoryInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).Parent.Parent.Parent.Parent.FullName;
+            return Path.Combine(baseDirectory, "ReportGenerator.Testprojects");
+        }
     }
 }
diff --git a/ReportGeneratorTest/Parser/Analysis/CodeFileTest.cs b/ReportGeneratorTest/Parser/Analysis/CodeFileTest.cs
@@ -12,37 +12,6 @@ namespace Palmmedia.ReportGeneratorTest.Parser.Analysis
     [TestClass]
     public class CodeFileTest
     {
-        #region Additional test attributes
-
-        // You can use the following additional attributes as you write your tests:
-
-        // Use ClassInitialize to run code before running the first test in the class
-        [ClassInitialize]
-        public static void MyClassInitialize(TestContext testContext)
-        {
-            FileManager.CopyTestClasses();
-        }
-
-        // Use ClassCleanup to run code after all tests in a class have run
-        [ClassCleanup]
-        public static void MyClassCleanup()
-        {
-            FileManager.DeleteTestClasses();
-        }
-
-        // Use TestInitialize to run code before running each test
-        // [TestInitialize]
-        // public void MyTestInitialize()
-        // {
-        // }
-
-        // Use TestCleanup to run code after each test has run
-        // [TestCleanup]
-        // public void MyTestCleanup()
-        // {
-        // }
-        #endregion
-
         /// <summary>
         /// A test for the Constructor
         /// </summary>

diff --git a/ReportGeneratorTest/Parser/CoberturaParserTest.cs b/ReportGeneratorTest/Parser/CoberturaParserTest.cs
@@ -22,26 +22,15 @@ public class CoberturaParserTest
 
         #region Additional test attributes
 
-        // You can use the following additional attributes as you write your tests:
-
         // Use ClassInitialize to run code before running the first test in the class
         [ClassInitialize]
         public static void MyClassInitialize(TestContext testContext)
         {
-            FileManager.CopyTestClasses();
-
             var report = XDocument.Load(FilePath1);
             new CoberturaReportPreprocessor(report).Execute();
             assemblies = new CoberturaParser(report).Assemblies;
         }
 
-        // Use ClassCleanup to run code after all tests in a class have run
-        [ClassCleanup]
-        public static void MyClassCleanup()
-        {
-            FileManager.DeleteTestClasses();
-        }
-
         #endregion
 
         /// <summary>

diff --git a/ReportGeneratorTest/Parser/DotCoverParserTest.cs b/ReportGeneratorTest/Parser/DotCoverParserTest.cs
@@ -27,18 +27,9 @@ public class DotCoverParserTest
         [ClassInitialize]
         public static void MyClassInitialize(TestContext testContext)
         {
-            FileManager.CopyTestClasses();
-
             assemblies = new DotCoverParser(XDocument.Load(FilePath1)).Assemblies;
         }
 
-        // Use ClassCleanup to run code after all tests in a class have run
-        [ClassCleanup]
-        public static void MyClassCleanup()
-        {
-            FileManager.DeleteTestClasses();
-        }
-
         #endregion
 
         /// <summary>

diff --git a/ReportGeneratorTest/Parser/DynamicCodeCoverageParserTest.cs b/ReportGeneratorTest/Parser/DynamicCodeCoverageParserTest.cs
@@ -27,19 +27,10 @@ public class DynamicCodeCoverageParserTest
         [ClassInitialize]
         public static void MyClassInitialize(TestContext testContext)
         {
-            FileManager.CopyTestClasses();
-
             var report = XDocument.Load(FilePath);
             assemblies = new DynamicCodeCoverageParser(report).Assemblies;
         }
 
-        // Use ClassCleanup to run code after all tests in a class have run
-        [ClassCleanup]
-        public static void MyClassCleanup()
-        {
-            FileManager.DeleteTestClasses();
-        }
-
         #endregion
 
         /// <summary>

diff --git a/ReportGeneratorTest/Parser/MultiReportParserTest.cs b/ReportGeneratorTest/Parser/MultiReportParserTest.cs
@@ -32,8 +32,6 @@ public class MultiReportParserTest
         [ClassInitialize]
         public static void MyClassInitialize(TestContext testContext)
         {
-            FileManager.CopyTestClasses();
-
             var multiReportParser = new MultiReportParser();
             multiReportParser.AddParser(new PartCover22Parser(XDocument.Load(FilePath1)));
             multiReportParser.AddParser(new PartCover22Parser(XDocument.Load(FilePath1)));
@@ -53,13 +51,6 @@ public static void MyClassInitialize(TestContext testContext)
             assembliesWithPreprocessing = multiReportParser.Assemblies;
         }
 
-        // Use ClassCleanup to run code after all tests in a class have run
-        [ClassCleanup]
-        public static void MyClassCleanup()
-        {
-            FileManager.DeleteTestClasses();
-        }
-
         #endregion
 
         /// <summary>

diff --git a/ReportGeneratorTest/Parser/NCoverParserTest.cs b/ReportGeneratorTest/Parser/NCoverParserTest.cs
@@ -26,30 +26,10 @@ public class NCoverParserTest
         [ClassInitialize]
         public static void MyClassInitialize(TestContext testContext)
         {
-            FileManager.CopyTestClasses();
-
             var report = XDocument.Load(FilePath);
             assemblies = new NCoverParser(report).Assemblies;
         }
 
-        // Use ClassCleanup to run code after all tests in a class have run
-        [ClassCleanup]
-        public static void MyClassCleanup()
-        {
-            FileManager.DeleteTestClasses();
-        }
-
-        // Use TestInitialize to run code before running each test
-        // [TestInitialize]
-        // public void MyTestInitialize()
-        // {
-        // }
-
-        // Use TestCleanup to run code after each test has run
-        // [TestCleanup]
-        // public void MyTestCleanup()
-        // {
-        // }
         #endregion
 
         /// <summary>

diff --git a/ReportGeneratorTest/Parser/OpenCoverParserTest.cs b/ReportGeneratorTest/Parser/OpenCoverParserTest.cs
@@ -35,8 +35,6 @@ public class OpenCoverParserTest
         [ClassInitialize]
         public static void MyClassInitialize(TestContext testContext)
         {
-            FileManager.CopyTestClasses();
-
             assembliesWithoutPreprocessing = new OpenCoverParser(XDocument.Load(FilePath1)).Assemblies;
 
             var report = XDocument.Load(FilePath1);
@@ -52,13 +50,6 @@ public static void MyClassInitialize(TestContext testContext)
             assembliesWithTrackedMethods = new OpenCoverParser(report).Assemblies;
         }
 
-        // Use ClassCleanup to run code after all tests in a class have run
-        [ClassCleanup]
-        public static void MyClassCleanup()
-        {
-            FileManager.DeleteTestClasses();
-        }
-
         #endregion
 
         /// <summary>

diff --git a/ReportGeneratorTest/Parser/PartCover22ParserTest.cs b/ReportGeneratorTest/Parser/PartCover22ParserTest.cs
@@ -31,8 +31,6 @@ public class PartCover22ParserTest
         [ClassInitialize]
         public static void MyClassInitialize(TestContext testContext)
         {
-            FileManager.CopyTestClasses();
-
             assembliesWithoutPreprocessing = new PartCover22Parser(XDocument.Load(FilePath)).Assemblies;
 
             var report = XDocument.Load(FilePath);
@@ -42,13 +40,6 @@ public static void MyClassInitialize(TestContext testContext)
             assembliesWithPreprocessing = new PartCover22Parser(report).Assemblies;
         }
 
-        // Use ClassCleanup to run code after all tests in a class have run
-        [ClassCleanup]
-        public static void MyClassCleanup()
-        {
-            FileManager.DeleteTestClasses();
-        }
-
         #endregion
 
         /// <summary>

diff --git a/ReportGeneratorTest/Parser/PartCover23ParserTest.cs b/ReportGeneratorTest/Parser/PartCover23ParserTest.cs
@@ -31,8 +31,6 @@ public class PartCover23ParserTest
         [ClassInitialize]
         public static void MyClassInitialize(TestContext testContext)
         {
-            FileManager.CopyTestClasses();
-
             assembliesWithoutPreprocessing = new PartCover23Parser(XDocument.Load(FilePath)).Assemblies;
 
             var report = XDocument.Load(FilePath);
@@ -42,13 +40,6 @@ public static void MyClassInitialize(TestContext testContext)
             assembliesWithPreprocessing = new PartCover23Parser(report).Assemblies;
         }
 
-        // Use ClassCleanup to run code after all tests in a class have run
-        [ClassCleanup]
-        public static void MyClassCleanup()
-        {
-            FileManager.DeleteTestClasses();
-        }
-
         #endregion
 
         /// <summary>

diff --git a/ReportGeneratorTest/Parser/PartCover23ParserTest_35109.cs b/ReportGeneratorTest/Parser/PartCover23ParserTest_35109.cs
@@ -31,7 +31,6 @@ public class PartCover23ParserTest_35109
         [ClassInitialize]
         public static void MyClassInitialize(TestContext testContext)
         {
-            FileManager.CopyTestClasses();
             assembliesWithoutPreprocessing = new PartCover23Parser(XDocument.Load(FilePath)).Assemblies;
 
             var report = XDocument.Load(FilePath);
@@ -42,13 +41,6 @@ public static void MyClassInitialize(TestContext testContext)
             assembliesWithPreprocessing = new PartCover23Parser(report).Assemblies;
         }
 
-        // Use ClassCleanup to run code after all tests in a class have run
-        [ClassCleanup]
-        public static void MyClassCleanup()
-        {
-            FileManager.DeleteTestClasses();
-        }
-
         #endregion
 
         /// <summary>

diff --git a/ReportGeneratorTest/Parser/Preprocessing/CoberturaReportPreprocessorTest.cs b/ReportGeneratorTest/Parser/Preprocessing/CoberturaReportPreprocessorTest.cs
@@ -15,26 +15,6 @@ public class CoberturaReportPreprocessorTest
     {
         private static readonly string FilePath = Path.Combine(FileManager.GetJavaReportDirectory(), "Cobertura2.1.1.xml");
 
-        #region Additional test attributes
-
-        // You can use the following additional attributes as you write your tests:
-
-        // Use ClassInitialize to run code before running the first test in the class
-        [ClassInitialize]
-        public static void MyClassInitialize(TestContext testContext)
-        {
-            FileManager.CopyTestClasses();
-        }
-
-        // Use ClassCleanup to run code after all tests in a class have run
-        [ClassCleanup]
-        public static void MyClassCleanup()
-        {
-            FileManager.DeleteTestClasses();
-        }
-
-        #endregion
-
         /// <summary>
         /// A test for Execute
         /// </summary>

diff --git a/ReportGeneratorTest/Parser/Preprocessing/DotCoverReportPreprocessorTest.cs b/ReportGeneratorTest/Parser/Preprocessing/DotCoverReportPreprocessorTest.cs
@@ -17,26 +17,6 @@ public class DotCoverReportPreprocessorTest
     {
         private static readonly string FSharpFilePath = Path.Combine(FileManager.GetFSharpReportDirectory(), "dotCover.xml");
 
-        #region Additional test attributes
-
-        // You can use the following additional attributes as you write your tests:
-
-        // Use ClassInitialize to run code before running the first test in the class
-        [ClassInitialize]
-        public static void MyClassInitialize(TestContext testContext)
-        {
-            FileManager.CopyTestClasses();
-        }
-
-        // Use ClassCleanup to run code after all tests in a class have run
-        [ClassCleanup]
-        public static void MyClassCleanup()
-        {
-            FileManager.DeleteTestClasses();
-        }
-
-        #endregion
-
         /// <summary>
         /// A test for Execute
         /// </summary>