|
3 | 3 | using System.Collections.Generic; |
4 | 4 | using System.ComponentModel; |
5 | 5 | using System.Diagnostics; |
| 6 | +using System.Globalization; |
6 | 7 | using System.Linq; |
7 | 8 | using System.Threading; |
8 | 9 | using System.Threading.Tasks; |
@@ -118,25 +119,32 @@ protected override void Initialize() |
118 | 119 | { |
119 | 120 | base.Initialize(); |
120 | 121 |
|
121 | | - var factAttribute = TestMethod.Method.GetCustomAttributes(typeof(FactAttribute)).First(); |
122 | | - var baseDisplayName = factAttribute.GetNamedArgument<string>("DisplayName") ?? BaseDisplayName; |
| 122 | + try |
| 123 | + { |
| 124 | + var factAttribute = TestMethod.Method.GetCustomAttributes(typeof(FactAttribute)).First(); |
| 125 | + var baseDisplayName = factAttribute.GetNamedArgument<string>("DisplayName") ?? BaseDisplayName; |
123 | 126 |
|
124 | | - DisplayName = GetDisplayName(factAttribute, baseDisplayName); |
125 | | - SkipReason = GetSkipReason(factAttribute); |
126 | | - Timeout = GetTimeout(factAttribute); |
| 127 | + DisplayName = GetDisplayName(factAttribute, baseDisplayName); |
| 128 | + SkipReason = GetSkipReason(factAttribute); |
| 129 | + Timeout = GetTimeout(factAttribute); |
127 | 130 |
|
128 | | - foreach (var traitAttribute in GetTraitAttributesData(TestMethod)) |
129 | | - { |
130 | | - var discovererAttribute = traitAttribute.GetCustomAttributes(typeof(TraitDiscovererAttribute)).FirstOrDefault(); |
131 | | - if (discovererAttribute != null) |
| 131 | + foreach (var traitAttribute in GetTraitAttributesData(TestMethod)) |
132 | 132 | { |
133 | | - var discoverer = ExtensibilityPointFactory.GetTraitDiscoverer(DiagnosticMessageSink, discovererAttribute); |
134 | | - if (discoverer != null) |
135 | | - foreach (var keyValuePair in discoverer.GetTraits(traitAttribute)) |
136 | | - Traits.Add(keyValuePair.Key, keyValuePair.Value); |
| 133 | + var discovererAttribute = traitAttribute.GetCustomAttributes(typeof(TraitDiscovererAttribute)).FirstOrDefault(); |
| 134 | + if (discovererAttribute != null) |
| 135 | + { |
| 136 | + var discoverer = ExtensibilityPointFactory.GetTraitDiscoverer(DiagnosticMessageSink, discovererAttribute); |
| 137 | + if (discoverer != null) |
| 138 | + foreach (var keyValuePair in discoverer.GetTraits(traitAttribute)) |
| 139 | + Traits.Add(keyValuePair.Key, keyValuePair.Value); |
| 140 | + } |
| 141 | + else |
| 142 | + DiagnosticMessageSink.OnMessage(new DiagnosticMessage("Trait attribute on '{0}' did not have [TraitDiscoverer]", DisplayName)); |
137 | 143 | } |
138 | | - else |
139 | | - DiagnosticMessageSink.OnMessage(new DiagnosticMessage("Trait attribute on '{0}' did not have [TraitDiscoverer]", DisplayName)); |
| 144 | + } |
| 145 | + catch (Exception ex) |
| 146 | + { |
| 147 | + InitializationException = new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Exception during initialization:{0}{1}", Environment.NewLine, ex.Unwrap())); |
140 | 148 | } |
141 | 149 | } |
142 | 150 |
|
|
0 commit comments