Skip to content

Commit f153d69

Browse files
kevinkuszykkevinkuszyk
authored
Merge pull request #39 from rikrak/RemoveCompilerRedirects
Removed compiler directives for .NET Core
2 parents 2419a7f + fdca613 commit f153d69

23 files changed

+47
-269
lines changed

‎src/FluentAssertions.Mvc.Shared/ActionResultAssertions.cs

-12
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
using FluentAssertions.Primitives;
22
using FluentAssertions.Execution;
3-
using System;
4-
#if NETSTANDARD1_6
5-
using Microsoft.AspNetCore.Mvc;
6-
#else
73
using System.Web.Mvc;
8-
#endif
94
using System.Diagnostics;
105

116
namespace FluentAssertions.Mvc
@@ -35,13 +30,6 @@ public ActionResultAssertions (ActionResult subject) : base(subject)
3530
Subject = subject;
3631
}
3732

38-
#if NETSTANDARD1_6
39-
public ActionResultAssertions (IActionResult subject): base(subject)
40-
{
41-
Subject = subject;
42-
}
43-
#endif
44-
4533
/// <summary>
4634
/// Asserts that the subject is a <see cref="ContentResult"/>.
4735
/// </summary>

‎src/FluentAssertions.Mvc.Shared/AssertionsExtensions.cs

-19
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
using FluentAssertions;
2-
using System;
3-
#if NETSTANDARD1_6
4-
using Microsoft.AspNetCore.Mvc;
5-
using Microsoft.AspNetCore.Routing;
6-
#else
71
using System.Web.Mvc;
82
using System.Web.Routing;
9-
#endif
10-
using FluentAssertions.Mvc;
113
using System.Diagnostics;
124

135
namespace FluentAssertions.Mvc
@@ -27,17 +19,6 @@ public static ActionResultAssertions Should (this ActionResult actual)
2719
return new ActionResultAssertions (actual);
2820
}
2921

30-
#if NETSTANDARD1_6
31-
/// <summary>
32-
/// Returns an <see cref="ActionResultAssertions"/> object that can be used to assert the
33-
/// current <see cref="IActionResult"/>.
34-
/// </summary>
35-
public static ActionResultAssertions Should (this IActionResult actual)
36-
{
37-
return new ActionResultAssertions (actual);
38-
}
39-
#endif
40-
4122
/// <summary>
4223
/// Returns an <see cref="RouteDataAssertions"/> object that can be used to assert the
4324
/// current <see cref="RouteData"/>.

‎src/FluentAssertions.Mvc.Shared/ContentResultAssertions.cs

+6-23
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
using FluentAssertions.Execution;
22
using FluentAssertions.Primitives;
33
using System;
4-
using System.Collections.Generic;
5-
using System.Linq;
64
using System.Text;
7-
#if NETSTANDARD1_6
8-
using Microsoft.AspNetCore.Mvc;
9-
#else
105
using System.Web.Mvc;
11-
#endif
126

137
namespace FluentAssertions.Mvc
148
{
@@ -40,13 +34,9 @@ public ContentResultAssertions WithContent(string expectedContent, string reason
4034
string actualContent = (Subject as ContentResult).Content;
4135

4236
Execute.Assertion
43-
#if NETSTANDARD1_6
44-
.ForCondition(string.Equals(actualContent, expectedContent, StringComparison.OrdinalIgnoreCase))
45-
#else
46-
.ForCondition(string.Equals(actualContent, expectedContent, StringComparison.InvariantCultureIgnoreCase))
47-
#endif
48-
.BecauseOf(reason, reasonArgs)
49-
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.Content", expectedContent, actualContent));
37+
.ForCondition(string.Equals(actualContent, expectedContent, StringComparison.InvariantCultureIgnoreCase))
38+
.BecauseOf(reason, reasonArgs)
39+
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.Content", expectedContent, actualContent));
5040

5141
return this;
5242
}
@@ -67,19 +57,13 @@ public ContentResultAssertions WithContentType(string expectedContentType, strin
6757
string actualContentType = (Subject as ContentResult).ContentType;
6858

6959
Execute.Assertion
70-
#if NETSTANDARD1_6
71-
.ForCondition(string.Equals(expectedContentType, actualContentType, StringComparison.OrdinalIgnoreCase))
72-
#else
73-
.ForCondition(string.Equals(expectedContentType, actualContentType, StringComparison.InvariantCultureIgnoreCase))
74-
#endif
75-
.BecauseOf(reason, reasonArgs)
76-
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.ContentType", expectedContentType, actualContentType));
60+
.ForCondition(string.Equals(expectedContentType, actualContentType, StringComparison.InvariantCultureIgnoreCase))
61+
.BecauseOf(reason, reasonArgs)
62+
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ContentResult.ContentType", expectedContentType, actualContentType));
7763

7864
return this;
7965
}
8066

81-
// ContentEncoding seems to have vanished from .NetCore... weird.
82-
#if !NETSTANDARD1_6
8367
/// <summary>
8468
/// Asserts that the content encoding is the expected content encoding type.
8569
/// </summary>
@@ -102,6 +86,5 @@ public ContentResultAssertions WithContentEncoding(Encoding expectedEncoding, st
10286

10387
return this;
10488
}
105-
#endif
10689
}
10790
}

‎src/FluentAssertions.Mvc.Shared/FailureMessages.Designer.cs

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/FluentAssertions.Mvc.Shared/Fakes/FakeHttpContext.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if !NETSTANDARD1_6
2-
using System;
1+
using System;
32
using System.Web;
43

54
namespace FluentAssertions.Mvc.Fakes
@@ -138,4 +137,3 @@ public override void EndOfRequest()
138137

139138

140139
}
141-
#endif

‎src/FluentAssertions.Mvc.Shared/Fakes/FakeHttpRequest.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if !NETSTANDARD1_6
2-
using System.Web;
1+
using System.Web;
32
using System.Collections.Specialized;
43

54
namespace FluentAssertions.Mvc.Fakes
@@ -71,4 +70,3 @@ public override NameValueCollection ServerVariables
7170
}
7271
}
7372
}
74-
#endif

‎src/FluentAssertions.Mvc.Shared/Fakes/FakeHttpResponse.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if !NETSTANDARD1_6
2-
using System.Web;
1+
using System.Web;
32

43
namespace FluentAssertions.Mvc.Fakes
54
{
@@ -15,4 +14,3 @@ public override string ApplyAppPathModifier(string virtualPath)
1514
}
1615
}
1716
}
18-
#endif

‎src/FluentAssertions.Mvc.Shared/PartialViewResultAssertions.cs

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
#if !NETSTANDARD1_6
2-
using System;
3-
using System.Collections.Generic;
4-
using System.Linq;
5-
using System.Text;
6-
using System.Web.Mvc;
1+
using System.Web.Mvc;
72
using System.Diagnostics;
8-
using FluentAssertions.Primitives;
93

104
namespace FluentAssertions.Mvc
115
{
@@ -22,4 +16,3 @@ public class PartialViewResultAssertions : ViewResultBaseAssertions<PartialViewR
2216
public PartialViewResultAssertions(PartialViewResult viewResult) : base(viewResult) { }
2317
}
2418
}
25-
#endif

‎src/FluentAssertions.Mvc.Shared/RedirectResultAssertions.cs

+6-17
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
#if NETSTANDARD1_6
6-
using Microsoft.AspNetCore.Mvc;
7-
#else
82
using System.Web.Mvc;
9-
#endif
103
using FluentAssertions.Execution;
114
using FluentAssertions.Primitives;
125

@@ -38,13 +31,9 @@ public RedirectResultAssertions WithUrl(string expectedUrl, string reason = "",
3831
string actualUrl = (Subject as RedirectResult).Url;
3932

4033
Execute.Assertion
41-
#if NETSTANDARD1_6
42-
.ForCondition(string.Equals(actualUrl, expectedUrl, StringComparison.OrdinalIgnoreCase))
43-
#else
44-
.ForCondition(string.Equals(actualUrl, expectedUrl, StringComparison.InvariantCultureIgnoreCase))
45-
#endif
46-
.BecauseOf(reason, reasonArgs)
47-
.FailWith("Expected RedirectResult.Url to be {0}{reason} but was {1}", expectedUrl, actualUrl);
34+
.ForCondition(string.Equals(actualUrl, expectedUrl, StringComparison.InvariantCultureIgnoreCase))
35+
.BecauseOf(reason, reasonArgs)
36+
.FailWith("Expected RedirectResult.Url to be {0}{reason} but was {1}", expectedUrl, actualUrl);
4837

4938
return this;
5039
}
@@ -65,9 +54,9 @@ public RedirectResultAssertions WithPermanent(bool expectedPermanent, string rea
6554
bool actualPermanent = (Subject as RedirectResult).Permanent;
6655

6756
Execute.Assertion
68-
.ForCondition(expectedPermanent == actualPermanent)
69-
.BecauseOf(reason, reasonArgs)
70-
.FailWith("Expected RedirectResult.Permanent to be {0}{reason} but was {1}", expectedPermanent, actualPermanent);
57+
.ForCondition(expectedPermanent == actualPermanent)
58+
.BecauseOf(reason, reasonArgs)
59+
.FailWith("Expected RedirectResult.Permanent to be {0}{reason} but was {1}", expectedPermanent, actualPermanent);
7160

7261
return this;
7362
}

‎src/FluentAssertions.Mvc.Shared/RedirectToRouteAssertions.cs

+6-17
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
53
using FluentAssertions.Execution;
64
using FluentAssertions.Primitives;
7-
#if NETSTANDARD1_6
8-
using Microsoft.AspNetCore.Mvc;
9-
#else
105
using System.Web.Mvc;
11-
#endif
12-
using FluentAssertions;
136

147
namespace FluentAssertions.Mvc
158
{
@@ -40,9 +33,9 @@ public RedirectToRouteAssertions(RedirectToRouteResult subject)
4033
public RedirectToRouteAssertions WithPermanent(bool expectedPermanent, string reason = "", params object[] reasonArgs)
4134
{
4235
Execute.Assertion
43-
.BecauseOf(reason, reasonArgs)
44-
.ForCondition(expectedPermanent == Subject.Permanent)
45-
.FailWith("Expected RedirectToRoute.Permanent to be {0}{reason}, but found {1}", expectedPermanent, Subject.Permanent);
36+
.BecauseOf(reason, reasonArgs)
37+
.ForCondition(expectedPermanent == Subject.Permanent)
38+
.FailWith("Expected RedirectToRoute.Permanent to be {0}{reason}, but found {1}", expectedPermanent, Subject.Permanent);
4639
return this;
4740
}
4841

@@ -60,13 +53,9 @@ public RedirectToRouteAssertions WithPermanent(bool expectedPermanent, string re
6053
public RedirectToRouteAssertions WithRouteName(string expectedRouteName, string reason = "", params object[] reasonArgs)
6154
{
6255
Execute.Assertion
63-
.BecauseOf(reason, reasonArgs)
64-
#if NETSTANDARD1_6
65-
.ForCondition(string.Equals(expectedRouteName, Subject.RouteName, StringComparison.OrdinalIgnoreCase))
66-
#else
67-
.ForCondition(string.Equals(expectedRouteName, Subject.RouteName, StringComparison.InvariantCultureIgnoreCase))
68-
#endif
69-
.FailWith("Expected RedirectToRoute.RouteName to be {0}{reason}, but found {1}", expectedRouteName, Subject.RouteName);
56+
.BecauseOf(reason, reasonArgs)
57+
.ForCondition(string.Equals(expectedRouteName, Subject.RouteName, StringComparison.InvariantCultureIgnoreCase))
58+
.FailWith("Expected RedirectToRoute.RouteName to be {0}{reason}, but found {1}", expectedRouteName, Subject.RouteName);
7059

7160
return this;
7261
}

‎src/FluentAssertions.Mvc.Shared/RouteCollection_Extensions.cs

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
#if !NETSTANDARD1_6
2-
using System;
3-
using System.Collections.Generic;
4-
using System.Linq;
5-
using System.Text;
6-
using System.Web.Routing;
1+
using System.Web.Routing;
72
using FluentAssertions.Mvc.Fakes;
83
using System.Diagnostics;
94

@@ -29,4 +24,3 @@ public static RouteData GetRouteDataForUrl(this RouteCollection routes, string u
2924
}
3025
}
3126
}
32-
#endif

‎src/FluentAssertions.Mvc.Shared/RouteDataAssertions.cs

+13-22
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
#if NETSTANDARD1_6
6-
using Microsoft.AspNetCore.Routing;
7-
#else
8-
using System.Web.Routing;
9-
#endif
10-
using FluentAssertions;
1+
using System.Web.Routing;
112
using FluentAssertions.Execution;
123
using FluentAssertions.Primitives;
134
using System.Diagnostics;
@@ -80,16 +71,16 @@ public RouteDataAssertions HaveDataToken(string key, object expectedValue, strin
8071
var subjectTyped = Subject as RouteData;
8172

8273
Execute.Assertion
83-
.ForCondition(subjectTyped.DataTokens.ContainsKey(key))
84-
.BecauseOf(reason, reasonArgs)
85-
.FailWith(FailureMessages.RouteData_DataTokens_ContainsKey, key);
74+
.ForCondition(subjectTyped.DataTokens.ContainsKey(key))
75+
.BecauseOf(reason, reasonArgs)
76+
.FailWith(FailureMessages.RouteData_DataTokens_ContainsKey, key);
8677

8778
var actualValue = subjectTyped.DataTokens[key];
8879

8980
Execute.Assertion
90-
.ForCondition(expectedValue.Equals(actualValue))
91-
.BecauseOf(reason, reasonArgs)
92-
.FailWith(FailureMessages.RouteData_DataTokens_HaveValue, key, expectedValue, actualValue);
81+
.ForCondition(expectedValue.Equals(actualValue))
82+
.BecauseOf(reason, reasonArgs)
83+
.FailWith(FailureMessages.RouteData_DataTokens_HaveValue, key, expectedValue, actualValue);
9384

9485
return this;
9586
}
@@ -111,16 +102,16 @@ public RouteDataAssertions HaveValue(string key, object expectedValue, string re
111102
var subjectTyped = Subject as RouteData;
112103

113104
Execute.Assertion
114-
.ForCondition(subjectTyped.Values.ContainsKey(key))
115-
.BecauseOf(reason, reasonArgs)
116-
.FailWith(FailureMessages.RouteData_Values_ContainsKey, key);
105+
.ForCondition(subjectTyped.Values.ContainsKey(key))
106+
.BecauseOf(reason, reasonArgs)
107+
.FailWith(FailureMessages.RouteData_Values_ContainsKey, key);
117108

118109
var actualValue = subjectTyped.Values[key];
119110

120111
Execute.Assertion
121-
.ForCondition(expectedValue.Equals(actualValue))
122-
.BecauseOf(reason, reasonArgs)
123-
.FailWith(FailureMessages.RouteData_Values_HaveValue, key, expectedValue, actualValue);
112+
.ForCondition(expectedValue.Equals(actualValue))
113+
.BecauseOf(reason, reasonArgs)
114+
.FailWith(FailureMessages.RouteData_Values_HaveValue, key, expectedValue, actualValue);
124115

125116
return this;
126117
}

‎src/FluentAssertions.Mvc.Shared/RouteValueDictionary_Extensions.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if !NETSTANDARD1_6
2-
using System.Web.Mvc;
1+
using System.Web.Mvc;
32
using System.Web.Routing;
43
using FluentAssertions.Mvc.Fakes;
54

@@ -25,4 +24,3 @@ public static string GenerateUrl(this RouteValueDictionary routeValues, RouteCol
2524
}
2625
}
2726
}
28-
#endif

‎src/FluentAssertions.Mvc.Shared/ViewResultAssertions.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if !NETSTANDARD1_6
21
using FluentAssertions.Execution;
32
using System;
43
using System.Web.Mvc;
@@ -40,4 +39,3 @@ public ViewResultAssertions WithMasterName(string expectedMasterName, string rea
4039
}
4140
}
4241
}
43-
#endif

‎src/FluentAssertions.Mvc.Shared/ViewResultBaseAssertions.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
#if !NETSTANDARD1_6
2-
using System;
3-
using System.Collections.Generic;
4-
using System.Linq;
5-
using System.Text;
1+
using System;
62
using FluentAssertions.Execution;
73
using FluentAssertions.Primitives;
84
using System.Web.Mvc;
@@ -159,4 +155,3 @@ public ViewResultBaseAssertions<T> WithDefaultViewName(string reason = "", param
159155
}
160156
}
161157
}
162-
#endif

0 commit comments

Comments
 (0)