2
2
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3
3
4
4
using System ;
5
+ using System . Globalization ;
5
6
using System . IO ;
6
7
using System . Threading . Tasks ;
7
8
using Microsoft . AspNet . Http ;
@@ -31,43 +32,16 @@ public void CreateTagHelper_CreatesProvidedTagHelperType()
31
32
}
32
33
33
34
[ Fact ]
34
- public void CreateTagHelper_ActivatesProvidedTagHelperType_Constructor ( )
35
+ public void CreateTagHelper_ActivatesProvidedTagHelperType ( )
35
36
{
36
37
// Arrange
37
38
var instance = CreateTestRazorPage ( ) ;
38
39
39
40
// Act
40
- var tagHelper = instance . CreateTagHelper < ConstructorServiceTagHelper > ( ) ;
41
-
42
- // Assert
43
- Assert . NotNull ( tagHelper . PassedInService ) ;
44
- }
45
-
46
- [ Fact ]
47
- public void CreateTagHelper_ActivatesProvidedTagHelperType_Property ( )
48
- {
49
- // Arrange
50
- var instance = CreateTestRazorPage ( ) ;
51
-
52
- // Act
53
- var tagHelper = instance . CreateTagHelper < ActivateAttributeServiceTagHelper > ( ) ;
54
-
55
- // Assert
56
- Assert . NotNull ( tagHelper . ActivatedService ) ;
57
- }
58
-
59
- [ Fact ]
60
- public void CreateTagHelper_ActivatesProvidedTagHelperType_PropertyAndConstructor ( )
61
- {
62
- // Arrange
63
- var instance = CreateTestRazorPage ( ) ;
64
-
65
- // Act
66
- var tagHelper = instance . CreateTagHelper < AttributeConstructorServiceTagHelper > ( ) ;
41
+ var tagHelper = instance . CreateTagHelper < ServiceTagHelper > ( ) ;
67
42
68
43
// Assert
69
44
Assert . NotNull ( tagHelper . ActivatedService ) ;
70
- Assert . NotNull ( tagHelper . PassedInService ) ;
71
45
}
72
46
73
47
[ Fact ]
@@ -94,7 +68,7 @@ public void CreateTagHelper_ProvidesTagHelperTypeWithViewContextAndActivates()
94
68
95
69
// Assert
96
70
Assert . NotNull ( tagHelper . ViewContext ) ;
97
- Assert . NotNull ( tagHelper . PassedInService ) ;
71
+ Assert . NotNull ( tagHelper . ActivatedService ) ;
98
72
}
99
73
100
74
private static TestRazorPage CreateTestRazorPage ( )
@@ -138,35 +112,12 @@ private class NoServiceTagHelper : TagHelper
138
112
{
139
113
}
140
114
141
- private class ConstructorServiceTagHelper : TagHelper
142
- {
143
- public MyService PassedInService { get ; set ; }
144
-
145
- public ConstructorServiceTagHelper ( MyService service )
146
- {
147
- PassedInService = service ;
148
- }
149
- }
150
-
151
- private class ActivateAttributeServiceTagHelper : TagHelper
115
+ private class ServiceTagHelper : TagHelper
152
116
{
153
117
[ Activate ]
154
118
public MyService ActivatedService { get ; set ; }
155
119
}
156
120
157
- private class AttributeConstructorServiceTagHelper : TagHelper
158
- {
159
- [ Activate ]
160
- public MyService ActivatedService { get ; set ; }
161
-
162
- public MyService PassedInService { get ; set ; }
163
-
164
- public AttributeConstructorServiceTagHelper ( MyService service )
165
- {
166
- PassedInService = service ;
167
- }
168
- }
169
-
170
121
private class ViewContextTagHelper : TagHelper
171
122
{
172
123
[ Activate ]
@@ -175,12 +126,8 @@ private class ViewContextTagHelper : TagHelper
175
126
176
127
private class ViewContextServiceTagHelper : ViewContextTagHelper
177
128
{
178
- public MyService PassedInService { get ; set ; }
179
-
180
- public ViewContextServiceTagHelper ( MyService service )
181
- {
182
- PassedInService = service ;
183
- }
129
+ [ Activate ]
130
+ public MyService ActivatedService { get ; set ; }
184
131
}
185
132
186
133
private class MyService
0 commit comments