it's not up to the formatter to decide pass/fail

kkozmic · kkozmic · commit 1347d877e03a · 2013-08-18T13:00:37.000+10:00
diff --git a/TestStack.ConventionTests.Tests/ConventionAssertionClassTests.approval_mismatch.approved.txt b/TestStack.ConventionTests.Tests/ConventionAssertionClassTests.approval_mismatch.approved.txt
@@ -1,5 +1,4 @@
-﻿Passed: 'Header' for 'Fake data'
---------------------------------
+﻿'Header' for 'Fake data'
+------------------------
 
-With approved exceptions:
 	Approved Exception
diff --git a/TestStack.ConventionTests.Tests/ProjectBasedConventions.assemblies_referencing_bin_obj.approved.txt b/TestStack.ConventionTests.Tests/ProjectBasedConventions.assemblies_referencing_bin_obj.approved.txt
@@ -1,4 +1,4 @@
-﻿Failed: 'Project must not reference dlls from bin or obj directories' for 'TestStack.ConventionTests.Tests'
------------------------------------------------------------------------------------------------------------
+﻿'Project must not reference dlls from bin or obj directories' for 'TestStack.ConventionTests.Tests'
+---------------------------------------------------------------------------------------------------
 
 	bin\Debug\ApprovalTests.dll
diff --git a/TestStack.ConventionTests.Tests/ProjectBasedConventions.assemblies_referencing_bin_obj_with_approved_exceptions.approved.txt b/TestStack.ConventionTests.Tests/ProjectBasedConventions.assemblies_referencing_bin_obj_with_approved_exceptions.approved.txt
@@ -1,5 +1,4 @@
-﻿Passed: 'Project must not reference dlls from bin or obj directories' for 'TestStack.ConventionTests.Tests'
------------------------------------------------------------------------------------------------------------
+﻿'Project must not reference dlls from bin or obj directories' for 'TestStack.ConventionTests.Tests'
+---------------------------------------------------------------------------------------------------
 
-With approved exceptions:
 	bin\Debug\ApprovalTests.dll
diff --git a/TestStack.ConventionTests.Tests/ProjectBasedConventions.scripts_not_embedded_resources.approved.txt b/TestStack.ConventionTests.Tests/ProjectBasedConventions.scripts_not_embedded_resources.approved.txt
@@ -1,4 +1,4 @@
-﻿Failed: '.sql Files must be embedded resources' for 'TestStack.ConventionTests.Tests'
--------------------------------------------------------------------------------------
+﻿'.sql Files must be embedded resources' for 'TestStack.ConventionTests.Tests'
+-----------------------------------------------------------------------------
 
 	Scripts\Script2.sql
diff --git a/TestStack.ConventionTests.Tests/ProjectBasedConventions.scripts_not_embedded_resources_with_approved_exceptions.approved.txt b/TestStack.ConventionTests.Tests/ProjectBasedConventions.scripts_not_embedded_resources_with_approved_exceptions.approved.txt
@@ -1,5 +1,4 @@
-﻿Passed: '.sql Files must be embedded resources' for 'TestStack.ConventionTests.Tests'
--------------------------------------------------------------------------------------
+﻿'.sql Files must be embedded resources' for 'TestStack.ConventionTests.Tests'
+-----------------------------------------------------------------------------
 
-With approved exceptions:
 	Scripts\Script2.sql
diff --git a/TestStack.ConventionTests.Tests/TypeBasedConventions.all_classes_have_default_constructor.approved.txt b/TestStack.ConventionTests.Tests/TypeBasedConventions.all_classes_have_default_constructor.approved.txt
@@ -1,5 +1,5 @@
-﻿Failed: 'Types must have a default constructor' for 'nHibernate Entitites'
---------------------------------------------------------------------------
+﻿'Types must have a default constructor' for 'nHibernate Entitites'
+------------------------------------------------------------------
 
 	TestAssembly.ClassWithNoDefaultCtor
 	TestAssembly.ClassWithPrivateDefaultCtor
diff --git a/TestStack.ConventionTests.Tests/TypeBasedConventions.all_classes_have_default_constructor_wth_approved_exceptions.approved.txt b/TestStack.ConventionTests.Tests/TypeBasedConventions.all_classes_have_default_constructor_wth_approved_exceptions.approved.txt
@@ -1,6 +1,5 @@
-﻿Passed: 'Types must have a default constructor' for 'nHibernate Entitites'
---------------------------------------------------------------------------
+﻿'Types must have a default constructor' for 'nHibernate Entitites'
+------------------------------------------------------------------
 
-With approved exceptions:
 	TestAssembly.ClassWithNoDefaultCtor
 	TestAssembly.ClassWithPrivateDefaultCtor
diff --git a/TestStack.ConventionTests.Tests/TypeBasedConventions.all_methods_are_virtual.approved.txt b/TestStack.ConventionTests.Tests/TypeBasedConventions.all_methods_are_virtual.approved.txt
@@ -1,4 +1,4 @@
-﻿Failed: 'Methods must be virtual' for 'nHibernate Entitites'
-------------------------------------------------------------
+﻿'Methods must be virtual' for 'nHibernate Entitites'
+----------------------------------------------------
 
 	TestAssembly.SampleDomainClass.TestNonVirtual
diff --git a/TestStack.ConventionTests.Tests/TypeBasedConventions.all_methods_are_virtual_wth_approved_exceptions.approved.txt b/TestStack.ConventionTests.Tests/TypeBasedConventions.all_methods_are_virtual_wth_approved_exceptions.approved.txt
@@ -1,5 +1,4 @@
-﻿Passed: 'Methods must be virtual' for 'nHibernate Entitites'
-------------------------------------------------------------
+﻿'Methods must be virtual' for 'nHibernate Entitites'
+----------------------------------------------------
 
-With approved exceptions:
 	TestAssembly.SampleDomainClass.TestNonVirtual
diff --git a/TestStack.ConventionTests.Tests/TypeBasedConventions.dtos_exists_in_dto_namespace.approved.txt b/TestStack.ConventionTests.Tests/TypeBasedConventions.dtos_exists_in_dto_namespace.approved.txt
@@ -1,10 +1,10 @@
-﻿Failed: 'Dtos must be under the 'TestAssembly.Dtos' namespace' for 'TestAssembly types'
----------------------------------------------------------------------------------------
+﻿'Dtos must be under the 'TestAssembly.Dtos' namespace' for 'TestAssembly types'
+-------------------------------------------------------------------------------
 
 	TestAssembly.SomeDto
 
 
-Failed: 'Non-Dtos must not be under the 'TestAssembly.Dtos' namespace' for 'TestAssembly types'
------------------------------------------------------------------------------------------------
+'Non-Dtos must not be under the 'TestAssembly.Dtos' namespace' for 'TestAssembly types'
+---------------------------------------------------------------------------------------
 
 	TestAssembly.Dtos.AnotherClass
diff --git a/TestStack.ConventionTests.Tests/TypeBasedConventions.dtos_exists_in_dto_namespace_wth_approved_exceptions.approved.txt b/TestStack.ConventionTests.Tests/TypeBasedConventions.dtos_exists_in_dto_namespace_wth_approved_exceptions.approved.txt
@@ -1,14 +1,10 @@
-﻿Passed: 'Dtos must be under the 'TestAssembly.Dtos' namespace' for 'TestAssembly types'
----------------------------------------------------------------------------------------
+﻿'Dtos must be under the 'TestAssembly.Dtos' namespace' for 'TestAssembly types'
+-------------------------------------------------------------------------------
 
-With approved exceptions:
 	TestAssembly.SomeDto
 
 
+'Non-Dtos must not be under the 'TestAssembly.Dtos' namespace' for 'TestAssembly types'
+---------------------------------------------------------------------------------------
 
-
-Passed: 'Non-Dtos must not be under the 'TestAssembly.Dtos' namespace' for 'TestAssembly types'
------------------------------------------------------------------------------------------------
-
-With approved exceptions:
 	TestAssembly.Dtos.AnotherClass
diff --git a/TestStack.ConventionTests/Internal/ConventionResult.cs b/TestStack.ConventionTests/Internal/ConventionResult.cs
@@ -1,7 +1,6 @@
 ﻿namespace TestStack.ConventionTests.Internal
 {
     using System.Linq;
-    using TestStack.ConventionTests.Reporting;
 
     public class ConventionResult
     {
@@ -12,20 +11,13 @@ public ConventionResult(string conventionTitle, string dataDescription, object[]
             Data = data;
         }
 
-        public TestResult Result
-        {
-            get
-            {
-                if (Data.Any())
-                {
-                    return TestResult.Failed;
-                }
-                return TestResult.Passed;
-            }
-        }
-
         public string ConventionTitle { get; private set; }
         public string DataDescription { get; private set; }
         public object[] Data { get; private set; }
+
+        public bool HasData
+        {
+            get { return Data.Any(); }
+        }
     }
 }
diff --git a/TestStack.ConventionTests/Reporting/ConventionReportTextRenderer.cs b/TestStack.ConventionTests/Reporting/ConventionReportTextRenderer.cs
@@ -11,7 +11,7 @@ public void Process(IConventionFormatContext context, params ConventionResult[]
 
             foreach (var conventionReport in results)
             {
-                var title = string.Format("{0}: '{1}' for '{2}'", conventionReport.Result, conventionReport.ConventionTitle,
+                var title = string.Format("'{0}' for '{1}'", conventionReport.ConventionTitle,
                     conventionReport.DataDescription);
                 stringBuilder.AppendLine(title);
                 stringBuilder.AppendLine(string.Empty.PadRight(title.Length, '-'));
diff --git a/TestStack.ConventionTests/Reporting/HtmlReportRenderer.cs b/TestStack.ConventionTests/Reporting/HtmlReportRenderer.cs
@@ -39,7 +39,6 @@ public void Process(IConventionFormatContext context, params ConventionResult[]
                 html.RenderBeginTag(HtmlTextWriterTag.P);
                 html.RenderBeginTag(HtmlTextWriterTag.Div);
                 html.RenderBeginTag(HtmlTextWriterTag.Strong);
-                html.Write(conventionReport.Result+": ");
                 html.RenderEndTag();
                 var title = String.Format("{0} for {1}", conventionReport.ConventionTitle, conventionReport.DataDescription);
                 html.Write(title);
diff --git a/TestStack.ConventionTests/Reporting/ThrowOnFailureResultsProcessor.cs b/TestStack.ConventionTests/Reporting/ThrowOnFailureResultsProcessor.cs
@@ -9,7 +9,7 @@ public void Process(IConventionFormatContext context, params ConventionResult[]
         {
             var conventionReportTextRenderer = new ConventionReportTextRenderer();
             conventionReportTextRenderer.Process(context, results);
-            if (results.Any(r => r.Result == TestResult.Failed))
+            if (results.Any(r => r.HasData))
             {
                 throw new ConventionFailedException(conventionReportTextRenderer.Output);
             }
