Merge pull request #21 from JakeGinnivan/Reporting

Reporting

Author: kkozmic

ConventionTests.sln.DotSettings

@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentNameForLiteralExpression/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=all/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="all"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSRemoveCodeRedundancies&gt;True&lt;/CSRemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_IMPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_IMPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_IMPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">all</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EXPLICIT_PRIVATE_MODIFIER/@EntryValue">False</s:Boolean>

TestStack.ConventionTests.Tests/ConventionAssertionClassTests.approval_mismatch.approved.txt

@@ -1,4 +1,5 @@
-Header
-------
+Passed: 'Header' for 'Fake data'
+--------------------------------
 
-Approved Exception
+With approved exceptions:
+	Approved Exception

TestStack.ConventionTests.Tests/ConventionAssertionClassTests.cs

@@ -1,5 +1,6 @@
 namespace TestStack.ConventionTests.Tests
 {
+    using System.Collections.Generic;
     using ApprovalTests.Reporters;
     using NUnit.Framework;
     using TestStack.ConventionTests.Internal;
@@ -21,16 +22,22 @@ public void approval_mismatch()
 
         public class FakeData : IConventionData
         {
-            public void EnsureHasNonEmptySource()
+            public string Description { get { return "Fake data"; } }
+
+            public bool HasData { get { return true; } }
+
+            public ConventionReportFailure Format(string failingData)
             {
+                return new ConventionReportFailure(failingData);
             }
         }
 
         public class FailingConvention : IConvention<FakeData>
         {
-            public ConventionResult Execute(FakeData data)
+            public string ConventionTitle { get { return "Header"; } }
+            public IEnumerable<object> GetFailingData(FakeData data)
             {
-                return ConventionResult.For(new[] { "" }, "Header", (s, builder) => builder.AppendLine("Different"));
+                return new[] { "Different" };
             }
         }
     }

TestStack.ConventionTests.Tests/ProjectBasedConventions.assemblies_referencing_bin_obj.approved.txt

@@ -1,4 +1,4 @@
-Some invalid assembly references found in TestStack.ConventionTests.Tests
--------------------------------------------------------------------------
+Failed: 'Project must not reference dlls from bin or obj directories' for 'TestStack.ConventionTests.Tests'
+-----------------------------------------------------------------------------------------------------------
 
-	bin\Debug\ApprovalTests.dll
+	bin\Debug\ApprovalTests.dll

TestStack.ConventionTests.Tests/ProjectBasedConventions.assemblies_referencing_bin_obj_with_approved_exceptions.approved.txt

@@ -1,4 +1,5 @@
-Some invalid assembly references found in TestStack.ConventionTests.Tests
--------------------------------------------------------------------------
+Passed: 'Project must not reference dlls from bin or obj directories' for 'TestStack.ConventionTests.Tests'
+-----------------------------------------------------------------------------------------------------------
 
-	bin\Debug\ApprovalTests.dll
+With approved exceptions:
+	bin\Debug\ApprovalTests.dll

TestStack.ConventionTests.Tests/ProjectBasedConventions.cs

@@ -57,11 +57,8 @@ public void scripts_not_embedded_resources()
                 .Returns(XDocument.Parse(Resources.ProjectFileWithInvalidSqlScriptFile));
 
             var projectLocator = Substitute.For<IProjectLocator>();
-            var project = new ProjectFiles(typeof (ProjectBasedConventions).Assembly, projectProvider, projectLocator)
-            {
-                Items = i => i.FilePath.EndsWith(".sql")
-            };
-            var ex = Assert.Throws<ConventionFailedException>(() => Convention.Is(new FilesAreEmbeddedResources(), project));
+            var project = new ProjectFiles(typeof (ProjectBasedConventions).Assembly, projectProvider, projectLocator);
+            var ex = Assert.Throws<ConventionFailedException>(() => Convention.Is(new FilesAreEmbeddedResources(".sql"), project));
 
             Approvals.Verify(ex.Message);
         }
@@ -70,15 +67,12 @@ public void scripts_not_embedded_resources()
         public void scripts_not_embedded_resources_with_approved_exceptions()
         {
             var projectLocator = Substitute.For<IProjectLocator>();
-            var project = new ProjectFiles(typeof(ProjectBasedConventions).Assembly, projectProvider, projectLocator)
-            {
-                Items = i => i.FilePath.EndsWith(".sql")
-            };
+            var project = new ProjectFiles(typeof (ProjectBasedConventions).Assembly, projectProvider, projectLocator);
             projectProvider
                 .LoadProjectDocument(Arg.Any<string>())
                 .Returns(XDocument.Parse(Resources.ProjectFileWithInvalidSqlScriptFile));
 
-            Convention.IsWithApprovedExeptions(new FilesAreEmbeddedResources(), project);
+            Convention.IsWithApprovedExeptions(new FilesAreEmbeddedResources(".sql"), project);
         }
     }
 }

TestStack.ConventionTests.Tests/ProjectBasedConventions.scripts_not_embedded_resources.approved.txt

@@ -1,4 +1,4 @@
-The following files which should be embedded resources:
--------------------------------------------------------
+Failed: '.sql Files must be embedded resources' for 'TestStack.ConventionTests.Tests'
+-------------------------------------------------------------------------------------
 
-	Scripts\Script2.sql
+	Scripts\Script2.sql

TestStack.ConventionTests.Tests/ProjectBasedConventions.scripts_not_embedded_resources_with_approved_exceptions.approved.txt

@@ -1,4 +1,5 @@
-The following files which should be embedded resources:
--------------------------------------------------------
+Passed: '.sql Files must be embedded resources' for 'TestStack.ConventionTests.Tests'
+-------------------------------------------------------------------------------------
 
-	Scripts\Script2.sql
+With approved exceptions:
+	Scripts\Script2.sql

TestStack.ConventionTests.Tests/TypeBasedConventions.all_classes_have_default_constructor.approved.txt

@@ -1,5 +1,5 @@
-The following types do not have default constructor
----------------------------------------------------
+Failed: 'Types must have a default constructor' for 'nHibernate Entitites'
+--------------------------------------------------------------------------
 
 	TestAssembly.ClassWithNoDefaultCtor
-	TestAssembly.ClassWithPrivateDefaultCtor
+	TestAssembly.ClassWithPrivateDefaultCtor

TestStack.ConventionTests.Tests/TypeBasedConventions.all_classes_have_default_constructor_wth_approved_exceptions.approved.txt

@@ -1,5 +1,6 @@
-The following types do not have default constructor
----------------------------------------------------
+Passed: 'Types must have a default constructor' for 'nHibernate Entitites'
+--------------------------------------------------------------------------
 
+With approved exceptions:
 	TestAssembly.ClassWithNoDefaultCtor
-	TestAssembly.ClassWithPrivateDefaultCtor
+	TestAssembly.ClassWithPrivateDefaultCtor