Fix sub states disposing

Assets/UniState/Runtime/Core/State/CompositeStateBase.cs

@@ -42,5 +42,11 @@ public override void SetTransitionFacade(IStateTransitionFacade transitionFacade
             base.SetTransitionFacade(transitionFacade);
             _subStatesContainer.SetTransitionFacade(transitionFacade);
         }
+
+        public override void Dispose()
+        {
+            base.Dispose();
+            _subStatesContainer.Dispose();
+        }
     }
 }

Assets/UniStateTests/PlayMode/SubStateTests/Infrastructure/StateFinal.cs

@@ -0,0 +1,8 @@
+using UniState;
+
+namespace UniStateTests.PlayMode.SubStateTests.Infrastructure
+{
+    internal class StateFinal : DefaultCompositeState
+    {
+    }
+}

Assets/UniStateTests/PlayMode/SubStateTests/Infrastructure/StateInitial.cs

@@ -0,0 +1,8 @@
+using UniState;
+
+namespace UniStateTests.PlayMode.SubStateTests.Infrastructure
+{
+    internal class StateInitial : DefaultCompositeState
+    {
+    }
+}

Assets/UniStateTests/PlayMode/SubStateTests/Infrastructure/StateMachineSubStates.cs

@@ -0,0 +1,23 @@
+using UniState;
+using UniStateTests.Common;
+
+namespace UniStateTests.PlayMode.SubStateTests.Infrastructure
+{
+    public class StateMachineSubStates : VerifiableStateMachine
+    {
+        public StateMachineSubStates(ExecutionLogger logger) : base(logger)
+        {
+        }
+
+        protected override StateTransitionInfo BuildRecoveryTransition(IStateTransitionFactory transitionFactory)
+            => transitionFactory.CreateExitTransition();
+
+        protected override void HandleError(StateMachineErrorData errorData)
+        {
+        }
+
+        protected override string ExpectedLog =>
+            "SubStateInitialSecond (Execute) -> SubStateInitialFirst (Execute, Disposables) -> SubStateInitialSecond (Disposables) -> " +
+            "SubStateFinalSecond (Execute) -> SubStateFinalFirst (Execute, Disposables) -> SubStateFinalSecond (Disposables)";
+    }
+}

Assets/UniStateTests/PlayMode/SubStateTests/Infrastructure/SubStateFinalFirst.cs

@@ -0,0 +1,33 @@
+using System.Threading;
+using Cysharp.Threading.Tasks;
+using UniState;
+using UniStateTests.Common;
+
+namespace UniStateTests.PlayMode.SubStateTests.Infrastructure
+{
+    internal class SubStateFinalFirst : SubStateBase<StateFinal>
+    {
+        private readonly ExecutionLogger _logger;
+
+        public SubStateFinalFirst(ExecutionLogger logger)
+        {
+            _logger = logger;
+        }
+
+        public override async UniTask<StateTransitionInfo> Execute(CancellationToken token)
+        {
+            Disposables.Add(() => { _logger.LogStep("SubStateFinalFirst", "Disposables"); });
+
+            await UniTask.Yield(token);
+
+            _logger.LogStep("SubStateFinalFirst", "Execute");
+
+            await UniTask.Yield(token);
+            await UniTask.Yield(token);
+            await UniTask.Yield(token);
+            await UniTask.Yield(token);
+
+            return Transition.GoBack();
+        }
+    }
+}

Assets/UniStateTests/PlayMode/SubStateTests/Infrastructure/SubStateFinalSecond.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Threading;
+using Cysharp.Threading.Tasks;
+using UniState;
+using UniStateTests.Common;
+
+namespace UniStateTests.PlayMode.SubStateTests.Infrastructure
+{
+    internal class SubStateFinalSecond : SubStateBase<StateFinal>
+    {
+        private readonly ExecutionLogger _logger;
+
+        public SubStateFinalSecond(ExecutionLogger logger)
+        {
+            _logger = logger;
+        }
+
+        public override async UniTask<StateTransitionInfo> Execute(CancellationToken token)
+        {
+            Disposables.Add(() => { _logger.LogStep("SubStateFinalSecond", "Disposables"); });
+
+            _logger.LogStep("SubStateFinalSecond", "Execute");
+
+            await UniTask.Yield(token);
+            await UniTask.Yield(token);
+
+            throw new Exception("SubStateFinalSecond exception");
+        }
+    }
+}

Assets/UniStateTests/PlayMode/SubStateTests/Infrastructure/SubStateInitialFirst.cs

@@ -0,0 +1,32 @@
+using System.Threading;
+using Cysharp.Threading.Tasks;
+using UniState;
+using UniStateTests.Common;
+
+namespace UniStateTests.PlayMode.SubStateTests.Infrastructure
+{
+    internal class SubStateInitialFirst : SubStateBase<StateInitial>
+    {
+        private readonly ExecutionLogger _logger;
+
+        public SubStateInitialFirst(ExecutionLogger logger)
+        {
+            _logger = logger;
+        }
+
+        public override async UniTask<StateTransitionInfo> Execute(CancellationToken token)
+        {
+            Disposables.Add(() => { _logger.LogStep("SubStateInitialFirst", "Disposables"); });
+
+            await UniTask.Yield(token);
+
+            _logger.LogStep("SubStateInitialFirst", "Execute");
+
+            await UniTask.Yield(token);
+            await UniTask.Yield(token);
+            await UniTask.Yield(token);
+
+            return Transition.GoToExit();
+        }
+    }
+}

Assets/UniStateTests/PlayMode/SubStateTests/Infrastructure/SubStateInitialSecond.cs

@@ -0,0 +1,29 @@
+using System.Threading;
+using Cysharp.Threading.Tasks;
+using UniState;
+using UniStateTests.Common;
+
+namespace UniStateTests.PlayMode.SubStateTests.Infrastructure
+{
+    internal class SubStateInitialSecond: SubStateBase<StateInitial>
+    {
+        private readonly ExecutionLogger _logger;
+
+        public SubStateInitialSecond(ExecutionLogger logger)
+        {
+            _logger = logger;
+        }
+
+        public override async UniTask<StateTransitionInfo> Execute(CancellationToken token)
+        {
+            Disposables.Add(() => { _logger.LogStep("SubStateInitialSecond", "Disposables"); });
+
+            _logger.LogStep("SubStateInitialSecond", "Execute");
+
+            await UniTask.Yield(token);
+            await UniTask.Yield(token);
+
+            return Transition.GoTo<StateFinal>();
+        }
+    }
+}

Assets/UniStateTests/PlayMode/SubStateTests/SubStateVContainerTests.cs

@@ -0,0 +1,35 @@
+using System.Collections;
+using Cysharp.Threading.Tasks;
+using NUnit.Framework;
+using UniState;
+using UniStateTests.Common;
+using UniStateTests.PlayMode.HistoryTests.Infrastructure;
+using UniStateTests.PlayMode.SubStateTests.Infrastructure;
+using UnityEngine.TestTools;
+using VContainer;
+using Zenject;
+
+namespace UniStateTests.PlayMode.SubStateTests
+{
+    [TestFixture]
+    public class SubStateVContainerTests : VContainerTestsBase
+    {
+        [UnityTest]
+        public IEnumerator RunChaneOfStateSubStates_ExeptionRisedInSubState_AllSubStateDisposed() =>
+            UniTask.ToCoroutine(async () => { await RunAndVerify<StateMachineSubStates, StateInitial>(); });
+
+        protected override void SetupBindings(IContainerBuilder builder)
+        {
+            base.SetupBindings(builder);
+
+            builder.RegisterStateMachine<StateMachineSubStates>();
+
+            builder.RegisterState<StateInitial>();
+            builder.RegisterState<StateFinal>();
+            builder.RegisterState<SubStateInitialFirst>();
+            builder.RegisterState<SubStateInitialSecond>();
+            builder.RegisterState<SubStateFinalFirst>();
+            builder.RegisterState<SubStateFinalSecond>();
+        }
+    }
+}

Assets/UniStateTests/PlayMode/SubStateTests/SubStateZenjectTests.cs

@@ -0,0 +1,34 @@
+using System.Collections;
+using Cysharp.Threading.Tasks;
+using NUnit.Framework;
+using UniState;
+using UniStateTests.Common;
+using UniStateTests.PlayMode.HistoryTests.Infrastructure;
+using UniStateTests.PlayMode.SubStateTests.Infrastructure;
+using UnityEngine.TestTools;
+using Zenject;
+
+namespace UniStateTests.PlayMode.SubStateTests
+{
+    [TestFixture]
+    public class SubStateZenjectTests : ZenjectTestsBase
+    {
+        [UnityTest]
+        public IEnumerator RunChaneOfStateSubStates_ExeptionRisedInSubState_AllSubStateDisposed() =>
+            UniTask.ToCoroutine(async () => { await RunAndVerify<StateMachineSubStates, StateInitial>(); });
+
+        protected override void SetupBindings(DiContainer container)
+        {
+            base.SetupBindings(container);
+
+            container.BindStateMachine<StateMachineSubStates>();
+
+            container.BindState<StateInitial>();
+            container.BindState<StateFinal>();
+            container.BindState<SubStateInitialFirst>();
+            container.BindState<SubStateInitialSecond>();
+            container.BindState<SubStateFinalFirst>();
+            container.BindState<SubStateFinalSecond>();
+        }
+    }
+}