Fixed one of the ContinueWith capture methods not capturing properly.

Added missing ContinueWith capture tests.
Change cached expected progress value to uint from float.

Promises/Internal/AllInternal.cs

@@ -154,7 +154,7 @@ void IMultiTreeHandleable.ReAdd(PromisePassThrough passThrough)
  partial class AllPromise0 : IInvokable
  {
  // These are used to avoid rounding errors when normalizing the progress.
- private float _expected;
+ private uint _expected;
  private UnsignedFixed32 _currentAmount;
  private bool _invokingProgress;
  private bool _suspended;

Promises/Internal/DelegateWrappersInternal.cs

@@ -1304,6 +1304,7 @@ public sealed class DelegateContinueCaptureArgResult<TCapture, TArg, TResult> :
  public static DelegateContinueCaptureArgResult<TCapture, TArg, TResult> GetOrCreate(TCapture capturedValue, Func<TCapture, Promise<TArg>.ResultContainer, TResult> callback)
  {
  var del = _pool.IsNotEmpty ? _pool.Pop() : new DelegateContinueCaptureArgResult<TCapture, TArg, TResult>();
+ del._capturedValue = capturedValue;
  del._callback = callback;
  return del;
  }

Promises/Internal/MergeInternal.cs

@@ -121,7 +121,7 @@ void IMultiTreeHandleable.ReAdd(PromisePassThrough passThrough)
  partial class MergePromise<T> : IInvokable
  {
  // These are used to avoid rounding errors when normalizing the progress.
- private float _expected;
+ private uint _expected;
  private UnsignedFixed32 _currentAmount;
  private bool _invokingProgress;
  private bool _suspended;

Promises/Tests/CaptureTests.cs

@@ -860,6 +860,62 @@ public void OnContinueWillBeInvokedWithCapturedValue1()
  LogAssert.NoUnexpectedReceived();
  }
 
+ [Test]
+ public void OnContinueWillBeInvokedWithCapturedValue2()
+ {
+ var deferred = Promise.NewDeferred<int>();
+
+ string expected = "expected";
+ bool invoked = false;
+
+ TestHelper.AddContinueCallbacks<int, int, string>(deferred.Promise,
+ captureValue: expected,
+ onContinueCapture: (cv, r) =>
+ {
+ Assert.AreEqual(expected, cv);
+ invoked = true;
+ }
+ );
+
+ deferred.Resolve(50);
+ Promise.Manager.HandleCompletes();
+
+ Assert.AreEqual(true, invoked);
+
+ // Clean up.
+ GC.Collect();
+ Promise.Manager.HandleCompletesAndProgress();
+ LogAssert.NoUnexpectedReceived();
+ }
+
+ [Test]
+ public void OnContinueWillBeInvokedWithCapturedValue3()
+ {
+ var deferred = Promise.NewDeferred<int>();
+
+ string expected = "expected";
+ bool invoked = false;
+
+ TestHelper.AddContinueCallbacks<int, int, string>(deferred.Promise,
+ captureValue: expected,
+ onContinueCapture: (cv, r) =>
+ {
+ Assert.AreEqual(expected, cv);
+ invoked = true;
+ }
+ );
+
+ deferred.Reject("Reject");
+ Promise.Manager.HandleCompletes();
+
+ Assert.AreEqual(true, invoked);
+
+ // Clean up.
+ GC.Collect();
+ Promise.Manager.HandleCompletesAndProgress();
+ LogAssert.NoUnexpectedReceived();
+ }
+
  [Test]
  public void OnResolvedWillBeInvokedWithCapturedValue0()
  {