Skip to content
This repository was archived by the owner on Dec 19, 2018. It is now read-only.

Commit 22c5417

Browse files
author
NTaylorMullen
committed
Addressed code review comments.
1 parent 4660da0 commit 22c5417

File tree

9 files changed

+232
-262
lines changed

9 files changed

+232
-262
lines changed

‎test/Microsoft.AspNet.Razor.Test/Generator/CSharpTagHelperRenderingTest.cs‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,26 @@ public class CSharpTagHelperRenderingTest : CSharpRazorCodeGeneratorTest
1919
public void TagHelpers_WithinHelpersAndSections_GeneratesExpectedOutput(string testType)
2020
{
2121
// Arrange
22-
var myTagHelperBoundPI = new Mock<PropertyInfo>();
23-
myTagHelperBoundPI.Setup(bpi => bpi.PropertyType).Returns(typeof(string));
24-
myTagHelperBoundPI.Setup(bpi => bpi.Name).Returns("BoundProperty");
25-
var tagHelperProvider = new TagHelperDescriptorProvider(
22+
var propertyInfoMock = new Mock<PropertyInfo>();
23+
propertyInfoMock.Setup(propertyInfo => propertyInfo.PropertyType).Returns(typeof(string));
24+
propertyInfoMock.Setup(propertyInfo => propertyInfo.Name).Returns("BoundProperty");
25+
var tagHelperDescriptorProvider = new TagHelperDescriptorProvider(
2626
new TagHelperDescriptor[]
2727
{
2828
new TagHelperDescriptor("MyTagHelper",
2929
"MyTagHelper",
3030
ContentBehavior.None,
3131
new [] {
3232
new TagHelperAttributeDescriptor("BoundProperty",
33-
myTagHelperBoundPI.Object)
33+
propertyInfoMock.Object)
3434
}),
3535
new TagHelperDescriptor("NestedTagHelper", "NestedTagHelper", ContentBehavior.Modify)
3636
});
3737

3838
// Act & Assert
39-
RunTagHelperTest(testType, tagHelperProvider);
39+
RunTagHelperTest(testType, tagHelperDescriptorProvider);
4040
}
4141

42-
4342
[Theory]
4443
[InlineData("SingleTagHelper")]
4544
[InlineData("BasicTagHelpers")]
@@ -48,15 +47,15 @@ public void TagHelpers_GenerateExpectedOutput(string testType)
4847
{
4948
// Arrange
5049
var pFooPropertyInfo = new Mock<PropertyInfo>();
51-
pFooPropertyInfo.Setup(ppi => ppi.PropertyType).Returns(typeof(int));
52-
pFooPropertyInfo.Setup(ppi => ppi.Name).Returns("Foo");
50+
pFooPropertyInfo.Setup(propertyInfo => propertyInfo.PropertyType).Returns(typeof(int));
51+
pFooPropertyInfo.Setup(propertyInfo => propertyInfo.Name).Returns("Foo");
5352
var inputTypePropertyInfo = new Mock<PropertyInfo>();
54-
inputTypePropertyInfo.Setup(ipi => ipi.PropertyType).Returns(typeof(string));
55-
inputTypePropertyInfo.Setup(ipi => ipi.Name).Returns("Type");
53+
inputTypePropertyInfo.Setup(propertyInfo => propertyInfo.PropertyType).Returns(typeof(string));
54+
inputTypePropertyInfo.Setup(propertyInfo => propertyInfo.Name).Returns("Type");
5655
var checkedPropertyInfo = new Mock<PropertyInfo>();
57-
checkedPropertyInfo.Setup(ipi => ipi.PropertyType).Returns(typeof(bool));
58-
checkedPropertyInfo.Setup(ipi => ipi.Name).Returns("Checked");
59-
var tagHelperProvider = new TagHelperDescriptorProvider(
56+
checkedPropertyInfo.Setup(propertyInfo => propertyInfo.PropertyType).Returns(typeof(bool));
57+
checkedPropertyInfo.Setup(propertyInfo => propertyInfo.Name).Returns("Checked");
58+
var tagHelperDescriptorProvider = new TagHelperDescriptorProvider(
6059
new TagHelperDescriptor[]
6160
{
6261
new TagHelperDescriptor("p",
@@ -81,14 +80,14 @@ public void TagHelpers_GenerateExpectedOutput(string testType)
8180
});
8281

8382
// Act & Assert
84-
RunTagHelperTest(testType, tagHelperProvider);
83+
RunTagHelperTest(testType, tagHelperDescriptorProvider);
8584
}
8685

8786
[Fact]
8887
public void TagHelpers_WithContentBehaviors_GenerateExpectedOutput()
8988
{
9089
// Arrange
91-
var tagHelperProvider = new TagHelperDescriptorProvider(
90+
var tagHelperDescriptorProvider = new TagHelperDescriptorProvider(
9291
new TagHelperDescriptor[]
9392
{
9493
new TagHelperDescriptor("modify", "ModifyTagHelper", ContentBehavior.Modify),
@@ -99,39 +98,39 @@ public void TagHelpers_WithContentBehaviors_GenerateExpectedOutput()
9998
});
10099

101100
// Act & Assert
102-
RunTagHelperTest("ContentBehaviorTagHelpers", tagHelperProvider);
101+
RunTagHelperTest("ContentBehaviorTagHelpers", tagHelperDescriptorProvider);
103102
}
104103

105-
private void RunTagHelperTest(string testName, TagHelperDescriptorProvider tagHelperProvider)
104+
private void RunTagHelperTest(string testName, TagHelperDescriptorProvider tagHelperDescriptorProvider)
106105
{
107106
RunTest(
108107
name: testName,
109108
templateEngineConfig: (engine) =>
110109
{
111-
return new TagHelperTemplateEngine(engine, tagHelperProvider);
110+
return new TagHelperTemplateEngine(engine, tagHelperDescriptorProvider);
112111
});
113112
}
114113

115114
private class TagHelperTemplateEngine : RazorTemplateEngine
116115
{
117-
private TagHelperDescriptorProvider _tagHelperProvider;
116+
private TagHelperDescriptorProvider _tagHelperDescriptorProvider;
118117

119-
public TagHelperTemplateEngine(RazorTemplateEngine engine, TagHelperDescriptorProvider tagHelperProvider)
118+
public TagHelperTemplateEngine(RazorTemplateEngine engine, TagHelperDescriptorProvider tagHelperDescriptorProvider)
120119
: base(engine.Host)
121120
{
122-
_tagHelperProvider = tagHelperProvider;
121+
_tagHelperDescriptorProvider = tagHelperDescriptorProvider;
123122
}
124123

125124
protected internal override RazorParser CreateParser()
126125
{
127126
var parser = base.CreateParser();
128-
var newTagHelperParseTreeRewriter = new TagHelperParseTreeRewriter(_tagHelperProvider);
127+
var tagHelperParseTreeRewriter = new TagHelperParseTreeRewriter(_tagHelperDescriptorProvider);
129128

130129
for (var i = 0; i < parser.Optimizers.Count; i++)
131130
{
132131
if (parser.Optimizers[i] is TagHelperParseTreeRewriter)
133132
{
134-
parser.Optimizers[i] = newTagHelperParseTreeRewriter;
133+
parser.Optimizers[i] = tagHelperParseTreeRewriter;
135134
break;
136135
}
137136
}

‎test/Microsoft.AspNet.Razor.Test/Generator/RazorCodeGeneratorTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,16 @@ private void RunTestInternal(string name,
114114
host.DefaultClassName = name;
115115

116116
// Add support for templates, etc.
117-
host.GeneratedClassContext = new GeneratedClassContext(new GeneratedTagHelperContext(),
118-
GeneratedClassContext.DefaultExecuteMethodName,
117+
host.GeneratedClassContext = new GeneratedClassContext(GeneratedClassContext.DefaultExecuteMethodName,
119118
GeneratedClassContext.DefaultWriteMethodName,
120119
GeneratedClassContext.DefaultWriteLiteralMethodName,
121120
"WriteTo",
122121
"WriteLiteralTo",
123122
"Template",
124123
"DefineSection",
125124
"Instrumentation.BeginContext",
126-
"Instrumentation.EndContext")
125+
"Instrumentation.EndContext",
126+
new GeneratedTagHelperContext())
127127
{
128128
LayoutPropertyName = "Layout",
129129
ResolveUrlMethodName = "Href"

‎test/Microsoft.AspNet.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ protected static RazorEngineHost CreateHost()
5858
{
5959
return new RazorEngineHost(new TLanguage())
6060
{
61-
GeneratedClassContext = new GeneratedClassContext(new GeneratedTagHelperContext(),
62-
"Execute",
61+
GeneratedClassContext = new GeneratedClassContext("Execute",
6362
"Write",
6463
"WriteLiteral",
6564
"WriteTo",
6665
"WriteLiteralTo",
6766
"Template",
68-
"DefineSection"),
67+
"DefineSection",
68+
new GeneratedTagHelperContext()),
6969
DesignTimeMode = true
7070
};
7171
}

‎test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.cs‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ namespace TestOutput
77

88
public class BasicTagHelpers
99
{
10+
#line hidden
1011
private System.IO.TextWriter __tagHelperStringValueBuffer = null;
11-
private TagHelperExecutionContext __tagHelpersExecutionContext = null;
12+
private TagHelperExecutionContext __tagHelperExecutionContext = null;
1213
private TagHelperRunner __tagHelperRunner = new TagHelperRunner();
1314
private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager();
1415
private PTagHelper __PTagHelper = null;
@@ -25,59 +26,59 @@ public override async Task ExecuteAsync()
2526
Instrumentation.BeginContext(0, 47, true);
2627
WriteLiteral("<div class=\"randomNonTagHelperAttribute\">\r\n ");
2728
Instrumentation.EndContext();
28-
__tagHelpersExecutionContext = __tagHelperScopeManager.Begin("p");
29+
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("p");
2930
__PTagHelper = CreateTagHelper<PTagHelper>();
30-
__tagHelpersExecutionContext.Add(__PTagHelper);
31-
__tagHelpersExecutionContext.AddHtmlAttribute("class", "Hello World");
32-
__tagHelpersExecutionContext.Output = __tagHelperRunner.RunAsync(__tagHelpersExecutionContext).Result;
33-
WriteLiteral(__tagHelpersExecutionContext.Output.GenerateStartTag());
31+
__tagHelperExecutionContext.Add(__PTagHelper);
32+
__tagHelperExecutionContext.AddHtmlAttribute("class", "Hello World");
33+
__tagHelperExecutionContext.Output = __tagHelperRunner.RunAsync(__tagHelperExecutionContext).Result;
34+
WriteLiteral(__tagHelperExecutionContext.Output.GenerateStartTag());
3435
Instrumentation.BeginContext(70, 10, true);
3536
WriteLiteral("\r\n ");
3637
Instrumentation.EndContext();
37-
__tagHelpersExecutionContext = __tagHelperScopeManager.Begin("p");
38+
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("p");
3839
__PTagHelper = CreateTagHelper<PTagHelper>();
39-
__tagHelpersExecutionContext.Add(__PTagHelper);
40-
__tagHelpersExecutionContext.Output = __tagHelperRunner.RunAsync(__tagHelpersExecutionContext).Result;
41-
WriteLiteral(__tagHelpersExecutionContext.Output.GenerateStartTag());
42-
WriteLiteral(__tagHelpersExecutionContext.Output.GenerateEndTag());
43-
__tagHelpersExecutionContext = __tagHelperScopeManager.End();
40+
__tagHelperExecutionContext.Add(__PTagHelper);
41+
__tagHelperExecutionContext.Output = __tagHelperRunner.RunAsync(__tagHelperExecutionContext).Result;
42+
WriteLiteral(__tagHelperExecutionContext.Output.GenerateStartTag());
43+
WriteLiteral(__tagHelperExecutionContext.Output.GenerateEndTag());
44+
__tagHelperExecutionContext = __tagHelperScopeManager.End();
4445
Instrumentation.BeginContext(87, 10, true);
4546
WriteLiteral("\r\n ");
4647
Instrumentation.EndContext();
47-
__tagHelpersExecutionContext = __tagHelperScopeManager.Begin("input");
48+
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input");
4849
__InputTagHelper = CreateTagHelper<InputTagHelper>();
49-
__tagHelpersExecutionContext.Add(__InputTagHelper);
50+
__tagHelperExecutionContext.Add(__InputTagHelper);
5051
__InputTagHelper.Type = "text";
51-
__tagHelpersExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type);
52+
__tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type);
5253
__InputTagHelper2 = CreateTagHelper<InputTagHelper2>();
53-
__tagHelpersExecutionContext.Add(__InputTagHelper2);
54+
__tagHelperExecutionContext.Add(__InputTagHelper2);
5455
__InputTagHelper2.Type = __InputTagHelper.Type;
55-
__tagHelpersExecutionContext.Output = __tagHelperRunner.RunAsync(__tagHelpersExecutionContext).Result;
56-
WriteLiteral(__tagHelpersExecutionContext.Output.GenerateStartTag());
57-
WriteLiteral(__tagHelpersExecutionContext.Output.GenerateEndTag());
58-
__tagHelpersExecutionContext = __tagHelperScopeManager.End();
56+
__tagHelperExecutionContext.Output = __tagHelperRunner.RunAsync(__tagHelperExecutionContext).Result;
57+
WriteLiteral(__tagHelperExecutionContext.Output.GenerateStartTag());
58+
WriteLiteral(__tagHelperExecutionContext.Output.GenerateEndTag());
59+
__tagHelperExecutionContext = __tagHelperScopeManager.End();
5960
Instrumentation.BeginContext(118, 10, true);
6061
WriteLiteral("\r\n ");
6162
Instrumentation.EndContext();
62-
__tagHelpersExecutionContext = __tagHelperScopeManager.Begin("input");
63+
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input");
6364
__InputTagHelper = CreateTagHelper<InputTagHelper>();
64-
__tagHelpersExecutionContext.Add(__InputTagHelper);
65+
__tagHelperExecutionContext.Add(__InputTagHelper);
6566
__InputTagHelper.Type = "checkbox";
66-
__tagHelpersExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type);
67+
__tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type);
6768
__InputTagHelper2 = CreateTagHelper<InputTagHelper2>();
68-
__tagHelpersExecutionContext.Add(__InputTagHelper2);
69+
__tagHelperExecutionContext.Add(__InputTagHelper2);
6970
__InputTagHelper2.Type = __InputTagHelper.Type;
7071
__InputTagHelper2.Checked = true;
71-
__tagHelpersExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked);
72-
__tagHelpersExecutionContext.Output = __tagHelperRunner.RunAsync(__tagHelpersExecutionContext).Result;
73-
WriteLiteral(__tagHelpersExecutionContext.Output.GenerateStartTag());
74-
WriteLiteral(__tagHelpersExecutionContext.Output.GenerateEndTag());
75-
__tagHelpersExecutionContext = __tagHelperScopeManager.End();
72+
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked);
73+
__tagHelperExecutionContext.Output = __tagHelperRunner.RunAsync(__tagHelperExecutionContext).Result;
74+
WriteLiteral(__tagHelperExecutionContext.Output.GenerateStartTag());
75+
WriteLiteral(__tagHelperExecutionContext.Output.GenerateEndTag());
76+
__tagHelperExecutionContext = __tagHelperScopeManager.End();
7677
Instrumentation.BeginContext(167, 6, true);
7778
WriteLiteral("\r\n ");
7879
Instrumentation.EndContext();
79-
WriteLiteral(__tagHelpersExecutionContext.Output.GenerateEndTag());
80-
__tagHelpersExecutionContext = __tagHelperScopeManager.End();
80+
WriteLiteral(__tagHelperExecutionContext.Output.GenerateEndTag());
81+
__tagHelperExecutionContext = __tagHelperScopeManager.End();
8182
Instrumentation.BeginContext(177, 8, true);
8283
WriteLiteral("\r\n</div>");
8384
Instrumentation.EndContext();

0 commit comments

Comments
 (0)