Address review comments.

Author: comintern

Rubberduck.Core/UI/CodeExplorer/Commands/AddTestComponentCommand.cs

@@ -4,7 +4,7 @@
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.UnitTesting.Commands;
-using Rubberduck.UnitTesting.UnitTesting;
+using Rubberduck.UnitTesting.CodeGeneration;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.CodeExplorer.Commands

Rubberduck.Core/UI/UnitTesting/Commands/AddTestMethodCommand.cs

@@ -6,7 +6,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Command;
 using Rubberduck.UnitTesting;
-using Rubberduck.UnitTesting.UnitTesting;
+using Rubberduck.UnitTesting.CodeGeneration;
 using Rubberduck.VBEditor.Extensions;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 

Rubberduck.Core/UI/UnitTesting/Commands/AddTestMethodExpectedErrorCommand.cs

@@ -6,7 +6,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Command;
 using Rubberduck.UnitTesting;
-using Rubberduck.UnitTesting.UnitTesting;
+using Rubberduck.UnitTesting.CodeGeneration;
 using Rubberduck.VBEditor.Extensions;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 

Rubberduck.Core/UI/UnitTesting/Commands/AddTestModuleCommand.cs

@@ -5,7 +5,7 @@
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.UI.Command;
-using Rubberduck.UnitTesting.UnitTesting;
+using Rubberduck.UnitTesting.CodeGeneration;
 
 namespace Rubberduck.UI.UnitTesting.Commands
 {

Rubberduck.UnitTesting/UnitTesting/ITestCodeGenerator.cs renamed to Rubberduck.UnitTesting/CodeGeneration/ITestCodeGenerator.cs

@@ -1,8 +1,7 @@
-using System.Collections.Generic;
-using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
-namespace Rubberduck.UnitTesting.UnitTesting
+namespace Rubberduck.UnitTesting.CodeGeneration
 {
     public interface ITestCodeGenerator
     {

Rubberduck.UnitTesting/UnitTesting/TestCodeGenerator.cs renamed to Rubberduck.UnitTesting/CodeGeneration/TestCodeGenerator.cs

@@ -12,7 +12,7 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
-namespace Rubberduck.UnitTesting.UnitTesting
+namespace Rubberduck.UnitTesting.CodeGeneration
 {
     public partial class TestCodeGenerator : ITestCodeGenerator
     {
@@ -56,7 +56,6 @@ private void AddTestModule(IVBProject project, Declaration stubSource)
 
             if (settings.BindingMode == BindingMode.EarlyBinding)
             {
-                // FIXME: Push the actual adding of TestModules into UnitTesting, which sidesteps VBEInteraction being inaccessble here
                 _interaction.EnsureProjectReferencesUnitTesting(project);
             }
 
@@ -115,7 +114,9 @@ private string GetNewTestModuleCode(IVBComponent component, List<Declaration> st
                 return GetNewTestModuleCode(component);
             }
 
-            var module = string.Join(Environment.NewLine + Environment.NewLine, new [] { GetBaseTestModule() }.Concat(stubs.Select(GetNewTestStubMethod)));
+            var baseCode = GetBaseTestModule();
+            var stubMethods = stubs.Select(GetNewTestStubMethod);
+            var module = string.Join(Environment.NewLine + Environment.NewLine, new [] { baseCode }.Concat(stubMethods));
 
             return string.Join(Environment.NewLine, _indenter.Indent(module));
         }
@@ -129,7 +130,7 @@ private string GetBaseTestModule(UnitTestSettings settings = null)
 
             string declaration;
             string initialization;
-            var asserts = settings.AssertMode == AssertMode.PermissiveAssert ? "PermissiveAssertClass" : "AssertClass";
+            var asserts = settings.AssertMode == AssertMode.PermissiveAssert ? PermissiveAssertClassName : AssertClassName;
 
             switch (settings.BindingMode)
             {

Rubberduck.UnitTesting/UnitTesting/TestCodeGeneratorStatics.cs renamed to Rubberduck.UnitTesting/CodeGeneration/TestCodeGeneratorStatics.cs

@@ -1,10 +1,15 @@
 using System;
 using Rubberduck.Resources.UnitTesting;
 
-namespace Rubberduck.UnitTesting.UnitTesting
+namespace Rubberduck.UnitTesting.CodeGeneration
 {
     public partial class TestCodeGenerator
     {
+        // These have to match the names of the exposed classes on the RD interface. They're only public here to facilitate a unit test that
+        // ensures this (and hey - they're constants so it's not hurting anything, right?).
+        public const string AssertClassName = "AssertClass";
+        public const string PermissiveAssertClassName = "PermissiveAssertClass";
+
         private static string TestModuleBaseName => TestExplorer.UnitTest_NewModule_BaseName;
         private static string TestMethodBaseName => TestExplorer.UnitTest_NewMethod_BaseName;