Update test files to react to new `TagHelperScopeManager` contract.

#720
This commit is contained in:
N. Taylor Mullen 2016-03-29 22:05:37 -07:00
parent f5c79b62de
commit 714dd5fa9e
1 changed files with 20 additions and 15 deletions

View File

@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
public void Begin_DoesNotRequireParentExecutionContext() public void Begin_DoesNotRequireParentExecutionContext()
{ {
// Arrange & Act // Arrange & Act
var scopeManager = new TagHelperScopeManager(); var scopeManager = CreateDefaultScopeManager();
// Act // Act
var executionContext = BeginDefaultScope(scopeManager, tagName: "p"); var executionContext = BeginDefaultScope(scopeManager, tagName: "p");
@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
public void Begin_ReturnedExecutionContext_ItemsAreRetrievedFromParentExecutionContext() public void Begin_ReturnedExecutionContext_ItemsAreRetrievedFromParentExecutionContext()
{ {
// Arrange // Arrange
var scopeManager = new TagHelperScopeManager(); var scopeManager = CreateDefaultScopeManager();
var parentExecutionContext = BeginDefaultScope(scopeManager, tagName: "p"); var parentExecutionContext = BeginDefaultScope(scopeManager, tagName: "p");
parentExecutionContext.Items["test-entry"] = 1234; parentExecutionContext.Items["test-entry"] = 1234;
@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
public void Begin_DoesShallowCopyOfParentItems() public void Begin_DoesShallowCopyOfParentItems()
{ {
// Arrange // Arrange
var scopeManager = new TagHelperScopeManager(); var scopeManager = CreateDefaultScopeManager();
var parentComplexObject = new Dictionary<string, int>(StringComparer.Ordinal); var parentComplexObject = new Dictionary<string, int>(StringComparer.Ordinal);
var parentExecutionContext = BeginDefaultScope(scopeManager, tagName: "p"); var parentExecutionContext = BeginDefaultScope(scopeManager, tagName: "p");
parentExecutionContext.Items["test-entry"] = parentComplexObject; parentExecutionContext.Items["test-entry"] = parentComplexObject;
@ -70,7 +70,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
public void Begin_ReturnedExecutionContext_ItemsModificationDoesNotAffectParent() public void Begin_ReturnedExecutionContext_ItemsModificationDoesNotAffectParent()
{ {
// Arrange // Arrange
var scopeManager = new TagHelperScopeManager(); var scopeManager = CreateDefaultScopeManager();
var parentExecutionContext = BeginDefaultScope(scopeManager, tagName: "p"); var parentExecutionContext = BeginDefaultScope(scopeManager, tagName: "p");
parentExecutionContext.Items["test-entry"] = 1234; parentExecutionContext.Items["test-entry"] = 1234;
var executionContext = BeginDefaultScope(scopeManager, tagName: "p"); var executionContext = BeginDefaultScope(scopeManager, tagName: "p");
@ -91,7 +91,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
public void Begin_ReturnedExecutionContext_ItemsInsertionDoesNotAffectParent() public void Begin_ReturnedExecutionContext_ItemsInsertionDoesNotAffectParent()
{ {
// Arrange // Arrange
var scopeManager = new TagHelperScopeManager(); var scopeManager = CreateDefaultScopeManager();
var parentExecutionContext = BeginDefaultScope(scopeManager, tagName: "p"); var parentExecutionContext = BeginDefaultScope(scopeManager, tagName: "p");
var executionContext = BeginDefaultScope(scopeManager, tagName: "p"); var executionContext = BeginDefaultScope(scopeManager, tagName: "p");
@ -109,7 +109,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
public void Begin_ReturnedExecutionContext_ItemsRemovalDoesNotAffectParent() public void Begin_ReturnedExecutionContext_ItemsRemovalDoesNotAffectParent()
{ {
// Arrange // Arrange
var scopeManager = new TagHelperScopeManager(); var scopeManager = CreateDefaultScopeManager();
var parentExecutionContext = BeginDefaultScope(scopeManager, tagName: "p"); var parentExecutionContext = BeginDefaultScope(scopeManager, tagName: "p");
parentExecutionContext.Items["test-entry"] = 1234; parentExecutionContext.Items["test-entry"] = 1234;
var executionContext = BeginDefaultScope(scopeManager, tagName: "p"); var executionContext = BeginDefaultScope(scopeManager, tagName: "p");
@ -128,7 +128,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
public void Begin_CreatesContexts_TagHelperOutput_WithAppropriateTagName() public void Begin_CreatesContexts_TagHelperOutput_WithAppropriateTagName()
{ {
// Arrange // Arrange
var scopeManager = new TagHelperScopeManager(); var scopeManager = CreateDefaultScopeManager();
// Act // Act
var executionContext = BeginDefaultScope(scopeManager, tagName: "p"); var executionContext = BeginDefaultScope(scopeManager, tagName: "p");
@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
public void Begin_CanNest() public void Begin_CanNest()
{ {
// Arrange // Arrange
var scopeManager = new TagHelperScopeManager(); var scopeManager = CreateDefaultScopeManager();
// Act // Act
var executionContext = BeginDefaultScope(scopeManager, tagName: "p"); var executionContext = BeginDefaultScope(scopeManager, tagName: "p");
@ -160,7 +160,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
public void Begin_SetsExecutionContexts_TagHelperOutputTagMode(TagMode tagMode) public void Begin_SetsExecutionContexts_TagHelperOutputTagMode(TagMode tagMode)
{ {
// Arrange // Arrange
var scopeManager = new TagHelperScopeManager(); var scopeManager = CreateDefaultScopeManager();
// Act // Act
var executionContext = BeginDefaultScope(scopeManager, "p", tagMode); var executionContext = BeginDefaultScope(scopeManager, "p", tagMode);
@ -174,7 +174,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
public void End_ReturnsParentExecutionContext() public void End_ReturnsParentExecutionContext()
{ {
// Arrange // Arrange
var scopeManager = new TagHelperScopeManager(); var scopeManager = CreateDefaultScopeManager();
// Act // Act
var executionContext = BeginDefaultScope(scopeManager, tagName: "p"); var executionContext = BeginDefaultScope(scopeManager, tagName: "p");
@ -190,7 +190,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
public void End_ReturnsNullIfNoNestedContext() public void End_ReturnsNullIfNoNestedContext()
{ {
// Arrange // Arrange
var scopeManager = new TagHelperScopeManager(); var scopeManager = CreateDefaultScopeManager();
// Act // Act
var executionContext = BeginDefaultScope(scopeManager, tagName: "p"); var executionContext = BeginDefaultScope(scopeManager, tagName: "p");
@ -206,7 +206,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
public void End_ThrowsIfNoScope() public void End_ThrowsIfNoScope()
{ {
// Arrange // Arrange
var scopeManager = new TagHelperScopeManager(); var scopeManager = CreateDefaultScopeManager();
var expectedError = string.Format( var expectedError = string.Format(
"Must call '{2}.{1}' before calling '{2}.{0}'.", "Must call '{2}.{1}' before calling '{2}.{0}'.",
nameof(TagHelperScopeManager.End), nameof(TagHelperScopeManager.End),
@ -222,6 +222,13 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
Assert.Equal(expectedError, ex.Message); Assert.Equal(expectedError, ex.Message);
} }
private static TagHelperScopeManager CreateDefaultScopeManager()
{
return new TagHelperScopeManager(
startTagHelperWritingScope: _ => { },
endTagHelperWritingScope: () => new DefaultTagHelperContent());
}
private static TagHelperExecutionContext BeginDefaultScope( private static TagHelperExecutionContext BeginDefaultScope(
TagHelperScopeManager scopeManager, TagHelperScopeManager scopeManager,
string tagName, string tagName,
@ -231,9 +238,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
tagName, tagName,
tagMode, tagMode,
uniqueId: string.Empty, uniqueId: string.Empty,
executeChildContentAsync: async () => await Task.FromResult(result: true), executeChildContentAsync: async () => await Task.FromResult(result: true));
startTagHelperWritingScope: _ => { },
endTagHelperWritingScope: () => new DefaultTagHelperContent());
} }
} }
} }