moved stuff to core

Author: egil

src/bunit.core/Rendering/ComponentNotFoundException.cs

@@ -1,18 +1,18 @@
 using System;
 
-namespace Bunit
+namespace Bunit.Rendering
 {
-    /// <summary>
-    /// Represents an exception that is thrown when a search for a component did not succeed.
-    /// </summary>
-    public class ComponentNotFoundException : Exception
-    {
-        /// <summary>
-        /// Creates an instance of the <see cref="ComponentNotFoundException"/> type.
-        /// </summary>
-        /// <param name="componentType">The type of component that was not found.</param>
-        public ComponentNotFoundException(Type componentType) : base($"A component of type {componentType?.Name} was not found in the render tree.")
-        {
-        }
-    }
+	/// <summary>
+	/// Represents an exception that is thrown when a search for a component did not succeed.
+	/// </summary>
+	public class ComponentNotFoundException : Exception
+	{
+		/// <summary>
+		/// Creates an instance of the <see cref="ComponentNotFoundException"/> type.
+		/// </summary>
+		/// <param name="componentType">The type of component that was not found.</param>
+		public ComponentNotFoundException(Type componentType) : base($"A component of type {componentType?.Name} was not found in the render tree.")
+		{
+		}
+	}
 }

src/bunit.core/Rendering/ComponentParameter.cs

@@ -1,87 +1,87 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Bunit
+namespace Bunit.Rendering
 {
-    /// <summary>
-    /// Represents a single parameter supplied to an <see cref="Microsoft.AspNetCore.Components.IComponent"/>
-    /// component under test.
-    /// </summary>    
-    [SuppressMessage("Usage", "CA2225:Operator overloads have named alternates", Justification = "<Pending>")]
-    public readonly struct ComponentParameter : IEquatable<ComponentParameter>
-    {
-        /// <summary>
-        /// Gets the name of the parameter. Can be null if the parameter is for an unnamed cascading value.
-        /// </summary>
-        public string? Name { get; }
+	/// <summary>
+	/// Represents a single parameter supplied to an <see cref="Microsoft.AspNetCore.Components.IComponent"/>
+	/// component under test.
+	/// </summary>    
+	[SuppressMessage("Usage", "CA2225:Operator overloads have named alternates", Justification = "<Pending>")]
+	public readonly struct ComponentParameter : IEquatable<ComponentParameter>
+	{
+		/// <summary>
+		/// Gets the name of the parameter. Can be null if the parameter is for an unnamed cascading value.
+		/// </summary>
+		public string? Name { get; }
 
-        /// <summary>
-        /// Gets the value being supplied to the component.
-        /// </summary>
-        public object? Value { get; }
+		/// <summary>
+		/// Gets the value being supplied to the component.
+		/// </summary>
+		public object? Value { get; }
 
-        /// <summary>
-        /// Gets a value to indicate whether the parameter is for use by a <see cref="Microsoft.AspNetCore.Components.CascadingValue{TValue}"/>.
-        /// </summary>
-        public bool IsCascadingValue { get; }
+		/// <summary>
+		/// Gets a value to indicate whether the parameter is for use by a <see cref="Microsoft.AspNetCore.Components.CascadingValue{TValue}"/>.
+		/// </summary>
+		public bool IsCascadingValue { get; }
 
-        private ComponentParameter(string? name, object? value, bool isCascadingValue)
-        {
-            if (isCascadingValue && value is null)
-                throw new ArgumentNullException(nameof(value), "Cascading values cannot be set to null");
+		private ComponentParameter(string? name, object? value, bool isCascadingValue)
+		{
+			if (isCascadingValue && value is null)
+				throw new ArgumentNullException(nameof(value), "Cascading values cannot be set to null");
 
-            if (!isCascadingValue && name is null)
-                throw new ArgumentNullException(nameof(name), "A parameters name cannot be set to null");
+			if (!isCascadingValue && name is null)
+				throw new ArgumentNullException(nameof(name), "A parameters name cannot be set to null");
 
-            Name = name;
-            Value = value;
-            IsCascadingValue = isCascadingValue;
-        }
+			Name = name;
+			Value = value;
+			IsCascadingValue = isCascadingValue;
+		}
 
-        /// <summary>
-        /// Create a parameter for a component under test.
-        /// </summary>
-        /// <param name="name">Name of the parameter to pass to the component</param>
-        /// <param name="value">Value or null to pass the component</param>
-        public static ComponentParameter CreateParameter(string name, object? value) 
-            => new ComponentParameter(name, value, false);
+		/// <summary>
+		/// Create a parameter for a component under test.
+		/// </summary>
+		/// <param name="name">Name of the parameter to pass to the component</param>
+		/// <param name="value">Value or null to pass the component</param>
+		public static ComponentParameter CreateParameter(string name, object? value)
+			=> new ComponentParameter(name, value, false);
 
-        /// <summary>
-        /// Create a Cascading Value parameter for a component under test.
-        /// </summary>
-        /// <param name="name">A optional name for the cascading value</param>
-        /// <param name="value">The cascading value</param>
-        public static ComponentParameter CreateCascadingValue(string? name, object value) 
-            => new ComponentParameter(name, value, true);
+		/// <summary>
+		/// Create a Cascading Value parameter for a component under test.
+		/// </summary>
+		/// <param name="name">A optional name for the cascading value</param>
+		/// <param name="value">The cascading value</param>
+		public static ComponentParameter CreateCascadingValue(string? name, object value)
+			=> new ComponentParameter(name, value, true);
 
-        /// <summary>
-        /// Create a parameter for a component under test.
-        /// </summary>
-        /// <param name="input">A name/value pair for the parameter</param>
-        public static implicit operator ComponentParameter((string name, object? value) input) 
-            => CreateParameter(input.name, input.value);
+		/// <summary>
+		/// Create a parameter for a component under test.
+		/// </summary>
+		/// <param name="input">A name/value pair for the parameter</param>
+		public static implicit operator ComponentParameter((string name, object? value) input)
+			=> CreateParameter(input.name, input.value);
 
-        /// <summary>
-        /// Create a parameter or cascading value for a component under test.
-        /// </summary>
-        /// <param name="input">A name/value/isCascadingValue triple for the parameter</param>
-        public static implicit operator ComponentParameter((string? name, object? value, bool isCascadingValue) input) 
-            => new ComponentParameter(input.name, input.value, input.isCascadingValue);
+		/// <summary>
+		/// Create a parameter or cascading value for a component under test.
+		/// </summary>
+		/// <param name="input">A name/value/isCascadingValue triple for the parameter</param>
+		public static implicit operator ComponentParameter((string? name, object? value, bool isCascadingValue) input)
+			=> new ComponentParameter(input.name, input.value, input.isCascadingValue);
 
-        /// <inheritdoc/>
-        public bool Equals(ComponentParameter other)
-            => string.Equals(Name, other.Name, StringComparison.Ordinal) && Value == other.Value && IsCascadingValue == other.IsCascadingValue;
+		/// <inheritdoc/>
+		public bool Equals(ComponentParameter other)
+			=> string.Equals(Name, other.Name, StringComparison.Ordinal) && Value == other.Value && IsCascadingValue == other.IsCascadingValue;
 
-        /// <inheritdoc/>
-        public override bool Equals(object obj) => obj is ComponentParameter other && Equals(other);
+		/// <inheritdoc/>
+		public override bool Equals(object obj) => obj is ComponentParameter other && Equals(other);
 
-        /// <inheritdoc/>
-        public override int GetHashCode() => HashCode.Combine(Name, Value, IsCascadingValue);
+		/// <inheritdoc/>
+		public override int GetHashCode() => HashCode.Combine(Name, Value, IsCascadingValue);
 
-        /// <inheritdoc/>
-        public static bool operator ==(ComponentParameter left, ComponentParameter right) => left.Equals(right);
+		/// <inheritdoc/>
+		public static bool operator ==(ComponentParameter left, ComponentParameter right) => left.Equals(right);
 
-        /// <inheritdoc/>
-        public static bool operator !=(ComponentParameter left, ComponentParameter right) => !(left == right);
-    }
+		/// <inheritdoc/>
+		public static bool operator !=(ComponentParameter left, ComponentParameter right) => !(left == right);
+	}
 }

src/bunit.web/Rendering/RenderEvent.cs src/bunit.core/Rendering/RenderEvent.cssrc/bunit.web/Rendering/RenderEvent.cs renamed to src/bunit.core/Rendering/RenderEvent.cs

@@ -1,7 +1,7 @@
 using System;
 using Microsoft.AspNetCore.Components.RenderTree;
 
-namespace Bunit
+namespace Bunit.Rendering
 {
 	/// <summary>
 	/// Represents a render event for a <see cref="IRenderedFragmentCore"/> or generally from the <see cref="TestRendererOld"/>.
@@ -31,71 +31,65 @@ public RenderEvent(in RenderBatch renderBatch, TestRenderer renderer)
 		/// </summary>
 		/// <param name="renderedFragment">Component to check for updates to.</param>
 		/// <returns>True if <see cref="RenderEvent"/> contains updates to component, false otherwise.</returns>
-		public bool HasChangesTo(IRenderedFragmentCore renderedFragment)
-			=> HasChangesTo((renderedFragment ?? throw new ArgumentNullException(nameof(renderedFragment))).ComponentId);
+		public bool HasChangesTo(int componentId) => HasChangesToRoot(componentId);
 
 		/// <summary>
 		/// Checks whether the <paramref name="renderedFragment"/> or one or more of 
 		/// its sub components was rendered during the <see cref="RenderEvent"/>.
 		/// </summary>
 		/// <param name="renderedFragment">Component to check if rendered.</param>
 		/// <returns>True if the component or a sub component rendered, false otherwise.</returns>
-		public bool DidComponentRender(IRenderedFragmentCore renderedFragment)
-			=> DidComponentRender((renderedFragment ?? throw new ArgumentNullException(nameof(renderedFragment))).ComponentId);
+		public bool DidComponentRender(int componentId) => DidComponentRenderRoot(componentId);
 
-		private bool HasChangesTo(int componentId)
+		private bool HasChangesToRoot(int componentId)
 		{
-			for (int i = 0; i < _renderBatch.UpdatedComponents.Count; i++)
+			for (var i = 0; i < _renderBatch.UpdatedComponents.Count; i++)
 			{
 				var update = _renderBatch.UpdatedComponents.Array[i];
 				if (update.ComponentId == componentId && update.Edits.Count > 0)
 					return true;
 			}
-			for (int i = 0; i < _renderBatch.DisposedEventHandlerIDs.Count; i++)
-			{
+			for (var i = 0; i < _renderBatch.DisposedEventHandlerIDs.Count; i++)
 				if (_renderBatch.DisposedEventHandlerIDs.Array[i].Equals(componentId))
 					return true;
-			}
 
 			var renderFrames = _renderer.GetCurrentRenderTreeFrames(componentId);
 			return HasChangedToChildren(renderFrames);
 		}
 
 		private bool HasChangedToChildren(ArrayRange<RenderTreeFrame> componentRenderTreeFrames)
 		{
-			for (int i = 0; i < componentRenderTreeFrames.Count; i++)
+			for (var i = 0; i < componentRenderTreeFrames.Count; i++)
 			{
 				var frame = componentRenderTreeFrames.Array[i];
 				if (frame.FrameType == RenderTreeFrameType.Component)
-					if (HasChangesTo(frame.ComponentId))
+					if (HasChangesToRoot(frame.ComponentId))
 						return true;
 			}
 			return false;
 		}
 
-		private bool DidComponentRender(int componentId)
+		private bool DidComponentRenderRoot(int componentId)
 		{
-			for (int i = 0; i < _renderBatch.UpdatedComponents.Count; i++)
+			for (var i = 0; i < _renderBatch.UpdatedComponents.Count; i++)
 			{
 				var update = _renderBatch.UpdatedComponents.Array[i];
 				if (update.ComponentId == componentId)
 					return true;
 			}
-			for (int i = 0; i < _renderBatch.DisposedEventHandlerIDs.Count; i++)
-			{
+			for (var i = 0; i < _renderBatch.DisposedEventHandlerIDs.Count; i++)
 				if (_renderBatch.DisposedEventHandlerIDs.Array[i].Equals(componentId))
 					return true;
-			}
 			return DidChildComponentRender(_renderer.GetCurrentRenderTreeFrames(componentId));
 		}
 
 		private bool DidChildComponentRender(ArrayRange<RenderTreeFrame> componentRenderTreeFrames)
 		{
-			for (int i = 0; i < componentRenderTreeFrames.Count; i++)
+			for (var i = 0; i < componentRenderTreeFrames.Count; i++)
 			{
 				var frame = componentRenderTreeFrames.Array[i];
 				if (frame.FrameType == RenderTreeFrameType.Component)
-					if (DidComponentRender(frame.ComponentId))
+					if (DidComponentRenderRoot(frame.ComponentId))
 						return true;
 			}
 			return false;

src/bunit.core/Rendering/RenderEventPublisher.cs

@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+
+namespace Bunit.Rendering
+{
+	public class RenderEventObservable : IObservable<RenderEvent>
+	{
+		protected HashSet<IObserver<RenderEvent>> Observers { get; } = new HashSet<IObserver<RenderEvent>>();
+
+		public virtual IDisposable Subscribe(IObserver<RenderEvent> observer)
+		{
+			if (!Observers.Contains(observer))
+				Observers.Add(observer);
+			return new Unsubscriber(this, observer);
+		}
+
+		protected virtual void RemoveSubscription(IObserver<RenderEvent> observer)
+		{
+			Observers.Remove(observer);
+		}
+
+		private sealed class Unsubscriber : IDisposable
+		{
+			private RenderEventObservable _observable;
+			private IObserver<RenderEvent> _observer;
+
+			public Unsubscriber(RenderEventObservable observable, IObserver<RenderEvent> observer)
+			{
+				_observable = observable;
+				_observer = observer;
+			}
+
+			public void Dispose()
+			{
+				_observable.RemoveSubscription(_observer);
+			}
+		}
+	}
+
+	public sealed class RenderEventFilter : RenderEventObservable, IObservable<RenderEvent>, IObserver<RenderEvent>
+	{
+		private readonly IObservable<RenderEvent> _source;
+		private readonly Func<RenderEvent, bool> _forwardEvent;
+		private IDisposable? _subscription;
+
+		public RenderEventFilter(IObservable<RenderEvent> source, Func<RenderEvent, bool> forwardEvent)
+		{
+			_source = source;
+			_forwardEvent = forwardEvent;
+		}
+
+		public override IDisposable Subscribe(IObserver<RenderEvent> observer)
+		{
+			if (_subscription is null)
+				_subscription = _source.Subscribe(this);
+			return base.Subscribe(observer);
+		}
+
+		protected override void RemoveSubscription(IObserver<RenderEvent> observer)
+		{
+			base.RemoveSubscription(observer);
+			if (Observers.Count == 0 && _subscription is { })
+			{
+				_subscription.Dispose();
+				_subscription = null;
+			}
+		}
+
+		void IObserver<RenderEvent>.OnCompleted()
+		{
+			foreach (var observer in Observers)
+				observer.OnCompleted();
+		}
+		void IObserver<RenderEvent>.OnError(Exception error)
+		{
+			foreach (var observer in Observers)
+				observer.OnError(error);
+		}
+
+		void IObserver<RenderEvent>.OnNext(RenderEvent renderEvent)
+		{
+			if (!_forwardEvent(renderEvent))
+				return;
+			foreach (var observer in Observers)
+				observer.OnNext(renderEvent);
+		}
+	}
+
+	public sealed class RenderEventPublisher : RenderEventObservable, IObservable<RenderEvent>
+	{
+		private bool _isCompleted;
+
+		public void OnRender(in RenderEvent renderEvent)
+		{
+			if (_isCompleted)
+				throw new InvalidOperationException($"Calling {nameof(OnRender)} is not allowed after {nameof(OnCompleted)} has been called.");
+			foreach (var observer in Observers)
+				observer.OnNext(renderEvent);
+		}
+
+		public void OnCompleted()
+		{
+			_isCompleted = true;
+			foreach (var observer in Observers)
+				observer.OnCompleted();
+		}
+	}
+}