More descripting convention names

Author: Jake Ginnivan

TestStack.ConventionTests.Tests/MvcConventions.cs

@@ -25,7 +25,7 @@ public void controller_conventions()
         public void api_controller_conventions()
         {
             var types = Types.InAssemblyOf<TestController>();
-            var convention = new ApiControllerConvention();
+            var convention = new ApiControllerNamingAndBaseClassConvention();
 
             var ex = Assert.Throws<ConventionFailedException>(() => Convention.Is(convention, types));
             Approvals.Verify(ex.Message);

TestStack.ConventionTests/Conventions/ApiControllerConvention.cs renamed to TestStack.ConventionTests/Conventions/ApiControllerNamingAndBaseClassConvention.cs

@@ -5,7 +5,7 @@
     using System.Linq;
     using TestStack.ConventionTests.ConventionData;
 
-    public class ApiControllerConvention : MvcControllerConvention
+    public class ApiControllerNamingAndBaseClassConvention : MvcControllerNameAndBaseClassConvention
     {
         protected override IEnumerable<Type> GetControllers(Types data)
         {

TestStack.ConventionTests/Conventions/MvcControllerConvention.cs renamed to TestStack.ConventionTests/Conventions/MvcControllerNameAndBaseClassConvention.cs

@@ -1,51 +1,51 @@
-namespace TestStack.ConventionTests.Conventions
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using TestStack.ConventionTests.ConventionData;
-
-    public class MvcControllerConvention : IConvention<Types>
-    {
-        public void Execute(Types data, IConventionResultContext result)
-        {
-            var controllers = GetControllers(data);
-            var typesWhichDoNotEndInController = controllers.Where(c => !c.Name.EndsWith("Controller"));
-
-            var typesWhichEndInController = data.TypesToVerify.Where(t => t.Name.EndsWith("Controller"));
-            var controllersWhichDoNotInheritFromController =
-                typesWhichEndInController.Where(t => !IsMvcController(t) && !IsWebApiController(t));
-
-            result.IsSymmetric(
-                GetControllerTypeName() + "s must be suffixed with Controller", typesWhichDoNotEndInController,
-                "Types named *Controller must inherit from ApiController or Controller",
-                controllersWhichDoNotInheritFromController);
-        }
-
-        protected virtual string GetControllerTypeName()
-        {
-            return "Mvc Controller";
-        }
-
-        protected virtual IEnumerable<Type> GetControllers(Types data)
-        {
-            return data.TypesToVerify.Where(IsMvcController);
-        }
-
-        static bool IsMvcController(Type arg)
-        {
-            var isController = arg.FullName == "System.Web.Mvc.Controller";
-            if (arg.BaseType == null)
-                return isController;
-            return isController || IsMvcController(arg.BaseType);
-        }
-
-        protected static bool IsWebApiController(Type arg)
-        {
-            var isController = arg.FullName == "System.Web.Http.ApiController";
-            if (arg.BaseType == null)
-                return isController;
-            return isController || IsWebApiController(arg.BaseType);
-        }
-    }
+namespace TestStack.ConventionTests.Conventions
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using TestStack.ConventionTests.ConventionData;
+
+    public class MvcControllerNameAndBaseClassConvention : IConvention<Types>
+    {
+        public void Execute(Types data, IConventionResultContext result)
+        {
+            var controllers = GetControllers(data);
+            var typesWhichDoNotEndInController = controllers.Where(c => !c.Name.EndsWith("Controller"));
+
+            var typesWhichEndInController = data.TypesToVerify.Where(t => t.Name.EndsWith("Controller"));
+            var controllersWhichDoNotInheritFromController =
+                typesWhichEndInController.Where(t => !IsMvcController(t) && !IsWebApiController(t));
+
+            result.IsSymmetric(
+                GetControllerTypeName() + "s must be suffixed with Controller", typesWhichDoNotEndInController,
+                "Types named *Controller must inherit from ApiController or Controller",
+                controllersWhichDoNotInheritFromController);
+        }
+
+        protected virtual string GetControllerTypeName()
+        {
+            return "Mvc Controller";
+        }
+
+        protected virtual IEnumerable<Type> GetControllers(Types data)
+        {
+            return data.TypesToVerify.Where(IsMvcController);
+        }
+
+        static bool IsMvcController(Type arg)
+        {
+            var isController = arg.FullName == "System.Web.Mvc.Controller";
+            if (arg.BaseType == null)
+                return isController;
+            return isController || IsMvcController(arg.BaseType);
+        }
+
+        protected static bool IsWebApiController(Type arg)
+        {
+            var isController = arg.FullName == "System.Web.Http.ApiController";
+            if (arg.BaseType == null)
+                return isController;
+            return isController || IsWebApiController(arg.BaseType);
+        }
+    }
 }

TestStack.ConventionTests/TestStack.ConventionTests.csproj

@@ -61,8 +61,8 @@
     <Compile Include="ConventionData\TypeExtensions.cs" />
     <Compile Include="ConventionFailedException.cs" />
     <Compile Include="IConventionResultContext.cs" />
-    <Compile Include="Conventions\ApiControllerConvention.cs" />
-    <Compile Include="Conventions\MvcControllerConvention.cs" />
+    <Compile Include="Conventions\ApiControllerNamingAndBaseClassConvention.cs" />
+    <Compile Include="Conventions\MvcControllerNameAndBaseClassConvention.cs" />
     <Compile Include="Internal\ConventionReportFailure.cs" />
     <Compile Include="Internal\ConventionContext.cs" />
     <Compile Include="Internal\ConventionResult.cs" />