Merge pull request UiPath#57 from UiPath/issue55

Allows resuming Wf at correct point after persistence

src/CoreWf/Bookmark.cs

@@ -10,9 +10,11 @@ namespace System.Activities
     using System.Runtime.Serialization;
     using System.Globalization;
     using System.Activities.Internals;
+    using System.ComponentModel;
 
     [DataContract]
     [Fx.Tag.XamlVisible(false)]
+    [TypeConverter(typeof(BookmarkConverter))]
     public class Bookmark : IEquatable<Bookmark>
     {
         private static readonly Bookmark asyncOperationCompletionBookmark = new Bookmark(-1);

src/CoreWf/BookmarkConverter.cs

@@ -0,0 +1,34 @@
+// This file is part of Core WF which is licensed under the MIT license.
+// See LICENSE file in the project root for full license information.
+
+namespace System.Activities
+{
+    using System;
+    using System.Globalization;
+    using System.ComponentModel;
+
+    public class BookmarkConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return sourceType == typeof(string) || sourceType == typeof(long); 
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+
+            if (value is string stringValue && !String.IsNullOrEmpty(stringValue))
+            {
+                return new Bookmark(stringValue);
+            }
+
+            if (value is long longValue && longValue != 0)
+            {
+                return Bookmark.Create(longValue);
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+
+    }
+}

src/CoreWf/Hosting/WorkflowInstance.cs

@@ -355,6 +355,8 @@ protected void Initialize(object deserializedRuntimeState)
             this.executor.ThrowIfNonSerializable();
 
             EnsureDefinitionReady();
+
+            InitializeCore(null, null);
         }
 #endif
 

src/test/TestCases.Activities/Flowchart/Execution.cs

@@ -534,7 +534,7 @@ public void FlowchartWithOnlyFlowConditionalWithoutStartEvent()
         /// <summary>
         /// Unload and load flowchart while executing condition of flow conditional.
         /// </summary>        
-        [Fact(Skip = "Duplicate activities found in validation")]
+        [Fact()]
         public void UnloadFlowchartWhileExecutingFlowConditionalCondition()
         {
             TestFlowchart flowchart = new TestFlowchart();
@@ -578,7 +578,7 @@ public void UnloadFlowchartWhileExecutingFlowConditionalCondition()
         /// <summary>
         /// Unload and load flowchart while executing flow switch's expression.
         /// </summary>        
-        [Fact(Skip = "Duplicate activities found in validation")]
+        [Fact()]
         public void UnloadFlowchartWhileExecutingFlowSwitchExpression()
         {
             TestFlowchart flowchart = new TestFlowchart();
@@ -684,7 +684,7 @@ public void UseVariableInFlowchart()
         /// <summary>
         /// Unload and load flowchart while executing flow step
         /// </summary>        
-        [Fact(Skip = "Duplicate activities found in validation")]
+        [Fact()]
         public void UnloadFlowchartWhileExecutingFlowStep()
         {
             TestFlowchart flowchart = new TestFlowchart();

src/test/TestCases.Runtime/WorflowInstanceResumeBookmarkAsyncTests.cs

@@ -297,7 +297,7 @@ private static void TestInstanceOperationFromResumeBookmarkCallback(int operatio
             }
         }
 
-        [Fact(Skip = "Test is flaky, fails after 60 seconds")]
+        [Fact()]
         public static void TestPersistDuringResumeBookmark()
         {
             bool isSync = true;

src/test/TestCases.Runtime/WorkflowInstanceAbortTests.cs

@@ -193,7 +193,7 @@ void AbortParallel(bool isTestCancel)
             runtime.WaitForAborted(out Exception excepion, expectedTrace);
         }
 
-        [Fact(Skip = "Test is flaky, fails after 60 seconds")]
+        [Fact()]
         public void TestAbortLoad()
         {
             Variable<int> value = VariableHelper.Create<int>("value");