Skip to content

Commit 15a18e8

Browse files
faddivfaddiv
committed
Fix ForbidResultAssertions Tests. Test DateTimeOffset? with ==
1 parent 2fa8b17 commit 15a18e8

File tree

5 files changed

+90
-103
lines changed

5 files changed

+90
-103
lines changed

‎src/FluentAssertions.AspNetCore.Mvc/ForbidResultAssertions.cs

Lines changed: 18 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public ForbidResultAssertions(object subject) : base(subject)
4141

4242
#region Private Properties
4343

44-
private ForbidResult ForbidResultSubject => (ForbidResult) Subject;
44+
private ForbidResult ForbidResultSubject => (ForbidResult)Subject;
4545

4646
#endregion
4747

@@ -65,7 +65,8 @@ public ForbidResultAssertions WithAuthenticationProperties(AuthenticationPropert
6565
Execute.Assertion
6666
.ForCondition(actualAuthenticationProperties == expectedAuthenticationProperties)
6767
.BecauseOf(reason, reasonArgs)
68-
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ForbidResult.AuthenticationProperties", expectedAuthenticationProperties, actualAuthenticationProperties));
68+
.WithDefaultIdentifier("ForbidResult.AuthenticationProperties")
69+
.FailWith(FailureMessages.CommonFailMessage, expectedAuthenticationProperties, actualAuthenticationProperties);
6970

7071
return this;
7172
}
@@ -88,7 +89,8 @@ public ForbidResultAssertions WithIsPersistent(bool expectedIsPersistent, string
8889
Execute.Assertion
8990
.ForCondition(actualIsPersistent == expectedIsPersistent)
9091
.BecauseOf(reason, reasonArgs)
91-
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ForbidResult.AuthenticationProperties.IsPersistent", expectedIsPersistent, actualIsPersistent));
92+
.WithDefaultIdentifier("ForbidResult.AuthenticationProperties.IsPersistent")
93+
.FailWith(FailureMessages.CommonFailMessage, expectedIsPersistent, actualIsPersistent);
9294

9395
return this;
9496
}
@@ -111,7 +113,8 @@ public ForbidResultAssertions WithRedirectUri(string expectedRedirectUri, string
111113
Execute.Assertion
112114
.ForCondition(string.Equals(actualRedirectUri, expectedRedirectUri))
113115
.BecauseOf(reason, reasonArgs)
114-
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ForbidResult.AuthenticationProperties.RedirectUri", expectedRedirectUri, actualRedirectUri));
116+
.WithDefaultIdentifier("ForbidResult.AuthenticationProperties.RedirectUri")
117+
.FailWith(FailureMessages.CommonFailMessage, expectedRedirectUri, actualRedirectUri);
115118

116119
return this;
117120
}
@@ -131,41 +134,13 @@ public ForbidResultAssertions WithIssuedUtc(DateTimeOffset? expectedIssuedUtc, s
131134
{
132135
var actualResult = IssuedUtc;
133136

134-
var expectedIssuedUtcAsString = expectedIssuedUtc?.ToString("r", (IFormatProvider) CultureInfo.InvariantCulture);
135-
136-
var expectedResult = DateTimeOffset.TryParseExact(expectedIssuedUtcAsString, "r", (IFormatProvider)CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var result)
137-
? new DateTimeOffset?(result)
138-
: new DateTimeOffset?();
139-
140-
if (actualResult == null && expectedResult == null)
141-
{
142-
return this;
143-
}
144-
145-
if (actualResult == null)
146-
{
147-
Execute.Assertion
148-
.ForCondition(false)
149-
.BecauseOf(reason, reasonArgs)
150-
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ForbidResult.AuthenticationProperties.IssuedUtc", expectedResult, null));
151-
152-
return this;
153-
}
154-
155-
if (expectedResult == null)
156-
{
157-
Execute.Assertion
158-
.ForCondition(false)
159-
.BecauseOf(reason, reasonArgs)
160-
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ForbidResult.AuthenticationProperties.IssuedUtc", null, actualResult));
161-
162-
return this;
163-
}
137+
var expectedResult = AssertionHelpers.RoundToSeconds(expectedIssuedUtc);
164138

165139
Execute.Assertion
166-
.ForCondition(DateTimeOffset.Compare(expectedResult.Value, actualResult.Value) == 0)
140+
.ForCondition(expectedResult == actualResult)
167141
.BecauseOf(reason, reasonArgs)
168-
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ForbidResult.AuthenticationProperties.IssuedUtc", expectedResult.Value, actualResult.Value));
142+
.WithDefaultIdentifier("ForbidResult.AuthenticationProperties.IssuedUtc")
143+
.FailWith(FailureMessages.CommonFailMessage, expectedResult, actualResult);
169144

170145
return this;
171146
}
@@ -185,41 +160,13 @@ public ForbidResultAssertions WithExpiresUtc(DateTimeOffset? expectedExpiresUtc,
185160
{
186161
var actualResult = ExpiresUtc;
187162

188-
var expectedExpiresUtcAsString = expectedExpiresUtc?.ToString("r", (IFormatProvider)CultureInfo.InvariantCulture);
189-
190-
var expectedResult = DateTimeOffset.TryParseExact(expectedExpiresUtcAsString, "r", (IFormatProvider)CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var result)
191-
? new DateTimeOffset?(result)
192-
: new DateTimeOffset?();
193-
194-
if (actualResult == null && expectedResult == null)
195-
{
196-
return this;
197-
}
198-
199-
if (actualResult == null)
200-
{
201-
Execute.Assertion
202-
.ForCondition(false)
203-
.BecauseOf(reason, reasonArgs)
204-
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ForbidResult.AuthenticationProperties.ExpiresUtc", expectedResult, null));
205-
206-
return this;
207-
}
208-
209-
if (expectedResult == null)
210-
{
211-
Execute.Assertion
212-
.ForCondition(false)
213-
.BecauseOf(reason, reasonArgs)
214-
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ForbidResult.AuthenticationProperties.ExpiresUtc", null, actualResult));
215-
216-
return this;
217-
}
218-
163+
var expectedResult = AssertionHelpers.RoundToSeconds(expectedExpiresUtc);
164+
219165
Execute.Assertion
220-
.ForCondition(DateTimeOffset.Compare(expectedResult.Value, actualResult.Value) == 0)
166+
.ForCondition(expectedResult == actualResult)
221167
.BecauseOf(reason, reasonArgs)
222-
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ForbidResult.AuthenticationProperties.ExpiresUtc", expectedResult.Value, actualResult.Value));
168+
.WithDefaultIdentifier("ForbidResult.AuthenticationProperties.ExpiresUtc")
169+
.FailWith(FailureMessages.CommonFailMessage, expectedResult, actualResult);
223170

224171
return this;
225172
}
@@ -243,7 +190,8 @@ public ForbidResultAssertions WithAllowRefresh(bool? expectedAllowRefresh, strin
243190
Execute.Assertion
244191
.ForCondition(actualAllowRefresh == expectedAllowRefresh)
245192
.BecauseOf(reason, reasonArgs)
246-
.FailWith(string.Format(FailureMessages.CommonFailMessage, "ForbidResult.AuthenticationProperties.AllowRefresh", expectedAllowRefresh, actualAllowRefresh));
193+
.WithDefaultIdentifier("ForbidResult.AuthenticationProperties.AllowRefresh")
194+
.FailWith(FailureMessages.CommonFailMessage, expectedAllowRefresh, actualAllowRefresh);
247195

248196
return this;
249197
}

‎src/FluentAssertions.AspNetCore.Mvc/SignInResultAssertions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public SignInResultAssertions WithIssuedUtc(DateTimeOffset? expectedIssuedUtc, s
139139
var expectedResult = AssertionHelpers.RoundToSeconds(expectedIssuedUtc);
140140

141141
Execute.Assertion
142-
.ForCondition(EqualityComparer<DateTimeOffset?>.Default.Equals(expectedResult, actualResult))
142+
.ForCondition(expectedResult == actualResult)
143143
.BecauseOf(reason, reasonArgs)
144144
.WithDefaultIdentifier("SignInResult.AuthenticationProperties.IssuedUtc")
145145
.FailWith(FailureMessages.CommonFailMessage, expectedResult, actualResult);
@@ -165,7 +165,7 @@ public SignInResultAssertions WithExpiresUtc(DateTimeOffset? expectedExpiresUtc,
165165
var expectedResult = AssertionHelpers.RoundToSeconds(expectedExpiresUtc);
166166

167167
Execute.Assertion
168-
.ForCondition(EqualityComparer<DateTimeOffset?>.Default.Equals(expectedResult, actualResult))
168+
.ForCondition(expectedResult == actualResult)
169169
.BecauseOf(reason, reasonArgs)
170170
.WithDefaultIdentifier("SignInResult.AuthenticationProperties.ExpiresUtc")
171171
.FailWith(FailureMessages.CommonFailMessage, expectedResult, actualResult);

‎src/FluentAssertions.AspNetCore.Mvc/SignOutResultAssertions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public SignOutResultAssertions WithIssuedUtc(DateTimeOffset? expectedIssuedUtc,
136136
DateTimeOffset? expectedResult = AssertionHelpers.RoundToSeconds(expectedIssuedUtc);
137137

138138
Execute.Assertion
139-
.ForCondition(EqualityComparer<DateTimeOffset?>.Default.Equals(expectedResult, actualResult))
139+
.ForCondition(expectedResult == actualResult)
140140
.BecauseOf(reason, reasonArgs)
141141
.WithDefaultIdentifier("SignOutResult.AuthenticationProperties.IssuedUtc")
142142
.FailWith(FailureMessages.CommonFailMessage, expectedResult, actualResult);
@@ -162,7 +162,7 @@ public SignOutResultAssertions WithExpiresUtc(DateTimeOffset? expectedExpiresUtc
162162
DateTimeOffset? expectedResult = AssertionHelpers.RoundToSeconds(expectedExpiresUtc);
163163

164164
Execute.Assertion
165-
.ForCondition(EqualityComparer<DateTimeOffset?>.Default.Equals(expectedResult, actualResult))
165+
.ForCondition(expectedResult == actualResult)
166166
.BecauseOf(reason, reasonArgs)
167167
.WithDefaultIdentifier("SignOutResult.AuthenticationProperties.ExpiresUtc")
168168
.FailWith(FailureMessages.CommonFailMessage, expectedResult, actualResult);

‎src/FluentAssertions.AspNetCore.Mvc/VirtualFileResultAssertions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public VirtualFileResultAssertions WithLastModified(DateTimeOffset? expectedLast
132132
var actualLastModified = LastModified;
133133

134134
Execute.Assertion
135-
.ForCondition(EqualityComparer<DateTimeOffset?>.Default.Equals(actualLastModified, expectedLastModified))
135+
.ForCondition(actualLastModified == expectedLastModified)
136136
.BecauseOf(reason, reasonArgs)
137137
.WithDefaultIdentifier("VirtualFileResult.LastModified")
138138
.FailWith(FailureMessages.CommonFailMessage, expectedLastModified, actualLastModified);

0 commit comments

Comments
 (0)