PR 51: Merge bug/4892-ObjectNotSetToInstance to master

 - Updated and fixed Veriable createion #4892 +semver:minor
 - Fixed null in AreaIterationPath of configursation +semver:patch

Related work items: #4892

Author: MrHinsh

TfsWitMigrator.Core/Execution/MigrationContext/TestPlansAndSuitsMigrationContext.cs

@@ -13,6 +13,7 @@ namespace VSTS.DataBulkEditor.Engine
 {
     public class TestPlansAndSuitsMigrationContext : MigrationContextBase
     {
+        MigrationEngine engine;
 
         WorkItemStoreContext sourceWitStore;
         TestManagementContext sourceTestStore;
@@ -33,6 +34,7 @@ public override string Name
 
         public TestPlansAndSuitsMigrationContext(MigrationEngine me, TestPlansAndSuitsMigrationConfig config) : base(me, config)
         {
+            this.engine = me;
             sourceWitStore = new WorkItemStoreContext(me.Source, WorkItemStoreFlags.None);
             sourceTestStore = new TestManagementContext(me.Source);
             targetWitStore = new WorkItemStoreContext(me.Target, WorkItemStoreFlags.BypassRules);
@@ -321,8 +323,14 @@ private ITestPlan CreateNewTestPlanFromSource(ITestPlan sourcePlan,  string newP
             targetPlan.Name = newPlanName;
             targetPlan.StartDate = sourcePlan.StartDate;
             targetPlan.EndDate = sourcePlan.EndDate;
-            targetPlan.AreaPath = this.config.AreaIterationPath;
-            targetPlan.Iteration = this.config.AreaIterationPath;
+            if (this.config.AreaIterationPath == null){
+                targetPlan.AreaPath = sourcePlan.AreaPath.Replace(engine.Source.Name, string.Format(@"{0}\{1}", engine.Target.Name, engine.Source.Name));
+                targetPlan.Iteration = sourcePlan.Iteration.Replace(engine.Source.Name, string.Format(@"{0}\{1}", engine.Target.Name, engine.Source.Name));
+            } else
+            {
+                targetPlan.AreaPath = this.config.AreaIterationPath;
+                targetPlan.Iteration = this.config.AreaIterationPath;
+            }
             targetPlan.ManualTestSettingsId = 0;
             return targetPlan;
         }

TfsWitMigrator.Core/Execution/MigrationContext/TestVeriablesMigrationContext.cs

@@ -44,31 +44,34 @@ internal override void InternalExecute()
             {
                 Trace.WriteLine(string.Format("Copy: {0}", sourceVar.Name));
                 ITestVariable targetVar= GetVar(targetTmc.Project.TestVariables, sourceVar.Name);
-                if (targetVar != null)
+                if (targetVar == null)
                 {
-                    Trace.WriteLine(string.Format("    Exists: {0}", sourceVar.Name));
-                    // match values
-                    foreach (var sourceVal in sourceVar.AllowedValues)
-                    {
-                        Trace.WriteLine(string.Format("    Seeking: {0}", sourceVal.Value));
-                        ITestVariableValue targetVal = GetVal(targetVar, sourceVal.Value);
-                        if (targetVal != null)
-                        {
-                            Trace.WriteLine(string.Format("    Exists: {0}", targetVal.Value));
-
-                        } else
-                        {
-                            Trace.WriteLine(string.Format("    Need to create: {0}", targetVal.Value));
-                            throw new NotImplementedException();
-                        }
-                    }
+                    Trace.WriteLine(string.Format("    Need to create: {0}", sourceVar.Name));
+                    targetVar = targetTmc.Project.TestVariables.Create();
+                    targetVar.Name = sourceVar.Name;
+                    targetVar.Save();
                 }
                 else
                 {
-                    Trace.WriteLine(string.Format("    Need to create: {0}", sourceVar.Name));
-                    throw new NotImplementedException();
+                    Trace.WriteLine(string.Format("    Exists: {0}", sourceVar.Name));
+                }
+                // match values
+                foreach (var sourceVal in sourceVar.AllowedValues)
+                {
+                    Trace.WriteLine(string.Format("    Seeking: {0}", sourceVal.Value));
+                    ITestVariableValue targetVal = GetVal(targetVar, sourceVal.Value);
+                    if (targetVal == null)
+                    {
+                        Trace.WriteLine(string.Format("    Need to create: {0}", sourceVal.Value));
+                        targetVal = targetTmc.Project.TestVariables.CreateVariableValue(sourceVal.Value);
+                        targetVar.AllowedValues.Add(targetVal);
+                       targetVar.Save();
+                    }
+                    else
+                    {
+                        Trace.WriteLine(string.Format("    Exists: {0}", targetVal.Value));
+                    }
                 }
-
 
             }
         }

VSTS.DataBulkEditor.sln

@@ -50,4 +50,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(CodealikeProperties) = postSolution
+		SolutionGuid = 51c92075-0694-476b-8366-efd65c9a9b77
+	EndGlobalSection
 EndGlobal