evaluating success/failure in ConvenionResult

Author: kkozmic

TestStack.ConventionTests/Internal/ConventionContext.cs

@@ -26,9 +26,7 @@ public ConventionResult[] ConventionResults
         void IConventionResultContext.Is<T>(string resultTitle, IEnumerable<T> failingData)
         {
             // ReSharper disable PossibleMultipleEnumeration
-            results.Add(new ConventionResult(
-                failingData.None() ? TestResult.Passed : TestResult.Failed,
-                resultTitle,
+            results.Add(new ConventionResult(resultTitle,
                 dataDescription,
                 failingData.Select(FormatData).ToArray()));
         }
@@ -37,14 +35,10 @@ void IConventionResultContext.IsSymmetric<TResult>(
             string firstSetFailureTitle, IEnumerable<TResult> firstSetFailureData,
             string secondSetFailureTitle, IEnumerable<TResult> secondSetFailureData)
         {
-            results.Add(new ConventionResult(
-                firstSetFailureData.None() ? TestResult.Passed : TestResult.Failed,
-                firstSetFailureTitle,
+            results.Add(new ConventionResult(firstSetFailureTitle,
                 dataDescription,
                 firstSetFailureData.Select(FormatData).ToArray()));
-            results.Add(new ConventionResult(
-                secondSetFailureData.None() ? TestResult.Passed : TestResult.Failed,
-                secondSetFailureTitle,
+            results.Add(new ConventionResult(secondSetFailureTitle,
                 dataDescription,
                 secondSetFailureData.Select(FormatData).ToArray()));
         }

TestStack.ConventionTests/Internal/ConventionResult.cs

@@ -1,28 +1,32 @@
-namespace TestStack.ConventionTests.Internal
-{
-    using TestStack.ConventionTests.Reporting;
-
-    public class ConventionResult
-    {
-        public TestResult Result { get; private set; }
-        public string ConventionTitle { get; private set; }
-        public string DataDescription { get; private set; }
-        public ConventionReportFailure[] ConventionFailures { get; private set; }
-        public string ApprovedException { get; private set; }
-
-        public ConventionResult(TestResult result, string conventionTitle, string dataDescription, ConventionReportFailure[] conventionFailures)
-        {
-            Result = result;
-            ConventionTitle = conventionTitle;
-            DataDescription = dataDescription;
-            ConventionFailures = conventionFailures;
-        }
-
-        public void WithApprovedException(string output)
-        {
-            ApprovedException = output;
-            Result = TestResult.Passed;
-            ConventionFailures = new ConventionReportFailure[0];
-        }
-    }
+namespace TestStack.ConventionTests.Internal
+{
+    using System.Linq;
+    using TestStack.ConventionTests.Reporting;
+
+    public class ConventionResult
+    {
+        public ConventionResult(string conventionTitle, string dataDescription, ConventionReportFailure[] conventionFailures)
+        {
+            ConventionTitle = conventionTitle;
+            DataDescription = dataDescription;
+            ConventionFailures = conventionFailures;
+        }
+
+        public TestResult Result
+        {
+            get
+            {
+                if (ConventionFailures.Any())
+                {
+                    return TestResult.Failed;
+                }
+                return TestResult.Passed;
+            }
+        }
+
+        public string ConventionTitle { get; private set; }
+        public string DataDescription { get; private set; }
+        public ConventionReportFailure[] ConventionFailures { get; private set; }
+        public string ApprovedException { get; private set; }
+    }
 }