Merge pull request #55 from ByteBlast/master

Null · Null · commit fde71ceca7e7 · 2015-04-08T11:03:26.000+01:00
Reconciled quotation marks
diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md
@@ -23,6 +23,18 @@ You can read the original problem specification and discussion  [here](https://g
 
 If your project has been impacted by this particular breaking change, you might consider reevaluate the correctness of the affected tests. 
 
+## Error Messages
+
+Some error messages surrounded actual values in double quotes. Others surrounded the values in single quotes. In version 3.0.0 *all* values are surrounded in single quotes.
+
+### Reason
+
+Consistency.
+
+### Fix
+
+Amend all effected tests to expect single quotes instead of double quotes.
+
 # Version 2.0.0
 
 ## ShouldRenderFileStream Method
diff --git a/TestStack.FluentMVCTesting.Tests/ControllerExtensionsTests.cs b/TestStack.FluentMVCTesting.Tests/ControllerExtensionsTests.cs
@@ -58,13 +58,13 @@ public void Check_for_unexpected_non_existent_temp_data_property()
             const string key = "";
 
             var exception = Assert.Throws<TempDataAssertionException>(() =>
-                _controller.ShouldHaveTempDataProperty(key));
-
-            Assert.That(exception.Message, Is.EqualTo(string.Format(
-                "Expected TempData to have a non-null value with key \"{0}\", but none found.", key)));
-        }
-
-        [Test]
+                _controller.ShouldHaveTempDataProperty(key));
+
+            Assert.That(exception.Message, Is.EqualTo(string.Format(
+                "Expected TempData to have a non-null value with key '{0}', but none found.", key)));
+        }
+
+        [Test]
         public void Check_for_existent_temp_data_property_and_check_value()
         {
             const string key = "";
@@ -82,13 +82,13 @@ public void Check_for_existent_temp_data_property_and_check_invalid_value()
             const int expectedValue = 1;
             _controller.TempData[key] = actualValue;
 
-            var exception = Assert.Throws<TempDataAssertionException>(() =>
-                _controller.ShouldHaveTempDataProperty(key, expectedValue));
-
-            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected value for key \"{0}\" to be \"{1}\", but instead found \"{2}\"", key, expectedValue, actualValue)));
-        }
-
-        [Test]
+            var exception = Assert.Throws<TempDataAssertionException>(() =>
+                _controller.ShouldHaveTempDataProperty(key, expectedValue));
+
+            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected value for key '{0}' to be '{1}', but instead found '{2}'", key, expectedValue, actualValue)));
+        }
+
+        [Test]
         public void Check_for_existent_temp_data_property_and_check_invalid_value_of_different_types()
         {
             const string key = "";
@@ -141,13 +141,13 @@ public void Check_for_unexpected_non_existent_temp_data_property_when_supplied_w
             const string key = "";
 
             var exception = Assert.Throws<TempDataAssertionException>(() =>
-                _controller.ShouldHaveTempDataProperty<int>(key, x => x == 0));
-
-            Assert.That(exception.Message, Is.EqualTo(string.Format(
-                "Expected TempData to have a non-null value with key \"{0}\", but none found.", key)));
-        }
-
-        [Test]
+                _controller.ShouldHaveTempDataProperty<int>(key, x => x == 0));
+
+            Assert.That(exception.Message, Is.EqualTo(string.Format(
+                "Expected TempData to have a non-null value with key '{0}', but none found.", key)));
+        }
+
+        [Test]
         public void Check_for_non_existent_temp_data_property()
         {
             _controller
@@ -161,10 +161,10 @@ public void Check_for_unexpected_existent_temp_data_property()
             _controller.TempData[Key] = "";
 
             var exception = Assert.Throws<TempDataAssertionException>(() =>
-                _controller.ShouldNotHaveTempDataProperty(Key));
-
-            Assert.That(exception.Message, Is.EqualTo(string.Format(
-                "Expected TempData to have no value with key \"{0}\", but found one.", Key)));
-        }
-    }
-}
+                _controller.ShouldNotHaveTempDataProperty(Key));
+
+            Assert.That(exception.Message, Is.EqualTo(string.Format(
+                "Expected TempData to have no value with key '{0}', but found one.", Key)));
+        }
+    }
+}
diff --git a/TestStack.FluentMVCTesting.Tests/ControllerResultTestTests/ShouldRenderFileTests.cs b/TestStack.FluentMVCTesting.Tests/ControllerResultTestTests/ShouldRenderFileTests.cs
@@ -104,7 +104,7 @@ public void Check_for_file_content_result_and_check_invalid_textual_contents()
             var exception = Assert.Throws<ActionResultAssertionException>(() =>
                 _controller.WithCallTo(c => c.TextualFile()).ShouldRenderFileContents(contents));
 
-            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected file contents to be \"{0}\", but instead was \"{1}\".", contents, ControllerResultTestController.TextualFileContent)));
+            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected file contents to be '{0}', but instead was '{1}'.", contents, ControllerResultTestController.TextualFileContent)));
         }
 
         [Test]
@@ -309,7 +309,7 @@ public void Check_for_file_stream_result_and_check_invalid_textual_content()
             var exception = Assert.Throws<ActionResultAssertionException>(() =>
                 _controller.WithCallTo(c => c.TextualStream()).ShouldRenderFileStream(contents));
 
-            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected file contents to be \"{0}\", but instead was \"{1}\".", contents, ControllerResultTestController.TextualFileContent)));
+            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected file contents to be '{0}', but instead was '{1}'.", contents, ControllerResultTestController.TextualFileContent)));
         }
 
         [Test]
diff --git a/TestStack.FluentMVCTesting.Tests/ControllerResultTestTests/ShouldReturnContentTests.cs b/TestStack.FluentMVCTesting.Tests/ControllerResultTestTests/ShouldReturnContentTests.cs
@@ -26,7 +26,7 @@ public void Check_for_content_result_and_check_invalid_content()
 
             var exception = Assert.Throws<ActionResultAssertionException>(() => _controller.WithCallTo(c => c.Content()).ShouldReturnContent(content));
 
-            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected content to be \"{0}\", but instead was \"{1}\".", content, ControllerResultTestController.TextualContent)));
+            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected content to be '{0}', but instead was '{1}'.", content, ControllerResultTestController.TextualContent)));
         }
 
         [Test]
@@ -42,7 +42,7 @@ public void Check_for_content_result_and_check_content_and_check_invalid_content
 
             var exception = Assert.Throws<ActionResultAssertionException>(() => _controller.WithCallTo(c => c.Content()).ShouldReturnContent(ControllerResultTestController.TextualContent, contentType));
 
-            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected content type to be \"{0}\", but instead was \"{1}\".", contentType, ControllerResultTestController.ContentType)));
+            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected content type to be '{0}', but instead was '{1}'.", contentType, ControllerResultTestController.ContentType)));
         }
 
         [Test]
diff --git a/TestStack.FluentMVCTesting.Tests/TempDataResultTest.cs b/TestStack.FluentMVCTesting.Tests/TempDataResultTest.cs
@@ -35,7 +35,7 @@ public void Check_for_unexpected_non_existent_temp_data_property()
                 _tempDataTest.AndShouldHaveTempDataProperty(key));
 
             Assert.That(exception.Message, Is.EqualTo(string.Format(
-                "Expected TempData to have a non-null value with key \"{0}\", but none found.", key)));
+                "Expected TempData to have a non-null value with key '{0}', but none found.", key)));
         }
 
         [Test]
@@ -59,7 +59,7 @@ public void Check_for_existent_temp_data_property_and_check_invalid_value()
             var exception = Assert.Throws<TempDataAssertionException>(() =>
                 _tempDataTest.AndShouldHaveTempDataProperty(key, expectedValue));
 
-            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected value for key \"{0}\" to be \"{1}\", but instead found \"{2}\"", key, expectedValue, actualValue)));
+            Assert.That(exception.Message, Is.EqualTo(string.Format("Expected value for key '{0}' to be '{1}', but instead found '{2}'", key, expectedValue, actualValue)));
         }
 
         [Test]
@@ -117,7 +117,7 @@ public void Check_for_non_existent_temp_data_property_when_supplied_with_predica
                 _tempDataTest.AndShouldHaveTempDataProperty<int>(key, x => x == 0));
 
             Assert.That(exception.Message, Is.EqualTo(string.Format(
-                "Expected TempData to have a non-null value with key \"{0}\", but none found.", key)));
+                "Expected TempData to have a non-null value with key '{0}', but none found.", key)));
         }
 
         [Test]
@@ -137,7 +137,7 @@ public void Check_for_unexpected_existent_temp_data_property()
                 _tempDataTest.AndShouldNotHaveTempDataProperty(Key));
 
             Assert.That(exception.Message, Is.EqualTo(string.Format(
-                "Expected TempData to have no value with key \"{0}\", but found one.", Key)));
+                "Expected TempData to have no value with key '{0}', but found one.", Key)));
         }
 
         [Test]
diff --git a/TestStack.FluentMvcTesting/ControllerExtensions.cs b/TestStack.FluentMvcTesting/ControllerExtensions.cs
@@ -64,40 +64,40 @@ public static TempDataResultTest ShouldHaveTempDataProperty(this ControllerBase
         {
             var actual = controller.TempData[key];
 
-            if (actual == null)
-            {
-                throw new TempDataAssertionException(string.Format(
-                    "Expected TempData to have a non-null value with key \"{0}\", but none found.", key));
-            }
-
-            if (value != null && actual.GetType() != value.GetType())
+            if (actual == null)
+            {
+                throw new TempDataAssertionException(string.Format(
+                    "Expected TempData to have a non-null value with key '{0}', but none found.", key));
+            }
+
+            if (value != null && actual.GetType() != value.GetType())
             {
                 throw new TempDataAssertionException(string.Format(
                     "Expected value to be of type {0}, but instead was {1}.",
                     value.GetType().FullName,
                     actual.GetType().FullName));
             }
 
-            if (value != null && !value.Equals(actual))
-            {
-                throw new TempDataAssertionException(string.Format(
-                    "Expected value for key \"{0}\" to be \"{1}\", but instead found \"{2}\"", key, value, actual));
-            }
-
-            return new TempDataResultTest(controller);
+            if (value != null && !value.Equals(actual))
+            {
+                throw new TempDataAssertionException(string.Format(
+                    "Expected value for key '{0}' to be '{1}', but instead found '{2}'", key, value, actual));
+            }
+
+            return new TempDataResultTest(controller);
         }
 
         public static TempDataResultTest ShouldHaveTempDataProperty<TValue>(this ControllerBase controller, string key, Func<TValue, bool> predicate)
         {
             var actual = controller.TempData[key];
 
-            if (actual == null)
-            {
-                throw new TempDataAssertionException(string.Format(
-                    "Expected TempData to have a non-null value with key \"{0}\", but none found.", key));
-            }
-
-            if (!predicate((TValue)actual))
+            if (actual == null)
+            {
+                throw new TempDataAssertionException(string.Format(
+                    "Expected TempData to have a non-null value with key '{0}', but none found.", key));
+            }
+
+            if (!predicate((TValue)actual))
             {
                 throw new TempDataAssertionException("Expected view model to pass the given condition, but it failed.");
             }
@@ -109,13 +109,13 @@ public static TempDataResultTest ShouldNotHaveTempDataProperty(this ControllerBa
         {
             var actual = controller.TempData[key];
 
-            if (actual != null)
-            {
-                throw new TempDataAssertionException(string.Format(
-                    "Expected TempData to have no value with key \"{0}\", but found one.", key));
-            }
-
-            return new TempDataResultTest(controller);
+            if (actual != null)
+            {
+                throw new TempDataAssertionException(string.Format(
+                    "Expected TempData to have no value with key '{0}', but found one.", key));
+            }
+
+            return new TempDataResultTest(controller);
         }
 
     }
diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderFile.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderFile.cs
@@ -69,7 +69,7 @@ public FileContentResult ShouldRenderFileContents(string contents, string conten
             if (contents != reconstitutedText)
             {
                 throw new ActionResultAssertionException(string.Format(
-                    "Expected file contents to be \"{0}\", but instead was \"{1}\".",
+                    "Expected file contents to be '{0}', but instead was '{1}'.",
                     contents,
                     reconstitutedText));
             }
@@ -121,7 +121,7 @@ public FileStreamResult ShouldRenderFileStream(string contents, string contentTy
             if (contents != reconstitutedText)
             {
                 throw new ActionResultAssertionException(string.Format(
-                    "Expected file contents to be \"{0}\", but instead was \"{1}\".",
+                    "Expected file contents to be '{0}', but instead was '{1}'.",
                     contents,
                     reconstitutedText));
             }
diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnContent.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnContent.cs
@@ -13,15 +13,15 @@ public ContentResult ShouldReturnContent(string content = null, string contentTy
             if (contentType != null && contentType != contentResult.ContentType)
             {
                 throw new ActionResultAssertionException(string.Format(
-                    "Expected content type to be \"{0}\", but instead was \"{1}\".",
+                    "Expected content type to be '{0}', but instead was '{1}'.",
                     contentType,
                     contentResult.ContentType));
             }
 
             if (content != null && content != contentResult.Content)
             {
                 throw new ActionResultAssertionException(string.Format(
-                    "Expected content to be \"{0}\", but instead was \"{1}\".",
+                    "Expected content to be '{0}', but instead was '{1}'.",
                     content,
                     contentResult.Content));
             }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public void Check_for_file_content_result_and_check_invalid_textual_contents()`
`104`	`104`	`var exception = Assert.Throws<ActionResultAssertionException>(() =>`
`105`	`105`	`_controller.WithCallTo(c => c.TextualFile()).ShouldRenderFileContents(contents));`
`106`	`106`
`107`		`- Assert.That(exception.Message, Is.EqualTo(string.Format("Expected file contents to be \"{0}\", but instead was \"{1}\".", contents, ControllerResultTestController.TextualFileContent)));`
	`107`	`+ Assert.That(exception.Message, Is.EqualTo(string.Format("Expected file contents to be '{0}', but instead was '{1}'.", contents, ControllerResultTestController.TextualFileContent)));`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`[Test]`
`@@ -309,7 +309,7 @@ public void Check_for_file_stream_result_and_check_invalid_textual_content()`
`309`	`309`	`var exception = Assert.Throws<ActionResultAssertionException>(() =>`
`310`	`310`	`_controller.WithCallTo(c => c.TextualStream()).ShouldRenderFileStream(contents));`
`311`	`311`
`312`		`- Assert.That(exception.Message, Is.EqualTo(string.Format("Expected file contents to be \"{0}\", but instead was \"{1}\".", contents, ControllerResultTestController.TextualFileContent)));`
	`312`	`+ Assert.That(exception.Message, Is.EqualTo(string.Format("Expected file contents to be '{0}', but instead was '{1}'.", contents, ControllerResultTestController.TextualFileContent)));`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void Check_for_content_result_and_check_invalid_content()`
`26`	`26`
`27`	`27`	`var exception = Assert.Throws<ActionResultAssertionException>(() => _controller.WithCallTo(c => c.Content()).ShouldReturnContent(content));`
`28`	`28`
`29`		`- Assert.That(exception.Message, Is.EqualTo(string.Format("Expected content to be \"{0}\", but instead was \"{1}\".", content, ControllerResultTestController.TextualContent)));`
	`29`	`+ Assert.That(exception.Message, Is.EqualTo(string.Format("Expected content to be '{0}', but instead was '{1}'.", content, ControllerResultTestController.TextualContent)));`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`[Test]`
`@@ -42,7 +42,7 @@ public void Check_for_content_result_and_check_content_and_check_invalid_content`
`42`	`42`
`43`	`43`	`var exception = Assert.Throws<ActionResultAssertionException>(() => _controller.WithCallTo(c => c.Content()).ShouldReturnContent(ControllerResultTestController.TextualContent, contentType));`
`44`	`44`
`45`		`- Assert.That(exception.Message, Is.EqualTo(string.Format("Expected content type to be \"{0}\", but instead was \"{1}\".", contentType, ControllerResultTestController.ContentType)));`
	`45`	`+ Assert.That(exception.Message, Is.EqualTo(string.Format("Expected content type to be '{0}', but instead was '{1}'.", contentType, ControllerResultTestController.ContentType)));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public FileContentResult ShouldRenderFileContents(string contents, string conten`
`69`	`69`	`if (contents != reconstitutedText)`
`70`	`70`	`{`
`71`	`71`	`throw new ActionResultAssertionException(string.Format(`
`72`		`- "Expected file contents to be \"{0}\", but instead was \"{1}\".",`
	`72`	`+ "Expected file contents to be '{0}', but instead was '{1}'.",`
`73`	`73`	`contents,`
`74`	`74`	`reconstitutedText));`
`75`	`75`	`}`
`@@ -121,7 +121,7 @@ public FileStreamResult ShouldRenderFileStream(string contents, string contentTy`
`121`	`121`	`if (contents != reconstitutedText)`
`122`	`122`	`{`
`123`	`123`	`throw new ActionResultAssertionException(string.Format(`
`124`		`- "Expected file contents to be \"{0}\", but instead was \"{1}\".",`
	`124`	`+ "Expected file contents to be '{0}', but instead was '{1}'.",`
`125`	`125`	`contents,`
`126`	`126`	`reconstitutedText));`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,15 @@ public ContentResult ShouldReturnContent(string content = null, string contentTy`
`13`	`13`	`if (contentType != null && contentType != contentResult.ContentType)`
`14`	`14`	`{`
`15`	`15`	`throw new ActionResultAssertionException(string.Format(`
`16`		`- "Expected content type to be \"{0}\", but instead was \"{1}\".",`
	`16`	`+ "Expected content type to be '{0}', but instead was '{1}'.",`
`17`	`17`	`contentType,`
`18`	`18`	`contentResult.ContentType));`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`if (content != null && content != contentResult.Content)`
`22`	`22`	`{`
`23`	`23`	`throw new ActionResultAssertionException(string.Format(`
`24`		`- "Expected content to be \"{0}\", but instead was \"{1}\".",`
	`24`	`+ "Expected content to be '{0}', but instead was '{1}'.",`
`25`	`25`	`content,`
`26`	`26`	`contentResult.Content));`
`27`	`27`	`}`