project clean up

removed non used files/types
moved types around project/namespaces to declutter the intellisense experience

Author: kkozmic

TestStack.ConventionTests.Tests/ProjectBasedConventions.cs

@@ -5,7 +5,7 @@
     using NSubstitute;
     using NUnit.Framework;
     using TestStack.ConventionTests.Conventions;
-    using TestStack.ConventionTests.Helpers;
+    using TestStack.ConventionTests.Internal;
     using TestStack.ConventionTests.Tests.Properties;
 
     [TestFixture]

TestStack.ConventionTests/Convention.cs

@@ -1,10 +1,6 @@
 namespace TestStack.ConventionTests
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
-    using System.Text;
     using ApprovalTests;
 
     public static class Convention
@@ -34,61 +30,16 @@ public static void Is<TData>(IConvention<TData> convention, TData data) where TD
             Settings.AssertZero(result.InvalidResultsCount, result.Message);
         }
 
-
-        public static void Is<T>(ConventionData<T> convention, IEnumerable<T> itemsToVerify)
-        {
-            var results = Result(convention, itemsToVerify);
-            if (!string.IsNullOrEmpty(results))
-                throw new ConventionFailedException(results);
-        }
-
-        public static void Is<TConvention, T>(TConvention convention, IEnumerable<T> itemsToVerify, Func<string, bool> itemFilter)
-            where TConvention : ConventionData<T>, IRuntimeFilter<string>
-        {
-            Is<TConvention, T, string>(convention, itemsToVerify, itemFilter);
-        }
-
-        public static void Is<TConvention, T, TItem>(TConvention convention, IEnumerable<T> itemsToVerify, Func<TItem, bool> itemFilter)
-            where TConvention : ConventionData<T>, IRuntimeFilter<TItem>
+        public class ConventionSettings
         {
-            var results = Result(convention, itemsToVerify, itemFilter);
-            if (!string.IsNullOrEmpty(results))
-                throw new ConventionFailedException(results);
-        }
+            public Action<String> AssertInclunclusive;
 
-        public static string Result<T>(ConventionData<T> convention, IEnumerable<T> itemsToVerify)
-        {
-            var message = new StringBuilder();
-            var invalidItems = itemsToVerify.Where(i => !convention.Must(i)).ToArray();
-            if (!invalidItems.Any()) return null;
+            public Action<int, string> AssertZero;
 
-            message.AppendLine(convention.Description ?? "Convention has failing items");
-            foreach (var invalidType in invalidItems)
+            public ConventionSettings()
             {
-                message.Append('\t');
-                convention.ItemDescription(invalidType, message);
+                // TODO: initialize the type;
             }
-
-            return message.ToString();
         }
-
-        public static string Result<TConvention, T, TItem>(TConvention convention, IEnumerable<T> itemsToVerify, Func<TItem, bool> itemFilter)
-            where TConvention : ConventionData<T>, IRuntimeFilter<TItem>
-        {
-            convention.SetFilter(itemFilter);
-            return Result(convention, itemsToVerify);
-        }
-    }
-
-    public class ConventionSettings
-    {
-        public ConventionSettings()
-        {
-            // TODO: initialize the type;
-        }
-
-        public Action<String> AssertInclunclusive;
-
-        public Action<int, string> AssertZero;
     }
 }

TestStack.ConventionTests/ConventionData`1.cs renamed to TestStack.ConventionTests/ConventionData.cs

@@ -8,13 +8,8 @@
     /// </summary>
     public class ConventionData<TItem>
     {
-        readonly Action<TItem, StringBuilder> defaultItemDescription = DefaultItemDescriptionMethod;
         public static readonly Predicate<TItem> None = _ => false;
-
-        static void DefaultItemDescriptionMethod(TItem item, StringBuilder message)
-        {
-            message.AppendLine(ReferenceEquals(item, null) ? "<<null>>" : item.ToString());
-        }
+        readonly Action<TItem, StringBuilder> defaultItemDescription = DefaultItemDescriptionMethod;
 
         public ConventionData()
         {
@@ -26,17 +21,24 @@ public ConventionData()
         public Func<TItem, object> OrderBy { get; set; }
 
         /// <summary>
-        ///     Descriptive text used for failure message in test. Should explan what is wrong, and how to fix it (how to make types that do not conform to the convention do so).
+        ///     Descriptive text used for failure message in test. Should explan what is wrong, and how to fix it (how to make
+        ///     types that do not conform to the convention do so).
         /// </summary>
         public string Description { get; set; }
 
         /// <summary>
-        ///     This is the convention. The predicate should return <c>true</c> for types that do conform to the convention, and <c>false</c> otherwise
+        ///     This is the convention. The predicate should return <c>true</c> for types that do conform to the convention, and
+        ///     <c>false</c> otherwise
         /// </summary>
         public Predicate<TItem> Must { get; set; }
 
         public Action<TItem, StringBuilder> ItemDescription { get; set; }
 
+        static void DefaultItemDescriptionMethod(TItem item, StringBuilder message)
+        {
+            message.AppendLine(ReferenceEquals(item, null) ? "<<null>>" : item.ToString());
+        }
+
         object HashCode(TItem arg)
         {
             if (ReferenceEquals(arg, null))

TestStack.ConventionTests/ConventionFailedException.cs

@@ -1,7 +1,6 @@
 namespace TestStack.ConventionTests.Conventions
 {
     using System.Linq;
-    using TestStack.ConventionTests.Helpers;
     using TestStack.ConventionTests.Internal;
 
     public class AllClassesHaveDefaultConstructor : IConvention<Types>

TestStack.ConventionTests/Conventions/AllClassesHaveDefaultConstructor.cs

@@ -5,7 +5,6 @@
     using System.Linq;
     using System.Reflection;
     using System.Text;
-    using TestStack.ConventionTests.Helpers;
     using TestStack.ConventionTests.Internal;
 
     public class AllMethodsAreVirtual : IConvention<Types>

TestStack.ConventionTests/Conventions/AllMethodsAreVirtual.cs

@@ -0,0 +1,39 @@
+namespace TestStack.ConventionTests.Conventions
+{
+    using System;
+    using System.Reflection;
+    using System.Xml.Linq;
+    using TestStack.ConventionTests.Internal;
+
+    public class Project : IConventionData
+    {
+        public Func<string, bool> Includes;
+
+        public Project(Assembly assembly, IProjectProvider projectProvider, IProjectLocator projectLocator)
+        {
+            Assembly = assembly;
+            ProjectProvider = projectProvider;
+            ProjectLocator = projectLocator;
+        }
+
+        public Assembly Assembly { get; private set; }
+
+        public IProjectLocator ProjectLocator { get; private set; }
+
+        public IProjectProvider ProjectProvider { get; private set; }
+
+        public bool HasValidSource
+        {
+            get { return ProjectLocator.ResolveProjectFilePath(Assembly) != null; }
+        }
+
+        public bool HasApprovedExceptions { get; set; }
+
+        public XDocument GetProject()
+        {
+            var location = ProjectLocator.ResolveProjectFilePath(Assembly);
+            var project = ProjectProvider.LoadProjectDocument(location);
+            return project;
+        }
+    }
+}

TestStack.ConventionTests/Conventions/Project.cs

@@ -1,4 +1,4 @@
-namespace TestStack.ConventionTests
+namespace TestStack.ConventionTests.Conventions
 {
     using System;
     using System.Linq;

TestStack.ConventionTests/Types.cs renamed to TestStack.ConventionTests/Conventions/Types.cs

@@ -2,7 +2,7 @@
 {
     using TestStack.ConventionTests.Internal;
 
-    public interface IConvention<T> where T : IConventionData
+    public interface IConvention<in T> where T : IConventionData
     {
         ConventionResult Execute(T data);
     }