Harmonize TestModule templates

Author: IvenBach

RetailCoder.VBE/Root/RubberduckModule.cs

@@ -163,9 +163,20 @@ private IEnumerable<Assembly> FindPlugins()
         {
             var assemblies = new List<Assembly>();
             var basePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            assemblies.Add(Assembly.LoadFile(Path.Combine(basePath, "Rubberduck.Inspections.dll")));
 
+            var inspectionsAssembly = Path.Combine(basePath, "Rubberduck.Inspections.dll");
+            if (File.Exists(inspectionsAssembly))
+            {
+                assemblies.Add(Assembly.LoadFile(inspectionsAssembly));
+            }
+
+            //var path = Path.Combine(basePath, "Plug-ins");
             var path = Path.Combine(basePath, "Plug-ins");
+            if (!Directory.Exists(path))
+            {
+                Directory.CreateDirectory(path);
+            }
+
             foreach (var library in Directory.EnumerateFiles(path, "*.dll"))
             {
                 try

RetailCoder.VBE/UI/Command/AddTestModuleCommand.cs

@@ -30,21 +30,27 @@ public AddTestModuleCommand(IVBE vbe, RubberduckParserState state, IGeneralConfi
         }
 
         private const string FolderAnnotation = "'@Folder(\"Tests\")\r\n";
-        private const string ModuleLateBinding = "Private Assert As Object\r\n";
-        private const string ModuleEarlyBinding = "Private Assert As New Rubberduck.{0}AssertClass\r\n";
+        private const string AssertLateBinding = "Private Assert As Object";
 
-        private const string TestModuleEmptyTemplate = "'@TestModule\r\n{0}\r\n{1}\r\n";
+        private const string ModuleFakesProvider = "Private Fakes As {0}";
+        private const string AssertEarlyBinding = "Private Assert As Rubberduck.{0}AssertClass";
 
-        private const string ModuleInitLateBinding = "Set Assert = CreateObject(\"Rubberduck.{0}AssertClass\")\r\n";
+        private const string TestModuleEmptyTemplate = "'@TestModule\r\n{0}\r\n{1}\r\n{2}\r\n\r\n";
+
+        private const string ModuleInitLateBinding = "Set Assert = CreateObject(\"Rubberduck.{0}AssertClass\")";
         private readonly string _moduleInit = string.Concat(
-            "'@ModuleInitialize\r\n"
-            , "Public Sub ModuleInitialize()\r\n"
-            , "    '", RubberduckUI.UnitTest_NewModule_RunOnce, ".\r\n    {0}\r\n"
-            , "End Sub\r\n\r\n"
-            , "'@ModuleCleanup\r\n"
-            , "Public Sub ModuleCleanup()\r\n"
-            , "    '", RubberduckUI.UnitTest_NewModule_RunOnce, ".\r\n"
-            , "End Sub\r\n\r\n"
+            "'@ModuleInitialize\r\n",
+            "Public Sub ModuleInitialize()\r\n",
+            $"    '{RubberduckUI.UnitTest_NewModule_RunOnce}.\r\n",
+            "    {0}\r\n",
+            "    {1}\r\n",
+            "End Sub\r\n\r\n",
+            "'@ModuleCleanup\r\n",
+            "Public Sub ModuleCleanup()\r\n",
+            $"    '{RubberduckUI.UnitTest_NewModule_RunOnce}.\r\n",
+            "    Set Assert = Nothing\r\n",
+            "    Set Fakes = nothing\r\n",
+            "End Sub\r\n\r\n"
         );
 
         private readonly string _methodInit = string.Concat(
@@ -63,18 +69,30 @@ public AddTestModuleCommand(IVBE vbe, RubberduckParserState state, IGeneralConfi
         private string GetTestModule(IUnitTestSettings settings)
         {
             var assertClass = settings.AssertMode == AssertMode.StrictAssert ? string.Empty : "Permissive";
-            var moduleBinding = settings.BindingMode == BindingMode.EarlyBinding
-                ? string.Format(ModuleEarlyBinding, assertClass)
-                : ModuleLateBinding;
 
-            var formattedModuleTemplate = string.Format(TestModuleEmptyTemplate, FolderAnnotation, moduleBinding);
+            bool isEarlyBinding = settings.BindingMode == BindingMode.EarlyBinding;
+            var moduleBinding = isEarlyBinding
+                    ? string.Format(AssertEarlyBinding,assertClass)
+                    : AssertLateBinding;
+            var moduleFakes = string.Format(ModuleFakesProvider, isEarlyBinding
+                                            ? "Rubberduck.IFakesProvider"
+                                            : "Object");
+
+            var formattedModuleTemplate = string.Format(TestModuleEmptyTemplate, FolderAnnotation, moduleBinding, moduleFakes);
 
             if (settings.ModuleInit)
             {
-                var lateBindingString = string.Format(ModuleInitLateBinding,
-                    settings.AssertMode == AssertMode.StrictAssert ? string.Empty : "Permissive");
+                var assertLateBindingString = string.Format(ModuleInitLateBinding, assertClass);
+                var assertEarlyBindingString = "Set Assert = New Rubberduck.AssertClass";
+
+                const string rdFakes = "Rubberduck.FakesProvider";
+                var fakesEarlyBindingString = $"New {rdFakes}";
+                var fakesLateBindingString = $"CreateObject({rdFakes})";
 
-                formattedModuleTemplate += string.Format(_moduleInit, settings.BindingMode == BindingMode.EarlyBinding ? string.Empty : lateBindingString);
+                formattedModuleTemplate += string.Format(_moduleInit,
+                                                        isEarlyBinding ? assertEarlyBindingString : assertLateBindingString,
+                                                        string.Format("Set Fakes = {0}", isEarlyBinding ? fakesEarlyBindingString : fakesLateBindingString)
+                                                        );
             }
 
             if (settings.MethodInit)