1.1.1

# Added
- Added unit tests.

# Changes
- UniRx Integration runtime code moved to "Runtime" folder.
- ReactiveModifiableProperty<T>/ReactiveModifierList<T>.ObserveChanged now observe ReactiveModifierList<T>.ObserveMove.

.vsconfig

@@ -0,0 +1,6 @@
+{
+  "version": "1.0",
+  "components": [ 
+    "Microsoft.VisualStudio.Workload.ManagedGame"
+  ]
+} 

Assets/MackySoft/MackySoft.Modiferty/External/UniRx/ReactiveModifierList.cs → Assets/MackySoft/MackySoft.Modiferty/External/UniRx/Runtime/ReactiveModifierList.cs

@@ -47,7 +47,8 @@ public static class ReactiveModifierListExtensions {
 			}
 			return Observable.Merge(
 				source.ObserveCountChanged().AsUnitObservable(),
-				source.ObserveReplace().AsUnitObservable()
+				source.ObserveReplace().AsUnitObservable(),
+				source.ObserveMove().AsUnitObservable()
 			).Select(_ => source);
 		}
 

Assets/MackySoft/MackySoft.Modiferty/External/UniRx/Tests/Editor/MackySoft.Modiferty.UniRx.Editor.Tests.asmdef

@@ -0,0 +1,26 @@
+{
+    "name": "MackySoft.Modiferty.UniRx.Editor.Tests",
+    "references": [
+        "GUID:e695879245fa2de4a81d0b0f517b15c3",
+        "GUID:fede8c6c4e4bddd44b1db8410752c53f",
+        "GUID:27619889b8ba8c24980f49ee34dbb44a",
+        "GUID:0acc523941302664db1f4e527237feb3",
+        "GUID:560b04d1a97f54a4e82edc0cbbb69285"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "MODIFERTY_UNIRX",
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/MackySoft/MackySoft.Modiferty/External/UniRx/Tests/Editor/ReactiveModifiableIntTests.cs

@@ -0,0 +1,24 @@
+using System.Collections;
+using UnityEngine;
+using UnityEngine.TestTools;
+using UniRx;
+using NUnit.Framework;
+
+namespace MackySoft.Modiferty.Tests {
+
+	public class ReactiveModifiableIntTests {
+
+		[UnityTest]
+		public IEnumerator ObserveChanged_BaseValue () {
+			ReactiveModifiableInt property = new ReactiveModifiableInt(0);
+			var subscription = property.ObserveChanged().First().ToYieldInstruction();
+
+			property.BaseValue = 1;
+
+			yield return subscription;
+
+			Assert.AreEqual(property.BaseValue,1);
+		}
+
+	}
+}

Assets/MackySoft/MackySoft.Modiferty/External/UniRx/Tests/Editor/ReactiveModifierListTests.cs

@@ -0,0 +1,99 @@
+using System.Collections;
+using UnityEngine;
+using UnityEngine.TestTools;
+using UniRx;
+using NUnit.Framework;
+
+namespace MackySoft.Modiferty.Tests {
+	public class ReactiveModifierListTests {
+
+		[UnityTest]
+		public IEnumerator ObserveChanged_Add () {
+			var modifiers = new ReactiveModifierList<int>();
+
+			var subscription = modifiers.ObserveChanged().First().ToYieldInstruction();
+
+			modifiers.Add(new AdditiveModifierInt(1));
+
+			yield return subscription;
+
+			Assert.AreEqual(modifiers.Count,1);
+		}
+
+		[UnityTest]
+		public IEnumerator ObserveChanged_Remove () {
+			var modifiers = new ReactiveModifierList<int>();
+			var modifier = new AdditiveModifierInt(1);
+			modifiers.Add(modifier);
+
+			var subscription = modifiers.ObserveChanged().First().ToYieldInstruction();
+
+			modifiers.Remove(modifier);
+
+			yield return subscription;
+
+			Assert.AreEqual(modifiers.Count,0);
+		}
+
+		[UnityTest]
+		public IEnumerator ObserveChanged_Insert () {
+			var modifiers = new ReactiveModifierList<int>();
+			modifiers.Add(new AdditiveModifierInt(1));
+
+			var subscription = modifiers.ObserveChanged().First().ToYieldInstruction();
+
+			modifiers.Insert(0,new SubtractiveModifierInt(1));
+
+			yield return subscription;
+
+			Assert.AreEqual(modifiers.Count,2);
+		}
+
+		[UnityTest]
+		public IEnumerator ObserveChanged_Move () {
+			var modifiers = new ReactiveModifierList<int>();
+			modifiers.Add(new AdditiveModifierInt(1));
+
+			var targetModifier = new SubtractiveModifierInt(1);
+			modifiers.Add(targetModifier);
+
+			var subscription = modifiers.ObserveChanged().First().ToYieldInstruction();
+
+			modifiers.Move(1,0);
+
+			yield return subscription;
+
+			Assert.AreEqual(modifiers.IndexOf(targetModifier),0);
+		}
+
+		[UnityTest]
+		public IEnumerator ObserveChanged_Replace () {
+			var modifiers = new ReactiveModifierList<int>();
+			modifiers.Add(new AdditiveModifierInt(1));
+
+			var subscription = modifiers.ObserveChanged().First().ToYieldInstruction();
+
+			var targetModifier = new SubtractiveModifierInt(1);
+			modifiers[0] = targetModifier;
+
+			yield return subscription;
+
+			Assert.AreSame(modifiers[0],targetModifier);
+		}
+
+		[UnityTest]
+		public IEnumerator ObserveChanged_Clear () {
+			var modifiers = new ReactiveModifierList<int>();
+			modifiers.Add(new AdditiveModifierInt(1));
+
+			var subscription = modifiers.ObserveChanged().First().ToYieldInstruction();
+
+			modifiers.Clear();
+
+			yield return subscription;
+
+			Assert.AreEqual(modifiers.Count,0);
+		}
+
+	}
+}

Assets/MackySoft/MackySoft.Modiferty/Tests/Editor/MackySoft.Modiferty.Tests.Editor.asmdef

@@ -0,0 +1,24 @@
+{
+    "name": "MackySoft.Modiferty.Editor.Tests",
+    "references": [
+        "GUID:e695879245fa2de4a81d0b0f517b15c3",
+        "GUID:40928bc94bf6c9d4ab69789b56aaff51",
+        "GUID:27619889b8ba8c24980f49ee34dbb44a",
+        "GUID:0acc523941302664db1f4e527237feb3"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/MackySoft/MackySoft.Modiferty/Tests/Editor/ModifiableIntTests.cs

@@ -0,0 +1,71 @@
+using System;
+using UnityEngine;
+using NUnit.Framework;
+
+namespace MackySoft.Modiferty.Tests {
+
+	public class ModifiableIntTests {
+
+		[Test]
+		public void Solo ([Random(-99999,99999,10)] int baseValue) {
+			var property = new ModifiableInt(baseValue);
+			Assert.AreEqual(baseValue,property.Evaluate());
+		}
+
+		[Test]
+		public void Additive (
+			[Random(-99999,99999,10)] int baseValue,
+			[Random(-99999,99999,10)] int add
+		) {
+			var property = new ModifiableInt(baseValue);
+			property.AddModifier(new AdditiveModifierInt(add));
+			Assert.AreEqual(baseValue + add,property.Evaluate());
+		}
+
+		[Test]
+		public void Subtractive (
+			[Random(-99999,99999,10)] int baseValue,
+			[Random(-99999,99999,10)] int subtract
+		) {
+			var property = new ModifiableInt(baseValue);
+			property.AddModifier(new SubtractiveModifierInt(subtract));
+			Assert.AreEqual(baseValue - subtract,property.Evaluate());
+		}
+
+		[Test]
+		public void Multiply (
+			[Random(-99999,99999,10)] int baseValue,
+			[Random(-10f,10f,10)] float multiplier,
+			[Values] RoundingMethod method
+		) {
+			var property = new ModifiableInt(baseValue);
+			property.AddModifier(new MultiplyModifierInt(multiplier,method));
+			Assert.AreEqual(RoundUtility.RoundToInt(baseValue * multiplier,method),property.Evaluate());
+		}
+
+		[Test]
+		public void Division (
+			[Random(-99999,99999,10)] int baseValue,
+			[Random(-10f,10f,10)] float division,
+			[Values] RoundingMethod method
+		) {
+			var property = new ModifiableInt(baseValue);
+			property.AddModifier(new DivisionModifierInt(division,method));
+			Assert.AreEqual(RoundUtility.RoundToInt(baseValue / division,method),property.Evaluate());
+		}
+
+		[Test]
+		public void AddModifierAsDisposable () {
+			var property = new ModifiableInt(0);
+
+			IDisposable disposable = property.AddModifierAsDisposable(new AdditiveModifierInt(1));
+			int beforeDisposedValue = property.Evaluate();
+
+			disposable.Dispose();
+
+			int afterDisposedValue = property.Evaluate();
+			Assert.AreNotEqual(beforeDisposedValue,afterDisposedValue);
+		}
+
+	}
+}

Packages/manifest.json

@@ -1,9 +1,8 @@
 {
   "dependencies": {
     "com.unity.ide.rider": "1.2.1",
-    "com.unity.ide.visualstudio": "2.0.3",
-    "com.unity.ide.vscode": "1.2.3",
-    "com.unity.test-framework": "1.1.18",
+    "com.unity.ide.visualstudio": "2.0.5",
+    "com.unity.test-framework": "1.1.19",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.physics": "1.0.0",