huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename RenderTreeBuilder's AddText to AddContent, since it will be used for other types too

This commit is contained in:
Steve Sanderson 2018-02-16 08:55:53 +00:00
parent acc5b9461b
commit 1ac5ee25c1
7 changed files with 147 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorIntermediateNodeWriter.cs
View File

@ -119,7 +119,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor
// Since we're not in the middle of writing an element, this must evaluate as some
// text to display
context.CodeWriter
.WriteStartMethodInvocation($"{builderVarName}.{nameof(RenderTreeBuilder.AddText)}")
.WriteStartMethodInvocation($"{builderVarName}.{nameof(RenderTreeBuilder.AddContent)}")
.Write((_sourceSequence++).ToString())
.WriteParameterSeparator();
@ -208,7 +208,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor
{
// Text node
codeWriter
.WriteStartMethodInvocation($"{builderVarName}.{nameof(RenderTreeBuilder.AddText)}")
.WriteStartMethodInvocation($"{builderVarName}.{nameof(RenderTreeBuilder.AddContent)}")
.Write((_sourceSequence++).ToString())
.WriteParameterSeparator()
.WriteStringLiteral(nextToken.Data)

2
src/Microsoft.AspNetCore.Blazor.Razor.Extensions/RenderTreeBuilder.cs
View File

@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor
public static readonly string CloseComponent = nameof(CloseElement);
public static readonly string AddText = nameof(AddText);
public static readonly string AddContent = nameof(AddContent);
public static readonly string AddAttribute = nameof(AddAttribute);

6
src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeBuilder.cs
View File

@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Blazor.RenderTree
/// </summary>
/// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
/// <param name="textContent">Content for the new text frame.</param>
public void AddText(int sequence, string textContent)
public void AddContent(int sequence, string textContent)
=> Append(RenderTreeFrame.Text(sequence, textContent ?? string.Empty));
/// <summary>
@ -70,8 +70,8 @@ namespace Microsoft.AspNetCore.Blazor.RenderTree
/// </summary>
/// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
/// <param name="textContent">Content for the new text frame.</param>
public void AddText(int sequence, object textContent)
=> AddText(sequence, textContent?.ToString());
public void AddContent(int sequence, object textContent)
=> AddContent(sequence, textContent?.ToString());
/// <summary>
/// Appends a frame representing a string-valued attribute.

64
test/Microsoft.AspNetCore.Blazor.Test/RenderTreeBuilderTest.cs
View File

@ -42,9 +42,9 @@ namespace Microsoft.AspNetCore.Blazor.Test
var nullString = (string)null;
// Act
builder.AddText(0, "First item");
builder.AddText(0, nullString);
builder.AddText(0, "Second item");
builder.AddContent(0, "First item");
builder.AddContent(0, nullString);
builder.AddContent(0, "Second item");
// Assert
var frames = builder.GetFrames();
@ -62,8 +62,8 @@ namespace Microsoft.AspNetCore.Blazor.Test
var nullObject = (object)null;
// Act
builder.AddText(0, 1234);
builder.AddText(0, nullObject);
builder.AddContent(0, 1234);
builder.AddContent(0, nullObject);
// Assert
var frames = builder.GetFrames();
@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
var builder = new RenderTreeBuilder(new TestRenderer());
// Act
builder.AddText(0, "some frame so that the element isn't at position zero");
builder.AddContent(0, "some frame so that the element isn't at position zero");
builder.OpenElement(0, "my element");
builder.CloseElement();
@ -111,10 +111,10 @@ namespace Microsoft.AspNetCore.Blazor.Test
// Act
builder.OpenElement(0, "my element");
builder.AddText(0, "child 1");
builder.AddText(0, "child 2");
builder.AddContent(0, "child 1");
builder.AddContent(0, "child 2");
builder.CloseElement();
builder.AddText(0, "unrelated item");
builder.AddContent(0, "unrelated item");
// Assert
var frames = builder.GetFrames();
@ -129,22 +129,22 @@ namespace Microsoft.AspNetCore.Blazor.Test
var builder = new RenderTreeBuilder(new TestRenderer());
// Act
builder.AddText(0, "standalone text 1"); // 0: standalone text 1
builder.OpenElement(0, "root"); // 1: <root>
builder.AddText(0, "root text 1"); // 2: root text 1
builder.AddText(0, "root text 2"); // 3: root text 2
builder.OpenElement(0, "child"); // 4: <child>
builder.AddText(0, "child text"); // 5: child text
builder.OpenElement(0, "grandchild"); // 6: <grandchild>
builder.AddText(0, "grandchild text 1"); // 7: grandchild text 1
builder.AddText(0, "grandchild text 2"); // 8: grandchild text 2
builder.CloseElement(); // </grandchild>
builder.CloseElement(); // </child>
builder.AddText(0, "root text 3"); // 9: root text 3
builder.OpenElement(0, "child 2"); // 10: <child 2>
builder.CloseElement(); // </child 2>
builder.CloseElement(); // </root>
builder.AddText(0, "standalone text 2"); // 11: standalone text 2
builder.AddContent(0, "standalone text 1"); // 0: standalone text 1
builder.OpenElement(0, "root"); // 1: <root>
builder.AddContent(0, "root text 1"); // 2: root text 1
builder.AddContent(0, "root text 2"); // 3: root text 2
builder.OpenElement(0, "child"); // 4: <child>
builder.AddContent(0, "child text"); // 5: child text
builder.OpenElement(0, "grandchild"); // 6: <grandchild>
builder.AddContent(0, "grandchild text 1"); // 7: grandchild text 1
builder.AddContent(0, "grandchild text 2"); // 8: grandchild text 2
builder.CloseElement(); // </grandchild>
builder.CloseElement(); // </child>
builder.AddContent(0, "root text 3"); // 9: root text 3
builder.OpenElement(0, "child 2"); // 10: <child 2>
builder.CloseElement(); // </child 2>
builder.CloseElement(); // </root>
builder.AddContent(0, "standalone text 2"); // 11: standalone text 2
// Assert
Assert.Collection(builder.GetFrames(),
@ -175,7 +175,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
builder.AddAttribute(0, "attribute2", 123); // 2: attribute2=intExpression123>
builder.OpenElement(0, "child"); // 3: <child
builder.AddAttribute(0, "childevent", eventHandler); // 4: childevent=eventHandler>
builder.AddText(0, "some text"); // 5: some text
builder.AddContent(0, "some text"); // 5: some text
builder.CloseElement(); // </child>
builder.CloseElement(); // </myelement>
@ -225,7 +225,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
Assert.Throws<InvalidOperationException>(() =>
{
builder.OpenElement(0, "some element");
builder.AddText(1, "hello");
builder.AddContent(1, "hello");
builder.AddAttribute(2, "name", "value");
});
}
@ -240,7 +240,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
Assert.Throws<InvalidOperationException>(() =>
{
builder.OpenElement(0, "some element");
builder.AddText(1, "hello");
builder.AddContent(1, "hello");
builder.AddAttribute(2, "name", eventInfo => { });
});
}
@ -323,12 +323,12 @@ namespace Microsoft.AspNetCore.Blazor.Test
// Act
builder.OpenElement(10, "parent"); // 0: <parent>
builder.OpenRegion(11); // 1: [region
builder.AddText(3, "Hello"); // 2: Hello
builder.AddContent(3, "Hello"); // 2: Hello
builder.OpenRegion(4); // 3: [region
builder.OpenElement(3, "another"); // 4: <another>
builder.CloseElement(); // </another>
builder.CloseRegion(); // ]
builder.AddText(6, "Goodbye"); // 5: Goodbye
builder.AddContent(6, "Goodbye"); // 5: Goodbye
builder.CloseRegion(); // ]
builder.CloseElement(); // </parent>
@ -349,9 +349,9 @@ namespace Microsoft.AspNetCore.Blazor.Test
var builder = new RenderTreeBuilder(new TestRenderer());
// Act
builder.AddText(0, "some text");
builder.AddContent(0, "some text");
builder.OpenElement(1, "elem");
builder.AddText(2, "more text");
builder.AddContent(2, "more text");
builder.CloseElement();
builder.Clear();

192
test/Microsoft.AspNetCore.Blazor.Test/RenderTreeDiffBuilderTest.cs
View File

@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
public static IEnumerable<object[]> RecognizesEquivalentFramesAsSameCases()
=> new Action<RenderTreeBuilder>[]
{
builder => builder.AddText(0, "Hello"),
builder => builder.AddContent(0, "Hello"),
builder => builder.OpenElement(0, "Some Element"),
builder =>
{
@ -62,11 +62,11 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesNewItemsBeingInserted()
{
// Arrange
oldTree.AddText(0, "text0");
oldTree.AddText(2, "text2");
newTree.AddText(0, "text0");
newTree.AddText(1, "text1");
newTree.AddText(2, "text2");
oldTree.AddContent(0, "text0");
oldTree.AddContent(2, "text2");
newTree.AddContent(0, "text0");
newTree.AddContent(1, "text1");
newTree.AddContent(2, "text2");
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -85,11 +85,11 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesOldItemsBeingRemoved()
{
// Arrange
oldTree.AddText(0, "text0");
oldTree.AddText(1, "text1");
oldTree.AddText(2, "text2");
newTree.AddText(0, "text0");
newTree.AddText(2, "text2");
oldTree.AddContent(0, "text0");
oldTree.AddContent(1, "text1");
oldTree.AddContent(2, "text2");
newTree.AddContent(0, "text0");
newTree.AddContent(2, "text2");
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -103,12 +103,12 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesTrailingSequenceWithinLoopBlockBeingRemoved()
{
// Arrange
oldTree.AddText(0, "x"); // Loop start
oldTree.AddText(1, "x"); // Will be removed
oldTree.AddText(2, "x"); // Will be removed
oldTree.AddText(0, "x"); // Loop start
newTree.AddText(0, "x"); // Loop start
newTree.AddText(0, "x"); // Loop start
oldTree.AddContent(0, "x"); // Loop start
oldTree.AddContent(1, "x"); // Will be removed
oldTree.AddContent(2, "x"); // Will be removed
oldTree.AddContent(0, "x"); // Loop start
newTree.AddContent(0, "x"); // Loop start
newTree.AddContent(0, "x"); // Loop start
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -123,12 +123,12 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesTrailingSequenceWithinLoopBlockBeingAppended()
{
// Arrange
oldTree.AddText(10, "x"); // Loop start
oldTree.AddText(10, "x"); // Loop start
newTree.AddText(10, "x"); // Loop start
newTree.AddText(11, "x"); // Will be added
newTree.AddText(12, "x"); // Will be added
newTree.AddText(10, "x"); // Loop start
oldTree.AddContent(10, "x"); // Loop start
oldTree.AddContent(10, "x"); // Loop start
newTree.AddContent(10, "x"); // Loop start
newTree.AddContent(11, "x"); // Will be added
newTree.AddContent(12, "x"); // Will be added
newTree.AddContent(10, "x"); // Loop start
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -153,12 +153,12 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesTrailingLoopBlockBeingRemoved()
{
// Arrange
oldTree.AddText(0, "x");
oldTree.AddText(1, "x");
oldTree.AddText(0, "x"); // Will be removed
oldTree.AddText(1, "x"); // Will be removed
newTree.AddText(0, "x");
newTree.AddText(1, "x");
oldTree.AddContent(0, "x");
oldTree.AddContent(1, "x");
oldTree.AddContent(0, "x"); // Will be removed
oldTree.AddContent(1, "x"); // Will be removed
newTree.AddContent(0, "x");
newTree.AddContent(1, "x");
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -173,12 +173,12 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesTrailingLoopBlockBeingAdded()
{
// Arrange
oldTree.AddText(10, "x");
oldTree.AddText(11, "x");
newTree.AddText(10, "x");
newTree.AddText(11, "x");
newTree.AddText(10, "x"); // Will be added
newTree.AddText(11, "x"); // Will be added
oldTree.AddContent(10, "x");
oldTree.AddContent(11, "x");
newTree.AddContent(10, "x");
newTree.AddContent(11, "x");
newTree.AddContent(10, "x"); // Will be added
newTree.AddContent(11, "x"); // Will be added
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -203,12 +203,12 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesLeadingLoopBlockItemsBeingAdded()
{
// Arrange
oldTree.AddText(12, "x");
oldTree.AddText(12, "x"); // Note that the '0' and '1' items are not present on this iteration
newTree.AddText(12, "x");
newTree.AddText(10, "x");
newTree.AddText(11, "x");
newTree.AddText(12, "x");
oldTree.AddContent(12, "x");
oldTree.AddContent(12, "x"); // Note that the '0' and '1' items are not present on this iteration
newTree.AddContent(12, "x");
newTree.AddContent(10, "x");
newTree.AddContent(11, "x");
newTree.AddContent(12, "x");
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -233,12 +233,12 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesLeadingLoopBlockItemsBeingRemoved()
{
// Arrange
oldTree.AddText(2, "x");
oldTree.AddText(0, "x");
oldTree.AddText(1, "x");
oldTree.AddText(2, "x");
newTree.AddText(2, "x");
newTree.AddText(2, "x"); // Note that the '0' and '1' items are not present on this iteration
oldTree.AddContent(2, "x");
oldTree.AddContent(0, "x");
oldTree.AddContent(1, "x");
oldTree.AddContent(2, "x");
newTree.AddContent(2, "x");
newTree.AddContent(2, "x"); // Note that the '0' and '1' items are not present on this iteration
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -253,8 +253,8 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void HandlesAdjacentItemsBeingRemovedAndInsertedAtOnce()
{
// Arrange
oldTree.AddText(0, "text");
newTree.AddText(1, "text");
oldTree.AddContent(0, "text");
newTree.AddContent(1, "text");
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -269,10 +269,10 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesTextUpdates()
{
// Arrange
oldTree.AddText(123, "old text 1");
oldTree.AddText(182, "old text 2");
newTree.AddText(123, "new text 1");
newTree.AddText(182, "new text 2");
oldTree.AddContent(123, "old text 1");
oldTree.AddContent(182, "old text 2");
newTree.AddContent(123, "new text 1");
newTree.AddContent(182, "new text 2");
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -479,20 +479,20 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void DiffsElementsHierarchically()
{
// Arrange
oldTree.AddText(09, "unrelated");
oldTree.AddContent(09, "unrelated");
oldTree.OpenElement(10, "root");
oldTree.OpenElement(11, "child");
oldTree.OpenElement(12, "grandchild");
oldTree.AddText(13, "grandchild old text");
oldTree.AddContent(13, "grandchild old text");
oldTree.CloseElement();
oldTree.CloseElement();
oldTree.CloseElement();
newTree.AddText(09, "unrelated");
newTree.AddContent(09, "unrelated");
newTree.OpenElement(10, "root");
newTree.OpenElement(11, "child");
newTree.OpenElement(12, "grandchild");
newTree.AddText(13, "grandchild new text");
newTree.AddContent(13, "grandchild new text");
newTree.CloseElement();
newTree.CloseElement();
newTree.CloseElement();
@ -521,19 +521,19 @@ namespace Microsoft.AspNetCore.Blazor.Test
{
// Arrange
oldTree.OpenElement(10, "root");
oldTree.AddText(11, "Text that will change");
oldTree.AddContent(11, "Text that will change");
oldTree.OpenElement(12, "Subtree that will not change");
oldTree.OpenElement(13, "Another");
oldTree.AddText(14, "Text that will not change");
oldTree.AddContent(14, "Text that will not change");
oldTree.CloseElement();
oldTree.CloseElement();
oldTree.CloseElement();
newTree.OpenElement(10, "root");
newTree.AddText(11, "Text that has changed");
newTree.AddContent(11, "Text that has changed");
newTree.OpenElement(12, "Subtree that will not change");
newTree.OpenElement(13, "Another");
newTree.AddText(14, "Text that will not change");
newTree.AddContent(14, "Text that will not change");
newTree.CloseElement();
newTree.CloseElement();
newTree.CloseElement();
@ -557,14 +557,14 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void SkipsUnmodifiedTrailingSiblings()
{
// Arrange
oldTree.AddText(10, "text1");
oldTree.AddText(11, "text2");
oldTree.AddText(12, "text3");
oldTree.AddText(13, "text4");
newTree.AddText(10, "text1");
newTree.AddText(11, "text2modified");
newTree.AddText(12, "text3");
newTree.AddText(13, "text4");
oldTree.AddContent(10, "text1");
oldTree.AddContent(11, "text2");
oldTree.AddContent(12, "text3");
oldTree.AddContent(13, "text4");
newTree.AddContent(10, "text1");
newTree.AddContent(11, "text2modified");
newTree.AddContent(12, "text3");
newTree.AddContent(13, "text4");
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -583,11 +583,11 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void PassesThroughRegionsInsidePrependedElements()
{
// Arrange
oldTree.AddText(0, "Will not change");
newTree.AddText(0, "Will not change");
oldTree.AddContent(0, "Will not change");
newTree.AddContent(0, "Will not change");
newTree.OpenElement(1, "root");
newTree.OpenRegion(2);
newTree.AddText(0, "text1");
newTree.AddContent(0, "text1");
newTree.CloseRegion();
newTree.CloseElement();
@ -611,16 +611,16 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesInsertedRegions()
{
// Arrange
oldTree.AddText(1, "Start");
oldTree.AddText(3, "End");
newTree.AddText(1, "Start");
oldTree.AddContent(1, "Start");
oldTree.AddContent(3, "End");
newTree.AddContent(1, "Start");
newTree.OpenRegion(2);
newTree.AddText(4, "Text inside region"); // Sequence number is unrelated to outside the region
newTree.AddContent(4, "Text inside region"); // Sequence number is unrelated to outside the region
newTree.OpenRegion(5);
newTree.AddText(6, "Text inside nested region");
newTree.AddContent(6, "Text inside nested region");
newTree.CloseRegion();
newTree.CloseRegion();
newTree.AddText(3, "End");
newTree.AddContent(3, "End");
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -645,16 +645,16 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesRemovedRegions()
{
// Arrange
oldTree.AddText(1, "Start");
oldTree.AddContent(1, "Start");
oldTree.OpenRegion(2);
oldTree.AddText(4, "Text inside region"); // Sequence number is unrelated to outside the region
oldTree.AddContent(4, "Text inside region"); // Sequence number is unrelated to outside the region
oldTree.OpenRegion(5);
oldTree.AddText(6, "Text inside nested region");
oldTree.AddContent(6, "Text inside nested region");
oldTree.CloseRegion();
oldTree.CloseRegion();
oldTree.AddText(3, "End");
newTree.AddText(1, "Start");
newTree.AddText(3, "End");
oldTree.AddContent(3, "End");
newTree.AddContent(1, "Start");
newTree.AddContent(3, "End");
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -669,22 +669,22 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RecognizesEquivalentRegions()
{
// Arrange
oldTree.AddText(1, "Start");
oldTree.AddContent(1, "Start");
oldTree.OpenRegion(2);
oldTree.AddText(4, "Text inside region");
oldTree.AddText(5, "Text to move");
oldTree.AddContent(4, "Text inside region");
oldTree.AddContent(5, "Text to move");
oldTree.OpenRegion(6);
oldTree.CloseRegion();
oldTree.CloseRegion();
oldTree.AddText(3, "End");
newTree.AddText(1, "Start");
oldTree.AddContent(3, "End");
newTree.AddContent(1, "Start");
newTree.OpenRegion(2);
newTree.AddText(4, "Changed text inside region");
newTree.AddContent(4, "Changed text inside region");
newTree.OpenRegion(6);
newTree.AddText(5, "Text to move"); // Although it's the same sequence and content, it's now in a different region so not the same
newTree.AddContent(5, "Text to move"); // Although it's the same sequence and content, it's now in a different region so not the same
newTree.CloseRegion();
newTree.CloseRegion();
newTree.AddText(3, "End");
newTree.AddContent(3, "End");
// Act
var (result, referenceFrames) = GetSingleUpdatedComponent();
@ -710,10 +710,10 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void InstantiatesChildComponentsForInsertedFrames()
{
// Arrange
oldTree.AddText(10, "text1"); // 0: text1
oldTree.AddContent(10, "text1"); // 0: text1
oldTree.OpenElement(11, "container"); // 1: <container>
oldTree.CloseElement(); // </container>
newTree.AddText(10, "text1"); // 0: text1
newTree.AddContent(10, "text1"); // 0: text1
newTree.OpenElement(11, "container"); // 1: <container>
newTree.OpenComponent<FakeComponent>(12); // 2: <FakeComponent>
newTree.CloseComponent(); // </FakeComponent>
@ -772,14 +772,14 @@ namespace Microsoft.AspNetCore.Blazor.Test
public void RetainsChildComponentsForExistingFrames()
{
// Arrange
oldTree.AddText(10, "text1"); // 0: text1
oldTree.AddContent(10, "text1"); // 0: text1
oldTree.OpenElement(11, "container"); // 1: <container>
oldTree.OpenComponent<FakeComponent>(12); // 2: <FakeComponent>
oldTree.CloseComponent(); // </FakeComponent>
oldTree.OpenComponent<FakeComponent2>(13); // 3: <FakeComponent2>
oldTree.CloseComponent(); // </FakeComponent2>
oldTree.CloseElement(); // </container>
newTree.AddText(10, "text1"); // 0: text1
newTree.AddContent(10, "text1"); // 0: text1
newTree.OpenElement(11, "container"); // 1: <container>
newTree.OpenComponent<FakeComponent>(12); // 2: <FakeComponent>
newTree.CloseComponent(); // </FakeComponent>

18
test/Microsoft.AspNetCore.Blazor.Test/RendererTest.cs
View File

@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
var component = new TestComponent(builder =>
{
builder.OpenElement(0, "my element");
builder.AddText(1, "some text");
builder.AddContent(1, "some text");
builder.CloseElement();
});
@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
var renderer = new TestRenderer();
var component = new TestComponent(builder =>
{
builder.AddText(0, "Hello");
builder.AddContent(0, "Hello");
builder.OpenComponent<MessageComponent>(1);
builder.AddAttribute(2, nameof(MessageComponent.Message), "Nested component output");
builder.CloseComponent();
@ -314,7 +314,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
var message = "Hello";
var component = new TestComponent(builder =>
{
builder.AddText(0, message);
builder.AddContent(0, message);
builder.OpenComponent<MessageComponent>(1);
builder.CloseComponent();
});
@ -634,7 +634,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
var renderCount = 0;
var component = new TestComponent(builder =>
{
builder.AddText(0, $"Render count: {++renderCount}");
builder.AddContent(0, $"Render count: {++renderCount}");
});
var componentId = renderer.AssignComponentId(component);
@ -670,7 +670,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
builder.OpenComponent<ReRendersParentComponent>(0);
builder.AddAttribute(1, nameof(ReRendersParentComponent.Parent), parent);
builder.CloseComponent();
builder.AddText(2, $"Parent render count: {++parentRenderCount}");
builder.AddContent(2, $"Parent render count: {++parentRenderCount}");
});
var parentComponentId = renderer.AssignComponentId(parent);
@ -815,7 +815,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
protected override void BuildRenderTree(RenderTreeBuilder builder)
{
builder.AddText(0, Message);
builder.AddContent(0, Message);
}
}
@ -866,7 +866,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
protected override void BuildRenderTree(RenderTreeBuilder builder)
{
builder.AddText(0, "Parent here");
builder.AddContent(0, "Parent here");
if (IncludeChild)
{
@ -897,7 +897,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
Parent.TriggerRender();
}
builder.AddText(0, "Child is here");
builder.AddContent(0, "Child is here");
}
}
@ -919,7 +919,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
{
renderHandle.Render(builder =>
{
builder.AddText(0, $"Hello from {nameof(MultiRendererComponent)}");
builder.AddContent(0, $"Hello from {nameof(MultiRendererComponent)}");
});
}
}

8
test/testapps/BasicTestApp/RenderBlockComponent.cs
View File

@ -25,7 +25,7 @@ namespace BasicTestApp
builder.OpenElement(100, "p");
builder.AddAttribute(101, "name", "region-element");
builder.AddAttribute(102, "style", "color: red");
builder.AddText(103, "This is from the region");
builder.AddContent(103, "This is from the region");
builder.CloseElement();
};
@ -47,7 +47,7 @@ namespace BasicTestApp
{
builder.OpenElement(0, "div"); // Container so we can see that passing through regions is OK
builder.OpenRegion(1);
builder.AddText(2, "Region will be toggled below ");
builder.AddContent(2, "Region will be toggled below ");
if (_showRegion)
{
@ -58,12 +58,12 @@ namespace BasicTestApp
builder.OpenElement(4, "button");
builder.AddAttribute(5, "onclick", ToggleRegion);
builder.AddText(6, "Toggle");
builder.AddContent(6, "Toggle");
builder.CloseElement();
builder.CloseRegion();
builder.OpenElement(7, "p");
builder.AddText(8, "The end");
builder.AddContent(8, "The end");
builder.CloseElement();
builder.CloseElement();
});