"));
+ var initialNodes = cut.Nodes;
+
+ cut.SetParametersAndRender(ChildContent("
"));
+
+ Assert.NotSame(initialNodes, cut.Nodes);
+ cut.Find("p").ShouldNotBeNull();
+ }
+
+ [Fact(DisplayName = "Nodes should return new instance " +
+ "when a Render has caused changes to DOM tree")]
+ public void Tets005()
+ {
+ var cut = RenderComponent();
+ var initialNodes = cut.Nodes;
+
+ cut.Render();
+
+ Assert.NotSame(initialNodes, cut.Nodes);
+ }
+
+ [Fact(DisplayName = "Nodes should return new instance " +
+ "when a event handler trigger has caused changes to DOM tree")]
+ public void Tets006()
+ {
+ var cut = RenderComponent();
+ var initialNodes = cut.Nodes;
+
+ cut.Find("button").Click();
+
+ Assert.NotSame(initialNodes, cut.Nodes);
+ }
+
+
+ }
+
+}
diff --git a/tests/RenderedFragmentTest.cs b/tests/RenderedFragmentTest.cs
index 2ddaf7cc6..ac8075e5e 100644
--- a/tests/RenderedFragmentTest.cs
+++ b/tests/RenderedFragmentTest.cs
@@ -1,7 +1,7 @@
-using Egil.RazorComponents.Testing.EventDispatchExtensions;
-using Egil.RazorComponents.Testing.Extensions;
+using Egil.RazorComponents.Testing.Extensions;
using Egil.RazorComponents.Testing.SampleComponents;
using Egil.RazorComponents.Testing.SampleComponents.Data;
+using Microsoft.Extensions.DependencyInjection;
using Shouldly;
using System;
using System.Collections.Generic;
@@ -28,104 +28,48 @@ public void Test002()
result.ShouldNotBeNull();
}
- [Fact(DisplayName = "GetNodes should return new instance when " +
+ [Fact(DisplayName = "Nodes should return new instance when " +
"async operation during OnInit causes component to re-render")]
public void Test003()
{
var testData = new AsyncNameDep();
- Services.AddService(testData);
+ Services.AddSingleton(testData);
var cut = RenderComponent();
- var initialValue = cut.GetNodes().Find("p").OuterHtml;
+ var initialValue = cut.Nodes.Find("p").OuterHtml;
WaitForNextRender(() => testData.SetResult("Steve Sanderson"));
- var steveValue = cut.GetNodes().Find("p").OuterHtml;
+ var steveValue = cut.Nodes.Find("p").OuterHtml;
steveValue.ShouldNotBe(initialValue);
}
- [Fact(DisplayName = "GetNodes should return new instance when " +
+ [Fact(DisplayName = "Nodes should return new instance when " +
"async operation/StateHasChanged during OnAfterRender causes component to re-render")]
public void Test004()
{
var invocation = Services.AddMockJsRuntime().Setup("getdata");
var cut = RenderComponent();
- var initialValue = cut.GetNodes().Find("p").OuterHtml;
+ var initialValue = cut.Nodes.Find("p").OuterHtml;
WaitForNextRender(() => invocation.SetResult("Steve Sanderson"));
- var steveValue = cut.GetNodes().Find("p").OuterHtml;
+ var steveValue = cut.Nodes.Find("p").OuterHtml;
steveValue.ShouldNotBe(initialValue);
}
- [Fact(DisplayName = "GetNodes on a components with child component returns " +
+ [Fact(DisplayName = "Nodes on a components with child component returns " +
"new instance when the child component has changes")]
public void Test005()
{
var invocation = Services.AddMockJsRuntime().Setup("getdata");
var notcut = RenderComponent(ChildContent());
var cut = RenderComponent(ChildContent());
- var initialValue = cut.GetNodes();
+ var initialValue = cut.Nodes;
WaitForNextRender(() => invocation.SetResult("Steve Sanderson"), TimeSpan.FromDays(1));
- Assert.NotSame(initialValue, cut.GetNodes());
+ Assert.NotSame(initialValue, cut.Nodes);
}
-
- }
-
- public class RenderComponentTest : ComponentTestFixture
- {
- [Fact(DisplayName = "GetNodes should return the same instance " +
- "when a render has not resulted in any changes")]
- public void Test003()
- {
- var cut = RenderComponent(ChildContent(""));
- var initialNodes = cut.GetNodes();
-
- cut.Render();
- cut.SetParametersAndRender(ChildContent("
"));
-
- Assert.Same(initialNodes, cut.GetNodes());
- }
-
- [Fact(DisplayName = "GetNodes should return new instance " +
- "when a SetParametersAndRender has caused changes to DOM tree")]
- public void Tets004()
- {
- var cut = RenderComponent
(ChildContent(""));
- var initialNodes = cut.GetNodes();
-
- cut.SetParametersAndRender(ChildContent("
"));
-
- Assert.NotSame(initialNodes, cut.GetNodes());
- cut.Find("p").ShouldNotBeNull();
- }
-
- [Fact(DisplayName = "GetNodes should return new instance " +
- "when a Render has caused changes to DOM tree")]
- public void Tets005()
- {
- var cut = RenderComponent();
- var initialNodes = cut.GetNodes();
-
- cut.Render();
-
- Assert.NotSame(initialNodes, cut.GetNodes());
- }
-
- [Fact(DisplayName = "GetNodes should return new instance " +
- "when a event handler trigger has caused changes to DOM tree")]
- public void Tets006()
- {
- var cut = RenderComponent();
- var initialNodes = cut.GetNodes();
-
- cut.Find("button").Click();
-
- Assert.NotSame(initialNodes, cut.GetNodes());
- }
-
-
}
}
diff --git a/tests/Rendering/ComponentParameterTest.cs b/tests/Rendering/ComponentParameterTest.cs
new file mode 100644
index 000000000..291824693
--- /dev/null
+++ b/tests/Rendering/ComponentParameterTest.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Shouldly;
+using Xunit;
+
+namespace Egil.RazorComponents.Testing.Rendering
+{
+ public class ComponentParameterTest
+ {
+ public static IEnumerable GetEqualsTestData()
+ {
+ var name = "foo";
+ var value = "bar";
+ var p1 = ComponentParameter.CreateParameter(name, value);
+ var p2 = ComponentParameter.CreateParameter(name, value);
+ var p3 = ComponentParameter.CreateCascadingValue(name, value);
+ var p4 = ComponentParameter.CreateParameter(string.Empty, value);
+ var p5 = ComponentParameter.CreateParameter(name, string.Empty);
+
+ yield return new object[] { p1, p1, true };
+ yield return new object[] { p1, p2, true };
+ yield return new object[] { p3, p3, true };
+ yield return new object[] { p1, p3, false };
+ yield return new object[] { p1, p4, false };
+ yield return new object[] { p1, p5, false };
+ }
+
+ [Fact(DisplayName = "Creating a cascading value throws")]
+ public void Test001()
+ {
+ Should.Throw(() => ComponentParameter.CreateCascadingValue(null, null!));
+ Should.Throw(() => { ComponentParameter p = (null, null, true); });
+ }
+
+ [Fact(DisplayName = "Creating a regular parameter without a name throws")]
+ public void Test002()
+ {
+ Should.Throw(() => ComponentParameter.CreateParameter(null!, null));
+ Should.Throw(() => { ComponentParameter p = (null, null, false); });
+ }
+
+ [Theory(DisplayName = "Equals compares correctly")]
+ [MemberData(nameof(GetEqualsTestData))]
+ public void Test003(ComponentParameter left, ComponentParameter right, bool expectedResult)
+ {
+ left.Equals(right).ShouldBe(expectedResult);
+ right.Equals(left).ShouldBe(expectedResult);
+ (left == right).ShouldBe(expectedResult);
+ (left != right).ShouldNotBe(expectedResult);
+ left.Equals((object)right).ShouldBe(expectedResult);
+ right.Equals((object)left).ShouldBe(expectedResult);
+ }
+
+ [Fact(DisplayName = "Equals operator works as expected with non compatible types")]
+ public void Test004()
+ {
+ ComponentParameter.CreateParameter(string.Empty, string.Empty)
+ .Equals(new object())
+ .ShouldBeFalse();
+ }
+
+ [Theory(DisplayName = "GetHashCode returns same result for equal ComponentParameter")]
+ [MemberData(nameof(GetEqualsTestData))]
+ public void Test005(ComponentParameter left, ComponentParameter right, bool expectedResult)
+ {
+ left.GetHashCode().Equals(right.GetHashCode()).ShouldBe(expectedResult);
+ }
+ }
+}
diff --git a/tests/TestServiceProviderTest.cs b/tests/TestServiceProviderTest.cs
new file mode 100644
index 000000000..f16208f9d
--- /dev/null
+++ b/tests/TestServiceProviderTest.cs
@@ -0,0 +1,148 @@
+using Egil.RazorComponents.Testing;
+using Egil.RazorComponents.Testing.EventDispatchExtensions;
+using Egil.RazorComponents.Testing.Extensions;
+using Egil.RazorComponents.Testing.Mocking.JSInterop;
+using Egil.RazorComponents.Testing.SampleComponents;
+using Egil.RazorComponents.Testing.SampleComponents.Data;
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xunit;
+
+namespace Egil.RazorComponents.Testing
+{
+ public class TestServiceProviderTest : ComponentTestFixture
+ {
+ class DummyService { }
+ class AnotherDummyService { }
+ class OneMoreDummyService { }
+
+ [Fact(DisplayName = "Provider initialized without a service collection has zero services by default")]
+ public void Test001()
+ {
+ using var sut = new TestServiceProvider();
+
+ sut.Count.ShouldBe(0);
+ }
+
+ [Fact(DisplayName = "Provider initialized with a service collection has the services form the provided collection")]
+ public void Test002()
+ {
+ var services = new ServiceCollection();
+ services.AddSingleton(new DummyService());
+ using var sut = new TestServiceProvider(services);
+
+ sut.Count.ShouldBe(1);
+ sut[0].ServiceType.ShouldBe(typeof(DummyService));
+ }
+
+ [Fact(DisplayName = "Services can be registered in the provider like a normal service collection")]
+ public void Test010()
+ {
+ using var sut = new TestServiceProvider();
+
+ sut.Add(new ServiceDescriptor(typeof(DummyService), new DummyService()));
+ sut.Insert(0, new ServiceDescriptor(typeof(AnotherDummyService), new AnotherDummyService()));
+ sut[1] = new ServiceDescriptor(typeof(DummyService), new DummyService());
+
+ sut.Count.ShouldBe(2);
+ sut[0].ServiceType.ShouldBe(typeof(AnotherDummyService));
+ sut[1].ServiceType.ShouldBe(typeof(DummyService));
+ }
+
+ [Fact(DisplayName = "Services can be removed in the provider like a normal service collection")]
+ public void Test011()
+ {
+ using var sut = new TestServiceProvider();
+ var descriptor = new ServiceDescriptor(typeof(DummyService), new DummyService());
+ var anotherDescriptor = new ServiceDescriptor(typeof(AnotherDummyService), new AnotherDummyService());
+ var oneMoreDescriptor = new ServiceDescriptor(typeof(OneMoreDummyService), new OneMoreDummyService());
+
+ sut.Add(descriptor);
+ sut.Add(anotherDescriptor);
+ sut.Add(oneMoreDescriptor);
+
+ sut.Remove(descriptor);
+ sut.Count.ShouldBe(2);
+
+ sut.RemoveAt(1);
+ sut.Count.ShouldBe(1);
+
+ sut.Clear();
+ sut.ShouldBeEmpty();
+ }
+
+ [Fact(DisplayName = "Misc collection methods works as expected")]
+ public void Test012()
+ {
+ using var sut = new TestServiceProvider();
+ var descriptor = new ServiceDescriptor(typeof(DummyService), new DummyService());
+ var copyToTarget = new ServiceDescriptor[1];
+ sut.Add(descriptor);
+
+ sut.IndexOf(descriptor).ShouldBe(0);
+ sut.Contains(descriptor).ShouldBeTrue();
+ sut.CopyTo(copyToTarget, 0);
+ copyToTarget[0].ShouldBe(descriptor);
+ sut.IsReadOnly.ShouldBeFalse();
+ ((IEnumerable)sut).OfType().Count().ShouldBe(1);
+ }
+
+ [Fact(DisplayName = "After the first service is requested, " +
+ "the provider does not allow changes to service collection")]
+ public void Test013()
+ {
+ var descriptor = new ServiceDescriptor(typeof(AnotherDummyService), new AnotherDummyService());
+
+ using var sut = new TestServiceProvider();
+ sut.AddSingleton(new DummyService());
+ sut.GetService();
+
+ // Try adding
+ Should.Throw(() => sut.Add(descriptor));
+ Should.Throw(() => sut.Insert(0, descriptor));
+ Should.Throw(() => sut[0] = descriptor);
+
+ // Try removing
+ Should.Throw(() => sut.Remove(descriptor));
+ Should.Throw