Removed EnsureHasNonEmptySource

Author: Jake Ginnivan

TestStack.ConventionTests.Tests/ConventionAssertionClassTests.cs

@@ -24,9 +24,7 @@ public class FakeData : IConventionData
         {
             public string Description { get { return "Fake data"; } }
 
-            public void EnsureHasNonEmptySource()
-            {
-            }
+            public bool HasData { get { return true; } }
 
             public ConventionReportFailure Format(string failingData)
             {
@@ -39,7 +37,7 @@ public class FailingConvention : IConvention<FakeData>
             public string ConventionTitle { get { return "Header"; } }
             public IEnumerable<object> GetFailingData(FakeData data)
             {
-                return new[] {"Different"};
+                return new[] { "Different" };
             }
         }
     }

TestStack.ConventionTests/ConventionData/AbstractProjectData.cs

@@ -22,11 +22,7 @@ protected AbstractProjectData(Assembly assembly, IProjectProvider projectProvide
 
         public string Description { get { return Assembly.GetName().Name; } }
 
-        public void EnsureHasNonEmptySource()
-        {
-            if (ProjectLocator.ResolveProjectFilePath(Assembly) == null)
-                throw new ConventionSourceInvalidException("Cannot resolve project file for assembly {0}");
-        }
+        public bool HasData { get { return ProjectLocator.ResolveProjectFilePath(Assembly) != null; } }
 
         protected XDocument GetProject()
         {

TestStack.ConventionTests/ConventionData/Types.cs

@@ -1,8 +1,7 @@
 namespace TestStack.ConventionTests.ConventionData
 {
     using System;
-    using TestStack.ConventionTests.Conventions;
-    using TestStack.ConventionTests.Internal;
+    using System.Linq;
 
     /// <summary>
     ///     This is where we set what our convention is all about.
@@ -18,10 +17,6 @@ public Types(string descriptionOfTypes)
 
         public string Description { get; private set; }
 
-        public void EnsureHasNonEmptySource()
-        {
-            if (TypesToVerify.None())
-                throw new ConventionSourceInvalidException("You must supply types to verify");
-        }
+        public bool HasData {get { return TypesToVerify.Any(); }}
     }
 }

TestStack.ConventionTests/IConventionData.cs

@@ -3,6 +3,6 @@
     public interface IConventionData
     {
         string Description { get; }
-        void EnsureHasNonEmptySource();
+        bool HasData { get; }
     }
 }

TestStack.ConventionTests/Internal/Executor.cs

@@ -1,42 +1,45 @@
-namespace TestStack.ConventionTests.Internal
-{
-    using System.Linq;
-    using TestStack.ConventionTests.Reporting;
-
-    public static class Executor
-    {
-        public static ResultInfo GetConventionReport(string conventionTitle, object[] failingData, IConventionData data)
-        {
-            data.EnsureHasNonEmptySource();
-            var passed = failingData.None();
-
-            var conventionResult = new ResultInfo(
-                passed ? TestResult.Passed : TestResult.Failed,
-                conventionTitle,
-                data.Description,
-                failingData.Select(FormatData).ToArray());
-            return conventionResult;
-        }
-
-        public static ResultInfo GetConventionReportWithApprovedExeptions(string conventionTitle, object[] failingData, IConventionData data)
-        {
-            var conventionResult = Executor.GetConventionReport(conventionTitle, failingData, data);
-            var conventionReportTextRenderer = new ConventionReportTextRenderer();
-            // Add approved exceptions to report
-            conventionReportTextRenderer.RenderItems(conventionResult);
-            conventionResult.WithApprovedException(conventionReportTextRenderer.Output);
-
-            return conventionResult;
-        }
-
-        static ConventionReportFailure FormatData<T>(T failingData)
-        {
-            var formatter = Convention.Formatters.FirstOrDefault(f => f.CanFormat(failingData));
-
-            if (formatter == null)
-                throw new NoDataFormatterFoundException(typeof(T).Name + " has no formatter, add one with `Convention.Formatters.Add(new MyDataFormatter());`");
-
-            return formatter.Format(failingData);
-        }
-    }
+namespace TestStack.ConventionTests.Internal
+{
+    using System.Linq;
+    using TestStack.ConventionTests.Conventions;
+    using TestStack.ConventionTests.Reporting;
+
+    public static class Executor
+    {
+        public static ResultInfo GetConventionReport(string conventionTitle, object[] failingData, IConventionData data)
+        {
+            if (!data.HasData)
+                throw new ConventionSourceInvalidException(string.Format("{0} has no data", data.Description));
+
+            var passed = failingData.None();
+
+            var conventionResult = new ResultInfo(
+                passed ? TestResult.Passed : TestResult.Failed,
+                conventionTitle,
+                data.Description,
+                failingData.Select(FormatData).ToArray());
+            return conventionResult;
+        }
+
+        public static ResultInfo GetConventionReportWithApprovedExeptions(string conventionTitle, object[] failingData, IConventionData data)
+        {
+            var conventionResult = Executor.GetConventionReport(conventionTitle, failingData, data);
+            var conventionReportTextRenderer = new ConventionReportTextRenderer();
+            // Add approved exceptions to report
+            conventionReportTextRenderer.RenderItems(conventionResult);
+            conventionResult.WithApprovedException(conventionReportTextRenderer.Output);
+
+            return conventionResult;
+        }
+
+        static ConventionReportFailure FormatData<T>(T failingData)
+        {
+            var formatter = Convention.Formatters.FirstOrDefault(f => f.CanFormat(failingData));
+
+            if (formatter == null)
+                throw new NoDataFormatterFoundException(typeof(T).Name + " has no formatter, add one with `Convention.Formatters.Add(new MyDataFormatter());`");
+
+            return formatter.Format(failingData);
+        }
+    }
 }