Skip to content

Commit 55a3731

Browse files
DustinCampbellDustinCampbell
committed
Rename IntermediateNode test helpers and unneeded remove null assertions
1 parent 209fa7e commit 55a3731

21 files changed

+358
-544
lines changed

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/InjectDirectiveTest.cs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ @inject PropertyType PropertyName
3838

3939
// Act
4040
processor.ExecutePass<InjectDirective.Pass>();
41-
var documentNode = processor.GetDocumentNode();
4241

4342
// Assert
44-
var @class = documentNode.FindClassNode();
45-
Assert.NotNull(@class);
46-
Assert.Equal(2, @class.Children.Count);
43+
var documentNode = processor.GetDocumentNode();
44+
var classNode = documentNode.GetClassNode();
4745

48-
var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
46+
Assert.Equal(2, classNode.Children.Count);
47+
48+
var node = Assert.IsType<InjectIntermediateNode>(classNode.Children[1]);
4949
Assert.Equal("PropertyType", node.TypeName);
5050
Assert.Equal("PropertyName", node.MemberName);
5151
}
@@ -63,14 +63,14 @@ @inject PropertyType2 PropertyName
6363

6464
// Act
6565
processor.ExecutePass<InjectDirective.Pass>();
66-
var documentNode = processor.GetDocumentNode();
6766

6867
// Assert
69-
var @class = documentNode.FindClassNode();
70-
Assert.NotNull(@class);
71-
Assert.Equal(2, @class.Children.Count);
68+
var documentNode = processor.GetDocumentNode();
69+
var classNode = documentNode.GetClassNode();
70+
71+
Assert.Equal(2, classNode.Children.Count);
7272

73-
var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
73+
var node = Assert.IsType<InjectIntermediateNode>(classNode.Children[1]);
7474
Assert.Equal("PropertyType2", node.TypeName);
7575
Assert.Equal("PropertyName", node.MemberName);
7676
}
@@ -87,14 +87,14 @@ @inject PropertyType<TModel> PropertyName
8787

8888
// Act
8989
processor.ExecutePass<InjectDirective.Pass>();
90-
var documentNode = processor.GetDocumentNode();
9190

9291
// Assert
93-
var @class = documentNode.FindClassNode();
94-
Assert.NotNull(@class);
95-
Assert.Equal(2, @class.Children.Count);
92+
var documentNode = processor.GetDocumentNode();
93+
var classNode = documentNode.GetClassNode();
9694

97-
var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
95+
Assert.Equal(2, classNode.Children.Count);
96+
97+
var node = Assert.IsType<InjectIntermediateNode>(classNode.Children[1]);
9898
Assert.Equal("PropertyType<dynamic>", node.TypeName);
9999
Assert.Equal("PropertyName", node.MemberName);
100100
}
@@ -112,14 +112,14 @@ @inject PropertyType<TModel> PropertyName
112112

113113
// Act
114114
processor.ExecutePass<InjectDirective.Pass>();
115-
var documentNode = processor.GetDocumentNode();
116115

117116
// Assert
118-
var @class = documentNode.FindClassNode();
119-
Assert.NotNull(@class);
120-
Assert.Equal(2, @class.Children.Count);
117+
var documentNode = processor.GetDocumentNode();
118+
var classNode = documentNode.GetClassNode();
119+
120+
Assert.Equal(2, classNode.Children.Count);
121121

122-
var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
122+
var node = Assert.IsType<InjectIntermediateNode>(classNode.Children[1]);
123123
Assert.Equal("PropertyType<ModelType>", node.TypeName);
124124
Assert.Equal("PropertyName", node.MemberName);
125125
}
@@ -137,14 +137,14 @@ @model ModelType
137137

138138
// Act
139139
processor.ExecutePass<InjectDirective.Pass>();
140-
var documentNode = processor.GetDocumentNode();
141140

142141
// Assert
143-
var @class = documentNode.FindClassNode();
144-
Assert.NotNull(@class);
145-
Assert.Equal(2, @class.Children.Count);
142+
var documentNode = processor.GetDocumentNode();
143+
var classNode = documentNode.GetClassNode();
144+
145+
Assert.Equal(2, classNode.Children.Count);
146146

147-
var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
147+
var node = Assert.IsType<InjectIntermediateNode>(classNode.Children[1]);
148148
Assert.Equal("PropertyType<ModelType>", node.TypeName);
149149
Assert.Equal("PropertyName", node.MemberName);
150150
}

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,11 @@ @model Type1
8080

8181
// Act
8282
processor.ExecutePass<ModelDirective.Pass>();
83-
var documentNode = processor.GetDocumentNode();
8483

8584
// Assert
86-
var @class = documentNode.FindClassNode();
87-
Assert.NotNull(@class);
88-
var baseType = @class.BaseType;
85+
var documentNode = processor.GetDocumentNode();
86+
var classNode = documentNode.GetClassNode();
87+
var baseType = classNode.BaseType;
8988

9089
Assert.Equal("BaseType", baseType.BaseType.Content);
9190
Assert.NotNull(baseType.BaseType.Source);
@@ -109,13 +108,11 @@ @model Type2
109108

110109
// Act
111110
processor.ExecutePass<ModelDirective.Pass>();
112-
var documentNode = processor.GetDocumentNode();
113111

114112
// Assert
115-
var @class = documentNode.FindClassNode();
116-
Assert.NotNull(@class);
117-
118-
var baseType = @class.BaseType;
113+
var documentNode = processor.GetDocumentNode();
114+
var classNode = documentNode.GetClassNode();
115+
var baseType = classNode.BaseType;
119116

120117
Assert.Equal("BaseType", baseType.BaseType.Content);
121118
Assert.NotNull(baseType.BaseType.Source);
@@ -138,12 +135,11 @@ @model Type1
138135

139136
// Act
140137
processor.ExecutePass<ModelDirective.Pass>();
141-
var documentNode = processor.GetDocumentNode();
142138

143139
// Assert
144-
var @class = documentNode.FindClassNode();
145-
Assert.NotNull(@class);
146-
var baseType = @class.BaseType;
140+
var documentNode = processor.GetDocumentNode();
141+
var classNode = documentNode.GetClassNode();
142+
var baseType = classNode.BaseType;
147143

148144
Assert.Equal("BaseType", baseType.BaseType.Content);
149145
Assert.NotNull(baseType.BaseType.Source);
@@ -164,12 +160,11 @@ @inherits BaseType<TModel>
164160

165161
// Act
166162
processor.ExecutePass<ModelDirective.Pass>();
167-
var documentNode = processor.GetDocumentNode();
168163

169164
// Assert
170-
var @class = documentNode.FindClassNode();
171-
Assert.NotNull(@class);
172-
var baseType = @class.BaseType;
165+
var documentNode = processor.GetDocumentNode();
166+
var classNode = documentNode.GetClassNode();
167+
var baseType = classNode.BaseType;
173168

174169
Assert.Equal("BaseType", baseType.BaseType.Content);
175170
Assert.NotNull(baseType.BaseType.Source);
@@ -191,12 +186,12 @@ @inherits BaseType<TModel>
191186

192187
// Act
193188
processor.ExecutePass<ModelDirective.Pass>();
194-
var documentNode = processor.GetDocumentNode();
195189

196190
// Assert
197-
var @class = documentNode.FindClassNode();
198-
Assert.NotNull(@class);
199-
var baseType = @class.BaseType;
191+
var documentNode = processor.GetDocumentNode();
192+
var namespaceNode = documentNode.GetNamespaceNode();
193+
var classNode = documentNode.GetClassNode();
194+
var baseType = classNode.BaseType;
200195

201196
Assert.Equal("BaseType", baseType.BaseType.Content);
202197
Assert.Null(baseType.BaseType.Source);
@@ -205,9 +200,7 @@ @inherits BaseType<TModel>
205200
Assert.Equal("dynamic", baseType.ModelType.Content);
206201
Assert.Null(baseType.ModelType.Source);
207202

208-
var @namespace = documentNode.FindNamespaceNode();
209-
Assert.NotNull(@namespace);
210-
var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
203+
var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(namespaceNode.Children[0]);
211204
Assert.Equal($"TModel = global::{typeof(object).FullName}", usingNode.Content);
212205
}
213206

@@ -224,12 +217,12 @@ @model SomeType
224217

225218
// Act
226219
processor.ExecutePass<ModelDirective.Pass>();
227-
var documentNode = processor.GetDocumentNode();
228220

229221
// Assert
230-
var @class = documentNode.FindClassNode();
231-
Assert.NotNull(@class);
232-
var baseType = @class.BaseType;
222+
var documentNode = processor.GetDocumentNode();
223+
var namespaceNode = documentNode.GetNamespaceNode();
224+
var classNode = documentNode.GetClassNode();
225+
var baseType = classNode.BaseType;
233226

234227
Assert.Equal("BaseType", baseType.BaseType.Content);
235228
Assert.Null(baseType.BaseType.Source);
@@ -238,9 +231,7 @@ @model SomeType
238231
Assert.Equal("SomeType", baseType.ModelType.Content);
239232
Assert.Null(baseType.ModelType.Source);
240233

241-
var @namespace = documentNode.FindNamespaceNode();
242-
Assert.NotNull(@namespace);
243-
var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
234+
var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(namespaceNode.Children[0]);
244235
Assert.Equal($"TModel = global::System.Object", usingNode.Content);
245236
}
246237
}

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelExpressionPassTest.cs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,10 @@ public void ModelExpressionPass_NonModelExpressionProperty_Ignored()
4545

4646
// Act
4747
processor.ExecutePass<ModelExpressionPass>();
48-
var documentNode = processor.GetDocumentNode();
4948

5049
// Assert
51-
var tagHelperNode = documentNode.FindTagHelperNode();
52-
Assert.NotNull(tagHelperNode);
50+
var documentNode = processor.GetDocumentNode();
51+
var tagHelperNode = documentNode.GetTagHelperNode();
5352
var setProperty = tagHelperNode.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
5453

5554
var token = Assert.IsAssignableFrom<IntermediateToken>(Assert.Single(setProperty.Children));
@@ -78,11 +77,10 @@ public void ModelExpressionPass_ModelExpressionProperty_SimpleExpression()
7877

7978
// Act
8079
processor.ExecutePass<ModelExpressionPass>();
81-
var documentNode = processor.GetDocumentNode();
8280

8381
// Assert
84-
var tagHelperNode = documentNode.FindTagHelperNode();
85-
Assert.NotNull(tagHelperNode);
82+
var documentNode = processor.GetDocumentNode();
83+
var tagHelperNode = documentNode.GetTagHelperNode();
8684
var setProperty = tagHelperNode.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
8785

8886
var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
@@ -116,11 +114,10 @@ public void ModelExpressionPass_ModelExpressionProperty_ComplexExpression()
116114

117115
// Act
118116
processor.ExecutePass<ModelExpressionPass>();
119-
var documentNode = processor.GetDocumentNode();
120117

121118
// Assert
122-
var tagHelperNode = documentNode.FindTagHelperNode();
123-
Assert.NotNull(tagHelperNode);
119+
var documentNode = processor.GetDocumentNode();
120+
var tagHelperNode = documentNode.GetTagHelperNode();
124121
var setProperty = tagHelperNode.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
125122

126123
var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));

0 commit comments

Comments
 (0)