com.wallstop-studios.dxmessaging 2.1.1 → 2.1.2

package/Tests/Runtime/Core/MutationPostProcessorMoreTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System.Collections;
@@ -112,3 +113,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/MutationPriorityTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System.Collections;
@@ -114,3 +115,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/NominalTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System;
@@ -1732,3 +1733,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/OrderingTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System.Collections;
@@ -1927,3 +1928,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/OverDeregistrationTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System;
@@ -123,3 +124,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/PostProcessorTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System;
@@ -1234,3 +1235,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/ReflexiveErrorTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System.Collections;
@@ -38,3 +39,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/ReflexiveMessageWarningTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System;
@@ -18,7 +19,7 @@ namespace DxMessaging.Tests.Runtime.Core
         public IEnumerator LogsWarningOncePerBus()
         {
             List<(LogLevel level, string message)> logs = new();
-            var previousLogFunction = MessagingDebug.LogFunction;
+            Action<LogLevel, string> previousLogFunction = MessagingDebug.LogFunction;
             try
             {
                 MessagingDebug.LogFunction = (level, message) => logs.Add((level, message));
@@ -84,3 +85,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/ReflexiveTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System.Collections;
@@ -168,3 +169,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/RegistrationTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System;
@@ -1264,3 +1265,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/StringShorthandTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System.Collections;
@@ -96,3 +97,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/TargetedTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System.Collections;
@@ -886,3 +887,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/TypedShorthandTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System;
@@ -228,3 +229,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/UntargetedEquivalenceTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 // ReSharper disable AccessToModifiedClosure
 namespace DxMessaging.Tests.Runtime.Core
 {
@@ -168,3 +169,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Core/UntargetedPrefreezeTests.cs

@@ -1,10 +1,6 @@
 namespace DxMessaging.Tests.Runtime.Core
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Reflection;
     using DxMessaging.Core;
-    using DxMessaging.Core.Helper;
     using DxMessaging.Core.MessageBus;
     using DxMessaging.Tests.Runtime.Scripts.Messages;
     using NUnit.Framework;
@@ -27,88 +23,28 @@ namespace DxMessaging.Tests.Runtime.Core
 
             token.Enable();
 
-            object cache = GetUntargetedPostProcessingFastCache(
-                handler,
-                messageBus,
-                typeof(SimpleUntargetedMessage),
-                priority: 0
-            );
-
             SimpleUntargetedMessage message = new();
             messageBus.UntargetedBroadcast(ref message);
             Assert.AreEqual(1, postProcessCount);
-            Assert.AreEqual(1, GetPrefreezeInvocationCount(cache));
+            Assert.AreEqual(
+                1,
+                handler.GetUntargetedPostProcessingPrefreezeCount<SimpleUntargetedMessage>(
+                    messageBus,
+                    priority: 0
+                )
+            );
 
             messageBus.UntargetedBroadcast(ref message);
             Assert.AreEqual(2, postProcessCount);
-            Assert.AreEqual(2, GetPrefreezeInvocationCount(cache));
-
-            token.Disable();
-        }
-
-        private static object GetUntargetedPostProcessingFastCache(
-            MessageHandler handler,
-            MessageBus messageBus,
-            Type messageType,
-            int priority
-        )
-        {
-            FieldInfo handlersField = typeof(MessageHandler).GetField(
-                "_handlersByTypeByMessageBus",
-                BindingFlags.NonPublic | BindingFlags.Instance
+            Assert.AreEqual(
+                2,
+                handler.GetUntargetedPostProcessingPrefreezeCount<SimpleUntargetedMessage>(
+                    messageBus,
+                    priority: 0
+                )
             );
-            Assert.IsNotNull(handlersField);
-            var handlersByBus = (List<MessageCache<object>>)handlersField.GetValue(handler);
-            Assert.IsNotNull(handlersByBus);
-
-            MessageCache<object> cacheByType = handlersByBus[
-                messageBus.RegisteredGlobalSequentialIndex
-            ];
-            MethodInfo getOrAddMethod = typeof(MessageCache<object>)
-                .GetMethod(nameof(MessageCache<object>.GetOrAdd))
-                ?.MakeGenericMethod(messageType);
-            Assert.IsNotNull(getOrAddMethod);
-
-            object typedHandler = getOrAddMethod.Invoke(cacheByType, null);
-            Assert.IsNotNull(typedHandler);
 
-            FieldInfo fastHandlersField = typedHandler
-                .GetType()
-                .GetField(
-                    "_untargetedPostProcessingFastHandlers",
-                    BindingFlags.NonPublic | BindingFlags.Instance
-                );
-            Assert.IsNotNull(fastHandlersField);
-
-            object fastHandlers = fastHandlersField.GetValue(typedHandler);
-            Assert.IsNotNull(fastHandlers);
-
-            return GetDictionaryValue(fastHandlers, priority);
-        }
-
-        private static object GetDictionaryValue(object dictionary, int key)
-        {
-            MethodInfo tryGetValue = dictionary
-                .GetType()
-                .GetMethod("TryGetValue", BindingFlags.Public | BindingFlags.Instance);
-            Assert.IsNotNull(tryGetValue);
-
-            object[] args = { key, null };
-            bool found = (bool)tryGetValue.Invoke(dictionary, args);
-            Assert.IsTrue(found, $"Failed to locate cache for priority {key}.");
-            return args[1];
-        }
-
-        private static int GetPrefreezeInvocationCount(object handlerCache)
-        {
-            FieldInfo countField = handlerCache
-                .GetType()
-                .GetField(
-                    "prefreezeInvocationCount",
-                    BindingFlags.NonPublic | BindingFlags.Instance
-                );
-            Assert.IsNotNull(countField);
-            return (int)countField.GetValue(handlerCache);
+            token.Disable();
         }
     }
 }

package/Tests/Runtime/Core/UntargetedTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Core
 {
     using System.Collections;
@@ -270,3 +271,5 @@ namespace DxMessaging.Tests.Runtime.Core
         }
     }
 }
+
+#endif

package/Tests/Runtime/Integrations/Reflex/ReflexIntegrationTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Reflex
 {
 #if REFLEX_PRESENT
@@ -93,7 +94,7 @@ namespace DxMessaging.Tests.Runtime.Reflex
 
             Container container = TrackDisposable(builder.Build());
 
-            var concrete =
+            DxMessagingRegistrationInstaller.ContainerMessageRegistrationBuilder concrete =
                 container.Resolve<DxMessagingRegistrationInstaller.ContainerMessageRegistrationBuilder>();
             Assert.IsNotNull(
                 concrete,
@@ -160,3 +161,5 @@ namespace DxMessaging.Tests.Runtime.Reflex
     }
 #endif
 }
+
+#endif

package/Tests/Runtime/Integrations/VContainer/VContainerIntegrationTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.VContainer
 {
 #if VCONTAINER_PRESENT
@@ -138,3 +139,5 @@ namespace DxMessaging.Tests.Runtime.VContainer
     }
 #endif
 }
+
+#endif

package/Tests/Runtime/Integrations/Zenject/ZenjectIntegrationTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Zenject
 {
 #if ZENJECT_PRESENT
@@ -138,3 +139,5 @@ namespace DxMessaging.Tests.Runtime.Zenject
     }
 #endif
 }
+
+#endif

package/Tests/Runtime/Scripts/Components/GenericMessageAwareComponent.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Scripts.Components
 {
     using DxMessaging.Unity;
@@ -16,3 +17,5 @@ namespace DxMessaging.Tests.Runtime.Scripts.Components
         }
     }
 }
+
+#endif

package/Tests/Runtime/Scripts/Components/ManualListenerComponent.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Scripts.Components
 {
     using DxMessaging.Core;
@@ -20,3 +21,5 @@ namespace DxMessaging.Tests.Runtime.Scripts.Components
         }
     }
 }
+
+#endif

package/Tests/Runtime/Scripts/Components/ReflexiveReceiverComponent.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Scripts.Components
 {
     using UnityEngine;
@@ -12,3 +13,5 @@ namespace DxMessaging.Tests.Runtime.Scripts.Components
         }
     }
 }
+
+#endif

package/Tests/Runtime/TestUtilities/UnityFixtureBase.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime
 {
     using System;
@@ -62,3 +63,5 @@ namespace DxMessaging.Tests.Runtime
         }
     }
 }
+
+#endif

package/Tests/Runtime/Unity/MessageBusProviderAssetTests.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Unity
 {
     using DxMessaging.Core;
@@ -55,3 +56,5 @@ namespace DxMessaging.Tests.Runtime.Unity
         }
     }
 }
+
+#endif

package/Tests/Runtime/Unity/MessageBusProviderHandleTests.cs

@@ -1,5 +1,7 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Tests.Runtime.Unity
 {
+    using System.Collections.Generic;
     using DxMessaging.Core.MessageBus;
     using DxMessaging.Unity;
     using NUnit.Framework;
@@ -8,6 +10,29 @@ namespace DxMessaging.Tests.Runtime.Unity
     [TestFixture]
     public sealed class MessageBusProviderHandleTests
     {
+        private readonly List<Object> _objectsToDestroy = new();
+
+        [SetUp]
+        public void SetUp()
+        {
+            _objectsToDestroy.Clear();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            for (int i = 0; i < _objectsToDestroy.Count; ++i)
+            {
+                Object obj = _objectsToDestroy[i];
+                if (obj != null)
+                {
+                    Object.DestroyImmediate(obj);
+                }
+            }
+
+            _objectsToDestroy.Clear();
+        }
+
         [Test]
         public void TryGetProviderReturnsRuntimeProvider()
         {
@@ -29,13 +54,12 @@ namespace DxMessaging.Tests.Runtime.Unity
                 ScriptableObject.CreateInstance<TestScriptableMessageBusProvider>();
             providerAsset.Configure(new MessageBus());
             MessageBusProviderHandle handle = new(providerAsset);
+            TrackForCleanup(providerAsset);
 
             bool resolved = handle.TryGetProvider(out IMessageBusProvider provider);
 
             Assert.IsTrue(resolved);
             Assert.AreSame(providerAsset, provider);
-
-            Object.DestroyImmediate(providerAsset);
         }
 
         [Test]
@@ -55,6 +79,7 @@ namespace DxMessaging.Tests.Runtime.Unity
                 ScriptableObject.CreateInstance<TestScriptableMessageBusProvider>();
             providerAsset.Configure(new MessageBus());
             MessageBusProviderHandle handle = new(providerAsset);
+            TrackForCleanup(providerAsset);
 
             HandleWrapper wrapper = new() { Handle = handle };
             string json = JsonUtility.ToJson(wrapper);
@@ -64,8 +89,57 @@ namespace DxMessaging.Tests.Runtime.Unity
 
             Assert.IsTrue(resolved);
             Assert.AreSame(providerAsset, provider);
+        }
+
+        [Test]
+        public void WithRuntimeProviderOverridesSerializedProvider()
+        {
+            MessageBus serializedBus = new();
+            TestScriptableMessageBusProvider providerAsset =
+                ScriptableObject.CreateInstance<TestScriptableMessageBusProvider>();
+            providerAsset.Configure(serializedBus);
+            MessageBusProviderHandle handle = new(providerAsset);
+            TrackForCleanup(providerAsset);
+
+            MessageBus runtimeBus = new();
+            TestMessageBusProvider runtimeProvider = new(runtimeBus);
+            MessageBusProviderHandle runtimeHandle = handle.WithRuntimeProvider(runtimeProvider);
+
+            Assert.IsTrue(runtimeHandle.TryGetProvider(out IMessageBusProvider provider));
+            Assert.AreSame(runtimeProvider, provider);
+            Assert.AreSame(runtimeBus, runtimeHandle.ResolveBus());
 
-            Object.DestroyImmediate(providerAsset);
+            // Original handle should remain associated with the serialized provider asset.
+            Assert.IsTrue(handle.TryGetProvider(out IMessageBusProvider serializedProvider));
+            Assert.AreSame(providerAsset, serializedProvider);
+            Assert.AreSame(serializedBus, handle.ResolveBus());
+        }
+
+        [Test]
+        public void RuntimeProviderIsNotSerialized()
+        {
+            MessageBus serializedBus = new();
+            TestScriptableMessageBusProvider providerAsset =
+                ScriptableObject.CreateInstance<TestScriptableMessageBusProvider>();
+            providerAsset.Configure(serializedBus);
+            MessageBusProviderHandle handle = new(providerAsset);
+            TrackForCleanup(providerAsset);
+
+            MessageBus runtimeBus = new();
+            TestMessageBusProvider runtimeProvider = new(runtimeBus);
+            handle = handle.WithRuntimeProvider(runtimeProvider);
+
+            HandleWrapper wrapper = new() { Handle = handle };
+            string json = JsonUtility.ToJson(wrapper);
+            HandleWrapper deserialized = JsonUtility.FromJson<HandleWrapper>(json);
+
+            Assert.IsTrue(deserialized.Handle.TryGetProvider(out IMessageBusProvider provider));
+            Assert.AreSame(
+                providerAsset,
+                provider,
+                "Serialized handle should resolve the asset provider."
+            );
+            Assert.AreSame(serializedBus, deserialized.Handle.ResolveBus());
         }
 
         private sealed class TestMessageBusProvider : IMessageBusProvider
@@ -83,6 +157,14 @@ namespace DxMessaging.Tests.Runtime.Unity
             }
         }
 
+        private void TrackForCleanup(Object unityObject)
+        {
+            if (unityObject != null)
+            {
+                _objectsToDestroy.Add(unityObject);
+            }
+        }
+
         [System.Serializable]
         private struct HandleWrapper
         {
@@ -105,3 +187,5 @@ namespace DxMessaging.Tests.Runtime.Unity
         }
     }
 }
+
+#endif

package/Tests/Runtime/Unity/MessagingComponentInstallerSceneTests.cs

@@ -0,0 +1,109 @@
+#if UNITY_2021_3_OR_NEWER
+namespace DxMessaging.Tests.Runtime.Unity
+{
+    using System.Collections;
+    using System.Collections.Generic;
+    using DxMessaging.Core.MessageBus;
+    using DxMessaging.Unity;
+    using NUnit.Framework;
+    using UnityEditor;
+    using UnityEngine;
+    using UnityEngine.TestTools;
+
+    public sealed class MessagingComponentInstallerSceneTests
+    {
+        private readonly List<Object> _createdObjects = new();
+
+        [TearDown]
+        public void TearDown()
+        {
+            foreach (Object instance in _createdObjects)
+            {
+                if (instance != null)
+                {
+                    Object.DestroyImmediate(instance);
+                }
+            }
+            _createdObjects.Clear();
+        }
+
+        [UnityTest]
+        public IEnumerator InstallerAppliesSerializedProviderToChildren()
+        {
+            MessageBus messageBus = new();
+            TestScriptableMessageBusProvider provider = Track(
+                ScriptableObject.CreateInstance<TestScriptableMessageBusProvider>()
+            );
+            provider.Configure(messageBus);
+
+            GameObject root = Track(new GameObject("InstallerRoot"));
+            MessagingComponentInstaller installer =
+                root.AddComponent<MessagingComponentInstaller>();
+            installer.SetProvider(new MessageBusProviderHandle(provider));
+
+            GameObject child = Track(new GameObject("InstallerChild"));
+            child.transform.SetParent(root.transform);
+            MessagingComponent component = child.AddComponent<MessagingComponent>();
+
+            SerializedObject serializedComponent = new(component);
+            SerializedProperty autoConfigureProperty = serializedComponent.FindProperty(
+                "autoConfigureSerializedProviderOnAwake"
+            );
+            Assert.That(autoConfigureProperty, Is.Not.Null, "Expected auto configure property.");
+            autoConfigureProperty.boolValue = true;
+            serializedComponent.ApplyModifiedPropertiesWithoutUndo();
+
+            installer.ApplyConfiguration();
+
+            yield return null;
+
+            Assert.That(
+                component.SerializedProviderHandle.SerializedProvider,
+                Is.EqualTo(provider),
+                "Serialized provider handle should reference the installer provider."
+            );
+            Assert.That(
+                component.SerializedProviderHandle.ResolveBus(),
+                Is.EqualTo(messageBus),
+                "Serialized provider should resolve to the configured bus."
+            );
+
+            component.enabled = false;
+            yield return null;
+            component.enabled = true;
+            yield return null;
+
+            Assert.That(
+                component.SerializedProviderHandle.ResolveBus(),
+                Is.EqualTo(messageBus),
+                "Provider resolution should persist after enable/disable cycles."
+            );
+        }
+
+        private T Track<T>(T unityObject)
+            where T : Object
+        {
+            if (unityObject != null)
+            {
+                _createdObjects.Add(unityObject);
+            }
+            return unityObject;
+        }
+
+        private sealed class TestScriptableMessageBusProvider : ScriptableMessageBusProvider
+        {
+            private IMessageBus _bus;
+
+            internal void Configure(IMessageBus bus)
+            {
+                _bus = bus;
+            }
+
+            public override IMessageBus Resolve()
+            {
+                return _bus;
+            }
+        }
+    }
+}
+#endif

package/Tests/Runtime/Unity/MessagingComponentInstallerSceneTests.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5e88a989b92afcd4a9738e3f472bb0e2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: