Skip to content

Commit aaeaeec

Browse files
committed
Minor tweaks.
1 parent 6eeb03c commit aaeaeec

File tree

4 files changed

+30
-33
lines changed

4 files changed

+30
-33
lines changed

TestStack.FluentMVCTesting.Tests/ControllerResultTestTests/ShouldGiveHttpStatusTests.cs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Net;
2-
using System.Web.Mvc;
32
using NUnit.Framework;
43
using TestStack.FluentMVCTesting.Tests.TestControllers;
54

@@ -31,31 +30,31 @@ public void Check_for_invalid_http_status()
3130
[Test]
3231
public void Return_the_http_status_result()
3332
{
34-
HttpStatusCodeResult expected = _controller.StatusCode();
35-
HttpStatusCodeResult actual = _controller.WithCallTo(c => c.StatusCode())
33+
var expected = _controller.StatusCode();
34+
var actual = _controller.WithCallTo(c => c.StatusCode())
3635
.ShouldGiveHttpStatus();
37-
Assert.AreEqual(expected.StatusCode, actual.StatusCode);
38-
Assert.AreEqual(expected.StatusDescription, actual.StatusDescription);
36+
Assert.That(actual.StatusCode,Is.EqualTo(expected.StatusCode));
37+
Assert.That(actual.StatusDescription, Is.EqualTo(expected.StatusDescription));
3938
}
4039

4140
[Test]
42-
public void Reeturn_the_http_status_result_when_the_assertion_against_integer_is_true()
41+
public void Return_the_http_status_result_when_the_assertion_against_integer_is_true()
4342
{
44-
HttpStatusCodeResult expected = _controller.StatusCode();
45-
HttpStatusCodeResult actual = _controller.WithCallTo(c => c.StatusCode())
43+
var expected = _controller.StatusCode();
44+
var actual = _controller.WithCallTo(c => c.StatusCode())
4645
.ShouldGiveHttpStatus(ControllerResultTestController.Code);
47-
Assert.AreEqual(expected.StatusCode, actual.StatusCode);
48-
Assert.AreEqual(expected.StatusDescription, actual.StatusDescription);
46+
Assert.That(actual.StatusCode, Is.EqualTo(expected.StatusCode));
47+
Assert.That(actual.StatusDescription, Is.EqualTo(expected.StatusDescription));
4948
}
5049

5150
[Test]
52-
public void Reeturn_the_http_status_result_when_the_assertion_against_status_code_enum_is_true()
51+
public void Return_the_http_status_result_when_the_assertion_against_status_code_enum_is_true()
5352
{
54-
HttpStatusCodeResult expected = _controller.StatusCode();
55-
HttpStatusCodeResult actual = _controller.WithCallTo(c => c.StatusCode())
53+
var expected = _controller.StatusCode();
54+
var actual = _controller.WithCallTo(c => c.StatusCode())
5655
.ShouldGiveHttpStatus((HttpStatusCode) ControllerResultTestController.Code);
57-
Assert.AreEqual(expected.StatusCode, actual.StatusCode);
58-
Assert.AreEqual(expected.StatusDescription, actual.StatusDescription);
56+
Assert.That(actual.StatusCode, Is.EqualTo(expected.StatusCode));
57+
Assert.That(actual.StatusDescription, Is.EqualTo(expected.StatusDescription));
5958
}
6059
}
6160
}

TestStack.FluentMVCTesting.Tests/ControllerResultTestTests/ShouldReturnContentTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ public void Emit_readable_error_message_when_the_actual_content_encoding_has_not
8585
[Test]
8686
public void Return_the_content_result()
8787
{
88-
ContentResult expected = (ContentResult)_controller.Content();
89-
ContentResult actual = _controller.WithCallTo(c => c.Content())
88+
var expected = (ContentResult)_controller.Content();
89+
var actual = _controller.WithCallTo(c => c.Content())
9090
.ShouldReturnContent(ControllerResultTestController.TextualContent);
91-
Assert.AreEqual(expected.Content, actual.Content);
92-
Assert.AreEqual(expected.ContentType, actual.ContentType);
93-
Assert.AreEqual(expected.ContentEncoding, actual.ContentEncoding);
91+
Assert.That(actual.Content,Is.EqualTo(expected.Content));
92+
Assert.That(actual.ContentType, Is.EqualTo(expected.ContentType));
93+
Assert.That(actual.ContentEncoding, Is.EqualTo(expected.ContentEncoding));
9494
}
9595
}
9696
}

TestStack.FluentMVCTesting.Tests/ControllerResultTestTests/ShouldReturnEmptyResultTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System.Web.Mvc;
2-
using NUnit.Framework;
1+
using NUnit.Framework;
32

43
namespace TestStack.FluentMVCTesting.Tests
54
{
@@ -14,7 +13,7 @@ public void Check_for_empty_result()
1413
[Test]
1514
public void Return_the_empty_result()
1615
{
17-
EmptyResult actual = _controller.WithCallTo(c => c.EmptyResult())
16+
var actual = _controller.WithCallTo(c => c.EmptyResult())
1817
.ShouldReturnEmptyResult();
1918
Assert.NotNull(actual);
2019
}
Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System.Web.Mvc;
2-
using NUnit.Framework;
1+
using NUnit.Framework;
32
using TestStack.FluentMVCTesting.Tests.TestControllers;
43

54
namespace TestStack.FluentMVCTesting.Tests
@@ -16,20 +15,20 @@ public void Allow_the_object_that_is_returned_to_be_checked()
1615
[Test]
1716
public void Return_the_json_result()
1817
{
19-
JsonResult expected = _controller.Json();
20-
JsonResult actual = _controller.WithCallTo(c => c.Json()).ShouldReturnJson();
21-
Assert.AreEqual(expected.Data, actual.Data);
22-
Assert.AreEqual(expected.JsonRequestBehavior, actual.JsonRequestBehavior);
18+
var expected = _controller.Json();
19+
var actual = _controller.WithCallTo(c => c.Json()).ShouldReturnJson();
20+
Assert.That(actual.Data, Is.EqualTo(expected.Data));
21+
Assert.That(actual.JsonRequestBehavior, Is.EqualTo(expected.JsonRequestBehavior));
2322
}
2423

2524
[Test]
2625
public void Return_the_json_result_when_the_assertion_is_true()
2726
{
28-
JsonResult expected = _controller.Json();
29-
JsonResult actual =_controller.WithCallTo(c => c.Json())
27+
var expected = _controller.Json();
28+
var actual =_controller.WithCallTo(c => c.Json())
3029
.ShouldReturnJson(d => Assert.That(d, Is.EqualTo(ControllerResultTestController.JsonValue)));
31-
Assert.AreEqual(expected.Data, actual.Data);
32-
Assert.AreEqual(expected.JsonRequestBehavior, actual.JsonRequestBehavior);
30+
Assert.That(actual.Data, Is.EqualTo(expected.Data));
31+
Assert.That(actual.JsonRequestBehavior, Is.EqualTo(expected.JsonRequestBehavior));
3332
}
3433
}
3534
}

0 commit comments

Comments
 (0)