Merge pull request #17 from JakeGinnivan/AnotherIteration

Another iteration

Author: kkozmic

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

@@ -0,0 +1,3 @@
+Header
+
+Approved Exception

TestStack.ConventionTests.Tests/ConventionAssertionClassTests.cs

@@ -0,0 +1,37 @@
+namespace TestStack.ConventionTests.Tests
+{
+    using ApprovalTests.Reporters;
+    using NUnit.Framework;
+    using TestStack.ConventionTests.Internal;
+
+    [TestFixture]
+    [UseReporter(typeof(DiffReporter))] //NOTE: Can we take care of this in IsWithApprovedExceptions?
+    public class ConventionAssertionClassTests
+    {
+        [Test]
+        public void approval_mismatch()
+        {
+            //NOTE Do not approve any changes to this test
+            var ex = Assert.Throws<ConventionFailedException>(() => Convention.IsWithApprovedExeptions(new FailingConvention(), new FakeData()));
+
+            StringAssert.Contains("Approved exceptions for convention differs", ex.Message);
+            StringAssert.Contains("Failed Approval: Received file ", ex.Message);
+            StringAssert.Contains("does not match approved file", ex.Message);
+        }
+
+        public class FakeData : IConventionData
+        {
+            public void ThrowIfHasInvalidSource()
+            {
+            }
+        }
+
+        public class FailingConvention : IConvention<FakeData>
+        {
+            public ConventionResult Execute(FakeData data)
+            {
+                return ConventionResult.For(new[] { "" }, "Header", (s, builder) => builder.AppendLine("Different"));
+            }
+        }
+    }
+}

TestStack.ConventionTests.Tests/ProjectBasedConventions.BrokenReferences.received.txt

@@ -0,0 +1,3 @@
+Some invalid assembly references found in TestStack.ConventionTests.Tests
+
+	bin\Debug\ApprovalTests.dll

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

@@ -0,0 +1,3 @@
+Some invalid assembly references found in TestStack.ConventionTests.Tests
+
+	bin\Debug\ApprovalTests.dll

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

@@ -1,6 +1,7 @@
 namespace TestStack.ConventionTests.Tests
 {
     using System.Xml.Linq;
+    using ApprovalTests;
     using ApprovalTests.Reporters;
     using NSubstitute;
     using NUnit.Framework;
@@ -9,42 +10,64 @@
     using TestStack.ConventionTests.Tests.Properties;
 
     [TestFixture]
-    [UseReporter(typeof (DiffReporter))]
+    [UseReporter(typeof(DiffReporter))]
     public class ProjectBasedConventions
     {
-        public ProjectBasedConventions()
+        Project project;
+        IProjectProvider projectProvider;
+
+        [SetUp]
+        public void Setup()
         {
-            Convention.Settings.AssertInclunclusive = Assert.Inconclusive;
-            Convention.Settings.AssertZero = (v, m) => Assert.AreEqual(0, v, m);
+            projectProvider = Substitute.For<IProjectProvider>();
+            var projectLocator = Substitute.For<IProjectLocator>();
+            project = new Project(typeof(ProjectBasedConventions).Assembly, projectProvider, projectLocator);
         }
 
         [Test]
-        public void ReferencingBinObj()
+        public void assemblies_referencing_bin_obj()
         {
-            var projectProvider = Substitute.For<IProjectProvider>();
-            var projectLocator = Substitute.For<IProjectLocator>();
             projectProvider
                 .LoadProjectDocument(Arg.Any<string>())
                 .Returns(XDocument.Parse(Resources.ProjectFileWithBinReference));
 
-            Convention.Is(new ProjectDoesNotReferenceDllsFromBinOrObjDirectories(),
-                new Project(typeof (ProjectBasedConventions).Assembly, projectProvider, projectLocator));
+            var ex = Assert.Throws<ConventionFailedException>(() => Convention.Is(new ProjectDoesNotReferenceDllsFromBinOrObjDirectories(), project));
+
+            Approvals.Verify(ex.Message);
         }
-         
+
         [Test]
-        public void ScriptsNotEmbeddedResources()
+        public void assemblies_referencing_bin_obj_with_approved_exceptions()
         {
-            var projectProvider = Substitute.For<IProjectProvider>();
-            var projectLocator = Substitute.For<IProjectLocator>();
+            projectProvider
+                .LoadProjectDocument(Arg.Any<string>())
+                .Returns(XDocument.Parse(Resources.ProjectFileWithBinReference));
+
+            Convention.IsWithApprovedExeptions(new ProjectDoesNotReferenceDllsFromBinOrObjDirectories(), project);
+        }
+
+        [Test]
+        public void scripts_not_embedded_resources()
+        {
+            project.Includes = i => i.EndsWith(".sql");
+            projectProvider
+                .LoadProjectDocument(Arg.Any<string>())
+                .Returns(XDocument.Parse(Resources.ProjectFileWithInvalidSqlScriptFile));
+
+            var ex = Assert.Throws<ConventionFailedException>(() => Convention.Is(new FilesAreEmbeddedResources(), project));
+
+            Approvals.Verify(ex.Message);
+        }
+
+        [Test]
+        public void scripts_not_embedded_resources_with_approved_exceptions()
+        {
+            project.Includes = i => i.EndsWith(".sql");
             projectProvider
                 .LoadProjectDocument(Arg.Any<string>())
                 .Returns(XDocument.Parse(Resources.ProjectFileWithInvalidSqlScriptFile));
 
-            Convention.Is(new FilesAreEmbeddedResources(),
-                new Project(typeof (ProjectBasedConventions).Assembly, projectProvider, projectLocator)
-                {
-                    Includes = i => i.EndsWith(".sql")
-                });
+            Convention.IsWithApprovedExeptions(new FilesAreEmbeddedResources(), project);
         }
     }
 }

TestStack.ConventionTests.Tests/ProjectBasedConventions.ScriptsNotEmbeddedResources.approved.txt.orig

@@ -0,0 +1,3 @@
+The following files which should be embedded resources:
+
+	Scripts\Script2.sql