Skip to content

Commit d3b272a

Browse files
faddivfaddiv
committed
Use new message formats in resx. Update properties.
1 parent 22c139e commit d3b272a

20 files changed

+122
-113
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public ContentResultAssertions WithContent(string expectedContent, string reason
3838
.ForCondition(string.Equals(actualContent, expectedContent, StringComparison.OrdinalIgnoreCase))
3939
.BecauseOf(reason, reasonArgs)
4040
.WithDefaultIdentifier("ContentResult.Content")
41-
.FailWith(FailureMessages.CommonFailMessage2, expectedContent, actualContent);
41+
.FailWith(FailureMessages.CommonFailMessage, expectedContent, actualContent);
4242

4343
return this;
4444
}
@@ -62,7 +62,7 @@ public ContentResultAssertions WithContentType(string expectedContentType, strin
6262
.ForCondition(string.Equals(expectedContentType, actualContentType, StringComparison.OrdinalIgnoreCase))
6363
.BecauseOf(reason, reasonArgs)
6464
.WithDefaultIdentifier("ContentResult.ContentType")
65-
.FailWith(FailureMessages.CommonFailMessage2, expectedContentType, actualContentType);
65+
.FailWith(FailureMessages.CommonFailMessage, expectedContentType, actualContentType);
6666

6767
return this;
6868
}

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

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,8 @@ public CreatedAtActionResultAssertions WithRouteValue(string key, object expecte
7979
{
8080
var subjectTyped = Subject as CreatedAtActionResult;
8181

82-
Execute.Assertion
83-
.ForCondition(subjectTyped != null && subjectTyped.RouteValues.ContainsKey(key))
84-
.BecauseOf(reason, reasonArgs)
85-
.FailWith(FailureMessages.CreatedAtActionResult_RouteValues_ContainsKey, key);
86-
87-
var actualValue = subjectTyped.RouteValues[key];
88-
89-
Execute.Assertion
90-
.ForCondition(expectedValue.Equals(actualValue))
91-
.BecauseOf(reason, reasonArgs)
92-
.FailWith(FailureMessages.CreatedAtActionResult_RouteValues_HaveValue, key, expectedValue, actualValue);
82+
AssertionHelpers.AssertStringObjectDictionary(subjectTyped.RouteValues, "CreatedAtActionResult.RouteValues",
83+
key, expectedValue, reason, reasonArgs);
9384

9485
return this;
9586
}
@@ -105,11 +96,14 @@ public TValue ValueAs<TValue>()
10596
var value = subjectTyped.Value;
10697

10798
if (value == null)
108-
Execute.Assertion.FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, "CreatedAtActionResult.Value", typeof(TValue).Name);
99+
Execute.Assertion
100+
.WithDefaultIdentifier("CreatedAtActionResult.Value")
101+
.FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, typeof(TValue));
109102

110103
Execute.Assertion
111104
.ForCondition(value is TValue)
112-
.FailWith(FailureMessages.CommonTypeFailMessage, "CreatedAtActionResult.Value", typeof(TValue).Name, value.GetType().Name);
105+
.WithDefaultIdentifier("CreatedAtActionResult.Value")
106+
.FailWith(FailureMessages.CommonTypeFailMessage, typeof(TValue), value.GetType());
113107

114108
return (TValue)value;
115109
}

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

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public CreatedAtRouteResultAssertions WithRouteName(string expectedRouteName, st
3535
Execute.Assertion
3636
.BecauseOf(reason, reasonArgs)
3737
.ForCondition(string.Equals(expectedRouteName, subjectTyped.RouteName, StringComparison.OrdinalIgnoreCase))
38-
.FailWith(FailureMessages.CommonFailMessage, "CreatedAtRouteResult.RouteName", expectedRouteName, subjectTyped.RouteName);
38+
.WithDefaultIdentifier("CreatedAtRouteResult.RouteName")
39+
.FailWith(FailureMessages.CommonFailMessage, expectedRouteName, subjectTyped.RouteName);
3940

4041
return this;
4142
}
@@ -56,17 +57,8 @@ public CreatedAtRouteResultAssertions WithRouteValue(string key, object expected
5657
{
5758
var subjectTyped = Subject as CreatedAtRouteResult;
5859

59-
Execute.Assertion
60-
.ForCondition(subjectTyped != null && subjectTyped.RouteValues.ContainsKey(key))
61-
.BecauseOf(reason, reasonArgs)
62-
.FailWith(FailureMessages.CreatedAtRouteResult_RouteValues_ContainsKey, key);
63-
64-
var actualValue = subjectTyped.RouteValues[key];
65-
66-
Execute.Assertion
67-
.ForCondition(expectedValue.Equals(actualValue))
68-
.BecauseOf(reason, reasonArgs)
69-
.FailWith(FailureMessages.CreatedAtRouteResult_RouteValues_HaveValue, key, expectedValue, actualValue);
60+
AssertionHelpers.AssertStringObjectDictionary(subjectTyped.RouteValues, "CreatedAtRouteResult.RouteValues",
61+
key, expectedValue, reason, reasonArgs);
7062

7163
return this;
7264
}
@@ -82,11 +74,14 @@ public TValue ValueAs<TValue>()
8274
var value = subjectTyped.Value;
8375

8476
if (value == null)
85-
Execute.Assertion.FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, "CreatedAtRouteResult.Value", typeof(TValue).Name);
77+
Execute.Assertion
78+
.WithDefaultIdentifier("CreatedAtRouteResult.Value")
79+
.FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, typeof(TValue));
8680

8781
Execute.Assertion
8882
.ForCondition(value is TValue)
89-
.FailWith(FailureMessages.CommonTypeFailMessage, "CreatedAtRouteResult.Value", typeof(TValue).Name, value.GetType().Name);
83+
.WithDefaultIdentifier("CreatedAtRouteResult.Value")
84+
.FailWith(FailureMessages.CommonTypeFailMessage, typeof(TValue), value.GetType());
9085

9186
return (TValue)value;
9287
}

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

Lines changed: 52 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/FluentAssertions.AspNetCore.Mvc/FailureMessages.resx‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,27 +133,18 @@
133133
<value>Expected AuthenticationSchemes to contain Scheme {0}.</value>
134134
</data>
135135
<data name="CommonFailMessage" xml:space="preserve">
136-
<value>Expected {0} to be '{1}' but found '{2}'</value>
136+
<value>Expected {context} to be {0}{reason} but found {1}.</value>
137137
</data>
138138
<data name="CommonItemsContain" xml:space="preserve">
139139
<value>Expected Items to contain [{0},{1}].</value>
140140
</data>
141141
<data name="CommonListsNotIdentical" xml:space="preserve">
142142
<value>Expected {0} List to contain exact items of actual items. </value>
143143
</data>
144-
<data name="CommonFailMessage2" xml:space="preserve">
145-
<value>Expected {context} to be {0}{reason} but found {1}.</value>
146-
</data>
147144
<data name="CommonNullWasSuppliedFailMessage" xml:space="preserve">
148-
<value>Expected {0} to be of type {1}, but no {0} was supplied.</value>
149-
</data>
150-
<data name="CommonNullWasSuppliedFailMessage2" xml:space="preserve">
151145
<value>Expected {context} to be of type {0}, but no value was supplied.</value>
152146
</data>
153147
<data name="CommonTypeFailMessage" xml:space="preserve">
154-
<value>Expected {0} to be of type '{1}' but was '{2}'</value>
155-
</data>
156-
<data name="CommonTypeFailMessage2" xml:space="preserve">
157148
<value>Expected {context} to be of type {0} but was {1}.</value>
158149
</data>
159150
<data name="FileContentResult_WithFileContents_LengthFail" xml:space="preserve">

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public FileResultAssertions WithContentType(string expectedContentType, string r
5050
.ForCondition(string.Equals(expectedContentType, actualContentType, StringComparison.OrdinalIgnoreCase))
5151
.BecauseOf(reason, reasonArgs)
5252
.WithDefaultIdentifier("FileResult.ContentType")
53-
.FailWith(FailureMessages.CommonFailMessage2, expectedContentType, actualContentType);
53+
.FailWith(FailureMessages.CommonFailMessage, expectedContentType, actualContentType);
5454
return this;
5555
}
5656

@@ -74,7 +74,7 @@ public FileResultAssertions WithEntityTag(EntityTagHeaderValue expectedEntityTag
7474
.ForCondition(Equals(expectedEntityTag, actualEntityTag))
7575
.BecauseOf(reason, reasonArgs)
7676
.WithDefaultIdentifier("FileResult.EntityTag")
77-
.FailWith(FailureMessages.CommonFailMessage2, expectedEntityTag, actualEntityTag);
77+
.FailWith(FailureMessages.CommonFailMessage, expectedEntityTag, actualEntityTag);
7878
return this;
7979
}
8080

@@ -98,7 +98,7 @@ public FileResultAssertions WithFileDownloadName(string expectedFileDownloadName
9898
.ForCondition(string.Equals(expectedFileDownloadName, actualFileDownloadName, StringComparison.OrdinalIgnoreCase))
9999
.BecauseOf(reason, reasonArgs)
100100
.WithDefaultIdentifier("FileResult.FileDownloadName")
101-
.FailWith(FailureMessages.CommonFailMessage2, expectedFileDownloadName, actualFileDownloadName);
101+
.FailWith(FailureMessages.CommonFailMessage, expectedFileDownloadName, actualFileDownloadName);
102102
return this;
103103
}
104104

@@ -122,7 +122,7 @@ public FileResultAssertions WithLastModified(DateTimeOffset? expectedLastModifie
122122
.ForCondition(expectedLastModified == actualLastModified)
123123
.BecauseOf(reason, reasonArgs)
124124
.WithDefaultIdentifier("FileResult.LastModified")
125-
.FailWith(FailureMessages.CommonFailMessage2, expectedLastModified, actualLastModified);
125+
.FailWith(FailureMessages.CommonFailMessage, expectedLastModified, actualLastModified);
126126
return this;
127127
}
128128

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public JsonResultAssertions WithContentType(string expectedContentType, string r
6868
.ForCondition(string.Equals(expectedContentType, actualContentType, StringComparison.OrdinalIgnoreCase))
6969
.BecauseOf(reason, reasonArgs)
7070
.WithDefaultIdentifier("JsonResult.ContentType")
71-
.FailWith(FailureMessages.CommonFailMessage2, expectedContentType, actualContentType);
71+
.FailWith(FailureMessages.CommonFailMessage, expectedContentType, actualContentType);
7272
return this;
7373
}
7474

@@ -92,7 +92,7 @@ public JsonResultAssertions WithStatusCode(int? expectedStatusCode, string reaso
9292
.ForCondition(expectedStatusCode == actualStatusCode)
9393
.BecauseOf(reason, reasonArgs)
9494
.WithDefaultIdentifier("JsonResult.StatusCode")
95-
.FailWith(FailureMessages.CommonFailMessage2, expectedStatusCode, actualStatusCode);
95+
.FailWith(FailureMessages.CommonFailMessage, expectedStatusCode, actualStatusCode);
9696
return this;
9797
}
9898

@@ -107,13 +107,13 @@ public TValue ValueAs<TValue>()
107107

108108
if (value == null)
109109
Execute.Assertion
110-
.WithDefaultIdentifier("Value")
111-
.FailWith(FailureMessages.CommonNullWasSuppliedFailMessage2, typeof(TValue));
110+
.WithDefaultIdentifier("JsonResult.Value")
111+
.FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, typeof(TValue));
112112

113113
Execute.Assertion
114114
.ForCondition(value is TValue)
115-
.WithDefaultIdentifier("Value")
116-
.FailWith(FailureMessages.CommonTypeFailMessage2, typeof(TValue), value.GetType());
115+
.WithDefaultIdentifier("JsonResult.Value")
116+
.FailWith(FailureMessages.CommonTypeFailMessage, typeof(TValue), value.GetType());
117117

118118
return (TValue)value;
119119
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public PartialViewResultAssertions WithViewName(string expectedViewName, string
4848
.BecauseOf(reason, reasonArgs)
4949
.ForCondition(string.Equals(expectedViewName, actualViewName, StringComparison.OrdinalIgnoreCase))
5050
.WithDefaultIdentifier("PartialViewResult.ViewName")
51-
.FailWith(FailureMessages.CommonFailMessage2, expectedViewName, actualViewName);
51+
.FailWith(FailureMessages.CommonFailMessage, expectedViewName, actualViewName);
5252
return this;
5353
}
5454

@@ -110,12 +110,12 @@ public TModel ModelAs<TModel>()
110110
if (model == null)
111111
Execute.Assertion
112112
.WithDefaultIdentifier("PartialViewResult.Model")
113-
.FailWith(FailureMessages.CommonNullWasSuppliedFailMessage2, typeof(TModel));
113+
.FailWith(FailureMessages.CommonNullWasSuppliedFailMessage, typeof(TModel));
114114

115115
Execute.Assertion
116116
.ForCondition(model is TModel)
117117
.WithDefaultIdentifier("PartialViewResult.Model")
118-
.FailWith(FailureMessages.CommonTypeFailMessage2, typeof(TModel), model.GetType());
118+
.FailWith(FailureMessages.CommonTypeFailMessage, typeof(TModel), model.GetType());
119119

120120
return (TModel)model;
121121
}
@@ -135,7 +135,7 @@ public PartialViewResultAssertions WithDefaultViewName(string reason = "", param
135135
var viewName = PartialViewResultSubject.ViewName;
136136

137137
Execute.Assertion
138-
.ForCondition(viewName == string.Empty)
138+
.ForCondition(string.IsNullOrEmpty(viewName))
139139
.BecauseOf(reason, reasonArgs)
140140
.FailWith(FailureMessages.ViewResultBase_WithDefaultViewName, viewName);
141141

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public PhysicalFileResultAssertions WithEntityTag(EntityTagHeaderValue expectedE
179179
.ForCondition(Equals(actualEntityTag, expectedEntityTag))
180180
.BecauseOf(reason, reasonArgs)
181181
.WithDefaultIdentifier("PhysicalFileResult.EntityTag")
182-
.FailWith(FailureMessages.CommonFailMessage2, expectedFileName, actualFileName);
182+
.FailWith(FailureMessages.CommonFailMessage, expectedEntityTag, actualEntityTag);
183183
return this;
184184
}
185185

0 commit comments

Comments
 (0)