@@ -72,6 +72,7 @@ private void WriteHeader()
72
72
if ( ea != null )
73
73
{
74
74
var title = GetAttribute < AssemblyTitleAttribute > ( ea ) ? . Title ;
75
+ //var title = GetAttribute<AssemblyTitleAttribute>(ea)?.Title;
75
76
var version = GetAttribute < AssemblyFileVersionAttribute > ( ea ) ? . Version ;
76
77
var copyright = GetAttribute < AssemblyCopyrightAttribute > ( ea ) ? . Copyright ;
77
78
@@ -83,16 +84,9 @@ private void WriteHeader()
83
84
}
84
85
}
85
86
86
- private TAttr ? GetAttribute < TAttr > ( Assembly assembly ) where TAttr : Attribute
87
+ private static TAttr ? GetAttribute < TAttr > ( Assembly assembly ) where TAttr : Attribute
87
88
{
88
- #if ( NETCOREAPP || NET462_OR_GREATER )
89
89
return assembly ? . GetCustomAttribute < TAttr > ( ) ;
90
- #else
91
- var attrs = assembly ? . GetCustomAttributes ( typeof ( TAttr ) , false ) ;
92
- return attrs . Length > 0
93
- ? attrs [ 0 ] as TAttr
94
- : null ;
95
- #endif
96
90
}
97
91
98
92
internal void WriteRunSettingsReport ( XmlNode resultNode )
@@ -128,35 +122,20 @@ private void WriteSettingsNode(XmlNode node)
128
122
129
123
public void WriteSummaryReport ( XmlNode resultNode )
130
124
{
131
- var OverallResult = resultNode . GetAttribute ( "result" ) ?? "Unknown" ;
132
- if ( OverallResult == "Skipped" )
133
- OverallResult = "Warning" ;
125
+ var overallResult = resultNode . GetAttribute ( "result" ) ?? "Unknown" ;
126
+ if ( overallResult == "Skipped" )
127
+ overallResult = "Warning" ;
134
128
135
- ColorStyle overall = OverallResult == "Passed"
129
+ ColorStyle resultColor = overallResult == "Passed"
136
130
? ColorStyle . Pass
137
- : OverallResult == "Failed" || OverallResult == "Unknown"
131
+ : overallResult == "Failed" || overallResult == "Unknown"
138
132
? ColorStyle . Failure
139
- : OverallResult == "Warning"
133
+ : overallResult == "Warning"
140
134
? ColorStyle . Warning
141
135
: ColorStyle . Output ;
142
136
143
137
OutWriter . WriteLine ( ColorStyle . SectionHeader , "Test Run Summary" ) ;
144
- switch ( OverallResult )
145
- {
146
- case "Passed" :
147
- OutWriter . WriteLabelLine ( " Overall result: " , OverallResult , ColorStyle . Pass ) ;
148
- break ;
149
- case "Failed" :
150
- case "Unknown" :
151
- OutWriter . WriteLabelLine ( " Overall result: " , OverallResult , ColorStyle . Failure ) ;
152
- break ;
153
- case "Warning" :
154
- OutWriter . WriteLabelLine ( " Overall result: " , OverallResult , ColorStyle . Warning ) ;
155
- break ;
156
- default :
157
- OutWriter . WriteLabelLine ( " Overall result: " , OverallResult , ColorStyle . Output ) ;
158
- break ;
159
- }
138
+ OutWriter . WriteLabelLine ( overallResult , resultColor ) ;
160
139
161
140
int cases = resultNode . GetAttribute ( "testcasecount" , 0 ) ;
162
141
int passed = resultNode . GetAttribute ( "passed" , 0 ) ;
@@ -194,6 +173,9 @@ public void WriteErrorsFailuresAndWarningsReport(XmlNode resultNode)
194
173
195
174
private void WriteErrorsFailuresAndWarnings ( XmlNode resultNode )
196
175
{
176
+ const string OLD_NUNIT_CHILD_HAD_ERRORS_MESSAGE = "One or more child tests had errors" ;
177
+ const string OLD_NUNIT_CHILD_HAD_WARNINGS_MESSAGE = "One or more child tests had errors" ;
178
+
197
179
string resultState = resultNode . GetAttribute ( "result" ) ?? "" ;
198
180
199
181
switch ( resultNode . Name )
@@ -227,8 +209,8 @@ private void WriteErrorsFailuresAndWarnings(XmlNode resultNode)
227
209
// are promulgated to the containing suite without setting the FailureSite.
228
210
if ( site == null )
229
211
{
230
- if ( resultNode . SelectSingleNode ( "reason/message" ) ? . InnerText == "One or more child tests had warnings" ||
231
- resultNode . SelectSingleNode ( "failure/message" ) ? . InnerText == "One or more child tests had errors" )
212
+ if ( resultNode . SelectSingleNode ( "reason/message" ) ? . InnerText == OLD_NUNIT_CHILD_HAD_WARNINGS_MESSAGE ||
213
+ resultNode . SelectSingleNode ( "failure/message" ) ? . InnerText == OLD_NUNIT_CHILD_HAD_ERRORS_MESSAGE )
232
214
{
233
215
site = "Child" ;
234
216
}
0 commit comments