Merge pull request #617 from hadashiA/ku/ignore-stopping

Make ITickable not stop even if an exception is thrown.
hadashiA · Feb 11, 2024 · e2ab928 · e2ab928
2 parents af4c14c + af2ffa0
commit e2ab928
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/VContainer/Assets/Tests/Unity/EntryPointTest.cs b/VContainer/Assets/Tests/Unity/EntryPointTest.cs
@@ -136,7 +136,7 @@ public IEnumerator TickableExceptionHandler()
             yield return null;
             yield return null;
 
-            Assert.That(handled, Is.EqualTo(1));
+            Assert.That(handled, Is.GreaterThanOrEqualTo(1));
         }
 
         [UnityTest]
@@ -153,7 +153,7 @@ public IEnumerator PostTickableExceptionHandler()
             yield return null;
             yield return null;
 
-            Assert.That(handled, Is.EqualTo(1));
+            Assert.That(handled, Is.GreaterThanOrEqualTo(1));
         }
 
         [UnityTest]
@@ -170,7 +170,7 @@ public IEnumerator LateTickableExceptionHandler()
             yield return null;
             yield return null;
 
-            Assert.That(handled, Is.EqualTo(1));
+            Assert.That(handled, Is.GreaterThanOrEqualTo(1));
         }
 
         [UnityTest]
@@ -187,7 +187,7 @@ public IEnumerator PostLateTickableExceptionHandler()
             yield return null;
             yield return null;
 
-            Assert.That(handled, Is.EqualTo(1));
+            Assert.That(handled, Is.GreaterThanOrEqualTo(1));
         }
 
         [UnityTest]

diff --git a/VContainer/Assets/VContainer/Runtime/Unity/PlayerLoopItem.cs b/VContainer/Assets/VContainer/Runtime/Unity/PlayerLoopItem.cs
@@ -104,7 +104,6 @@ public bool MoveNext()
                 {
                     if (exceptionHandler == null) throw;
                     exceptionHandler.Publish(ex);
-                    return false;
                 }
             }
             return !disposed;
@@ -140,7 +139,6 @@ public bool MoveNext()
                 {
                     if (exceptionHandler == null) throw;
                     exceptionHandler.Publish(ex);
-                    return false;
                 }
             }
             return !disposed;
@@ -176,7 +174,6 @@ public bool MoveNext()
                 {
                     if (exceptionHandler == null) throw;
                     exceptionHandler.Publish(ex);
-                    return false;
                 }
             }
             return !disposed;
@@ -212,7 +209,6 @@ public bool MoveNext()
                 {
                     if (exceptionHandler == null) throw;
                     exceptionHandler.Publish(ex);
-                    return false;
                 }
             }
             return !disposed;
@@ -248,7 +244,6 @@ public bool MoveNext()
                 {
                     if (exceptionHandler == null) throw;
                     exceptionHandler.Publish(ex);
-                    return false;
                 }
             }
             return !disposed;
@@ -284,7 +279,6 @@ public bool MoveNext()
                 {
                     if (exceptionHandler == null) throw;
                     exceptionHandler.Publish(ex);
-                    return false;
                 }
             }
             return !disposed;