Merge pull request #358 from JakeGinnivan/fixDynamicShouldUnitTests

Fix dynamic should unit tests
shouldly · Jan 30, 2016 · 54ae9c9 · 54ae9c9
2 parents e091e99 + 21b62a8
commit 54ae9c9
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 49 deletions.
diff --git a/src/Shouldly.Shared/Internals/IShouldlyAssertionContext.cs b/src/Shouldly.Shared/Internals/IShouldlyAssertionContext.cs
@@ -9,6 +9,8 @@ internal interface IShouldlyAssertionContext
     {
         string ShouldMethod { get; set; }
         string CodePart { get; set; }
+        string FileName { get; set; }
+        int? LineNumber { get; set; }
         object Key { get; set; }
         object Expected { get; set; }
         object Actual { get; set; }

diff --git a/src/Shouldly.Shared/Internals/ShouldlyAssertionContext.cs b/src/Shouldly.Shared/Internals/ShouldlyAssertionContext.cs
@@ -9,6 +9,8 @@ internal class ShouldlyAssertionContext : IShouldlyAssertionContext
     {
         public string ShouldMethod { get; set; }
         public string CodePart { get; set; }
+        public string FileName { get; set; }
+        public int? LineNumber { get; set; }
 
         public object Key { get; set; }
         public object Expected { get; set; }
@@ -51,6 +53,8 @@ internal ShouldlyAssertionContext(string shouldlyMethod, object expected = null,
             ShouldMethod = shouldlyMethod;
 
            CodePart = actualCodeGetter.GetCodeText(actual, stackTrace);
+            FileName = actualCodeGetter.FileName;
+            LineNumber = actualCodeGetter.LineNumber;
         }
 #endif
     }

diff --git a/src/Shouldly.Shared/Internals/SourceCodeTextGetter.cs b/src/Shouldly.Shared/Internals/SourceCodeTextGetter.cs
@@ -29,10 +29,9 @@ internal class ActualCodeTextGetter : ICodeTextGetter
 
         public string GetCodeText(object actual, StackTrace stackTrace)
         {
-            ParseStackTrace(stackTrace);
-
             if (ShouldlyConfiguration.IsSourceDisabledInErrors())
                 return actual.ToStringAwesomely();
+            ParseStackTrace(stackTrace);
             return GetCodePart();
         }
 

diff --git a/src/Shouldly.Shared/MessageGenerators/DynamicShouldMessageGenerator.cs b/src/Shouldly.Shared/MessageGenerators/DynamicShouldMessageGenerator.cs
@@ -6,33 +6,37 @@
 
 namespace Shouldly.MessageGenerators
 {
-//    internal class DynamicShouldMessageGenerator : ShouldlyMessageGenerator
-//    {
-//        static readonly Regex Validator = new Regex("HaveProperty", RegexOptions.Compiled);
-//        static readonly Regex DynamicObjectNameExtractor = new Regex(@"DynamicShould.HaveProperty\((?<dynamicObjectName>.*?),(?<propertyName>.*?)[\),]", RegexOptions.Compiled);
+    internal class DynamicShouldMessageGenerator : ShouldlyMessageGenerator
+    {
+        static readonly Regex Validator = new Regex("HaveProperty", RegexOptions.Compiled);
+        static readonly Regex DynamicObjectNameExtractor = new Regex(@"DynamicShould.HaveProperty\((?<dynamicObjectName>.*?),(?<propertyName>.*?)[\),]", RegexOptions.Compiled);
 
-//        public override bool CanProcess(IShouldlyAssertionContext context)
-//        {
-//            return Validator.IsMatch(context.ShouldMethod);
-//        }
+        public override bool CanProcess(IShouldlyAssertionContext context)
+        {
+            return Validator.IsMatch(context.ShouldMethod);
+        }
 
-//        public override string GenerateErrorMessage(IShouldlyAssertionContext context)
-//        {
-//            const string format =
-//@"{0}
-//    should contain property
-//{1}
-//    but does not.";
+        public override string GenerateErrorMessage(IShouldlyAssertionContext context)
+        {
+            var propertyName = context.Expected;
 
-//            var testFileName = context.OriginatingFrame.GetFileName();
-//            var assertionLineNumber = context.OriginatingFrame.GetFileLineNumber();
+            var testFileName = context.FileName;
+            var assertionLineNumber = context.LineNumber;
 
-//            var codeLine = string.Join("", File.ReadAllLines(testFileName).ToArray().Skip(assertionLineNumber - 1).Select(s => s.Trim()));
-//            var dynamicObjectName = DynamicObjectNameExtractor.Match(codeLine).Groups["dynamicObjectName"];
-//            var propertyName = DynamicObjectNameExtractor.Match(codeLine).Groups["propertyName"];
+            if (testFileName != null && assertionLineNumber != null)
+            {
+                var codeLine = string.Join("", File.ReadAllLines(testFileName).ToArray().Skip(assertionLineNumber.Value - 1).Select(s => s.Trim()));
+                var dynamicObjectName = DynamicObjectNameExtractor.Match(codeLine).Groups["dynamicObjectName"];
 
-//            return string.Format(format, dynamicObjectName, propertyName);
-//        }
-//    }
+                const string format = @"Dynamic object ""{0}"" should contain property ""{1}"" but does not.";
+                return string.Format(format, dynamicObjectName.ToString().Trim(), propertyName.ToString().Trim());
+            }
+            else
+            {
+                const string format = @"Dynamic object should contain property ""{0}"" but does not.";
+                return string.Format(format, propertyName.ToString().Trim());
+            }
+        }
+    }
 }
 #endif
diff --git a/src/Shouldly.Shared/ShouldStaticClasses/DynamicShould.cs b/src/Shouldly.Shared/ShouldStaticClasses/DynamicShould.cs
@@ -1,14 +1,12 @@
 #if net40
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Dynamic;
 using System.Linq;
 using JetBrains.Annotations;
 
 namespace Shouldly
 {
-    [DebuggerStepThrough]
     [ShouldlyMethods]
     public static class DynamicShould
     {

diff --git a/src/Shouldly.Shared/ShouldlyMessage.cs b/src/Shouldly.Shared/ShouldlyMessage.cs
@@ -204,7 +204,7 @@ internal abstract class ShouldlyMessage
             new ShouldBeEmptyMessageGenerator(),
             new ShouldAllBeMessageGenerator(),
     #if net40
-            // new DynamicShouldMessageGenerator(), TODO Make worth without stacktraces
+            new DynamicShouldMessageGenerator(), //TODO Make worth without stacktraces
             new ShouldCompleteInMessageGenerator(),
             new ShouldBeNullOrWhiteSpaceMessageGenerator(),
     #endif

diff --git a/src/Shouldly.Tests.Shared/DynamicShould/HavePropertyNonDynamicScenario.cs b/src/Shouldly.Tests.Shared/DynamicShould/HavePropertyNonDynamicScenario.cs
@@ -11,7 +11,7 @@ class Foo
             public string Bar { get; set; }
         }
 
-        [Fact(Skip = "Dynamic object is broken if no stackframe is available")]
+        [Fact]
         public void HavePropertyNonDynamicScenarioShouldFail()
         {
             dynamic testDynamicObject = new Foo();
@@ -23,13 +23,15 @@ public void HavePropertyNonDynamicScenarioShouldFail()
 
 errorWithSource:
 @"Dynamic object ""testDynamicObject"" should contain property ""foo"" but does not." + @"
+
 Additional Info:
-Some additional context",
+    Some additional context",
 
 errorWithoutSource:
-@"Dynamic object ""testDynamicObject"" should contain property ""foo"" but does not." + @"
+@"Dynamic object should contain property ""foo"" but does not." + @"
+
 Additional Info:
-Some additional context");
+    Some additional context");
         }
 
         [Fact]

diff --git a/src/Shouldly.Tests.Shared/DynamicShould/HavePropertyScenario.cs b/src/Shouldly.Tests.Shared/DynamicShould/HavePropertyScenario.cs
@@ -7,25 +7,24 @@ namespace Shouldly.Tests.DynamicShouldTests
 {
     public class HavePropertyScenario
     {
-
-        [Fact(Skip = "DynamicShould is broken when stackframe is not available")]
+        [Fact]
         public void HavePropertyScenarioShouldFail()
         {
             dynamic testDynamicObject = new ExpandoObject();
             testDynamicObject.Bar = "BarPropertyValue";
-            Verify.ShouldFail(() =>
-            DynamicShould
-                .HaveProperty(testDynamicObject, "foo", "Some additional context"),
+            Verify.ShouldFail(() => DynamicShould.HaveProperty(testDynamicObject, "foo", "Some additional context"),
 
 errorWithSource:
 @"Dynamic object ""testDynamicObject"" should contain property ""foo"" but does not." + @"
+
 Additional Info:
-Some additional context",
+    Some additional context",
 
 errorWithoutSource:
-@"Dynamic object ""testDynamicObject"" should contain property ""foo"" but does not." + @"
+@"Dynamic object should contain property ""foo"" but does not." + @"
+
 Additional Info:
-Some additional context");
+    Some additional context");
         }
 
         [Fact]

diff --git a/src/Shouldly.Tests.Shared/DynamicShould/MultiLineHavePropertyScenario.cs b/src/Shouldly.Tests.Shared/DynamicShould/MultiLineHavePropertyScenario.cs
@@ -7,8 +7,7 @@ namespace Shouldly.Tests.DynamicShouldTests
 {
     public class MultiLineHavePropertyScenario
     {
-
-        [Fact(Skip = "DynamicShould is broken when stackframe is not available")]
+        [Fact]
         public void MultiLineHavePropertyScenarioShouldFail()
         {
             dynamic testDynamicObject = new ExpandoObject();
@@ -19,13 +18,15 @@ public void MultiLineHavePropertyScenarioShouldFail()
 
 errorWithSource:
 @"Dynamic object ""testDynamicObject"" should contain property ""foo"" but does not." + @"
+
 Additional Info:
-Some additional context",
+    Some additional context",
 
 errorWithoutSource:
-@"Dynamic object ""testDynamicObject"" should contain property ""foo"" but does not." + @"
+@"Dynamic object should contain property ""foo"" but does not." + @"
+
 Additional Info:
-Some additional context");
+    Some additional context");
         }
 
         [Fact]

diff --git a/src/Shouldly.Tests.Shared/DynamicShould/MultiLineHavePropertyScenario_MaximumLines.cs b/src/Shouldly.Tests.Shared/DynamicShould/MultiLineHavePropertyScenario_MaximumLines.cs
@@ -8,7 +8,7 @@ namespace Shouldly.Tests.DynamicShouldTests
     public class MultiLineHavePropertyScenario_MaximumLines
     {
 
-        [Fact(Skip = "DynamicShould is broken when stackframe is not available")]
+        [Fact]
         public void MultiLineHavePropertyScenario_MaximumLinesShouldFail()
         {
             dynamic testDynamicObject = new ExpandoObject();
@@ -24,13 +24,15 @@ public void MultiLineHavePropertyScenario_MaximumLinesShouldFail()
 
 errorWithSource:
 @"Dynamic object ""testDynamicObject"" should contain property ""foo"" but does not." + @"
+
 Additional Info:
-Some additional context",
+    Some additional context",
 
 errorWithoutSource:
-@"Dynamic object ""testDynamicObject"" should contain property ""foo"" but does not." + @"
+@"Dynamic object should contain property ""foo"" but does not." + @"
+
 Additional Info:
-Some additional context");
+    Some additional context");
         }
 
         [Fact]