Master update post Ginger 2024.4 Beta 1 release

Ginger/Ginger/ALM/ALMDefectsProfilesPage.xaml.cs

@@ -226,7 +226,7 @@ private void DeleteDefectsProfile(object sender, RoutedEventArgs e)
             if (grdDefectsProfiles.Grid.SelectedItems.Count > 0)
             {
                 if (Reporter.ToUser(eUserMsgKey.AskBeforeDefectProfileDeleting) == Amdocs.Ginger.Common.eUserMsgSelection.Yes)
-                {               
+                {
                     foreach (ALMDefectProfile profileToDelete in grdDefectsProfiles.Grid.SelectedItems)
                     {
                         WorkSpace.Instance.SolutionRepository.DeleteRepositoryItem(profileToDelete);
@@ -242,27 +242,35 @@ private void RefreshgrdDefectsProfilesHandler(object sender, RoutedEventArgs e)
 
         private void RefreshgrdDefectsFieldsHandler(object sender, RoutedEventArgs e)
         {
-            ALMDefectProfile AlmDefectProfile = (ALMDefectProfile)grdDefectsProfiles.CurrentItem;
+            try
             {
-                mALMDefectProfileFields = FetchDefectFields(AlmDefectProfile.AlmType);
-                mALMDefectProfileFields.Where(z => z.Mandatory).ToList().ForEach(x => x.SelectedValue = string.Empty);
-                mALMDefectProfileFieldsExisted = [];
-                foreach (ExternalItemFieldBase aLMDefectProfileField in mALMDefectProfileFields)
+                ALMDefectProfile AlmDefectProfile = (ALMDefectProfile)grdDefectsProfiles.CurrentItem;
                 {
-                    ExternalItemFieldBase aLMDefectProfileFieldExisted = (ExternalItemFieldBase)aLMDefectProfileField.CreateCopy();
-                    if (!string.IsNullOrEmpty(aLMDefectProfileField.ExternalID))
-                    {
-                        aLMDefectProfileFieldExisted.ExternalID = string.Copy(aLMDefectProfileField.ExternalID);
-                    }
-                    ExternalItemFieldBase field = AlmDefectProfile.ALMDefectProfileFields.FirstOrDefault(x => x.ID == aLMDefectProfileField.ID);
-                    if (field != null)
+                    mALMDefectProfileFields = FetchDefectFields(AlmDefectProfile.AlmType);
+                    mALMDefectProfileFields.Where(z => z.Mandatory).ToList().ForEach(x => x.SelectedValue = string.Empty);
+                    mALMDefectProfileFieldsExisted = [];
+                    foreach (ExternalItemFieldBase aLMDefectProfileField in mALMDefectProfileFields)
                     {
-                        aLMDefectProfileFieldExisted.SelectedValue = field.SelectedValue;
+                        ExternalItemFieldBase aLMDefectProfileFieldExisted = (ExternalItemFieldBase)aLMDefectProfileField.CreateCopy();
+                        if (!string.IsNullOrEmpty(aLMDefectProfileField.ExternalID))
+                        {
+                            aLMDefectProfileFieldExisted.ExternalID = string.Copy(aLMDefectProfileField.ExternalID);
+                        }
+                        ExternalItemFieldBase field = AlmDefectProfile.ALMDefectProfileFields.FirstOrDefault(x => x.ID == aLMDefectProfileField.ID);
+                        if (field != null)
+                        {
+                            aLMDefectProfileFieldExisted.SelectedValue = field.SelectedValue;
+                        }
+                        aLMDefectProfileFieldExisted.PossibleValues = aLMDefectProfileField.PossibleValues;
+                        mALMDefectProfileFieldsExisted.Add(aLMDefectProfileFieldExisted);
                     }
-                    aLMDefectProfileFieldExisted.PossibleValues = aLMDefectProfileField.PossibleValues;
-                    mALMDefectProfileFieldsExisted.Add(aLMDefectProfileFieldExisted);
+                    AlmDefectProfile.ALMDefectProfileFields = mALMDefectProfileFieldsExisted;
                 }
-                AlmDefectProfile.ALMDefectProfileFields = mALMDefectProfileFieldsExisted;
+            }
+            catch (Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.ERROR, "No Defect Profile is created");
+                Reporter.ToUser(eUserMsgKey.NoDefectProfileCreated);
             }
         }
         private void FetchgrdDefectsFieldsHandler(object sender, RoutedEventArgs e)

Ginger/Ginger/ALM/Repository/OctaneRepository.cs

@@ -169,26 +169,37 @@ public override bool ExportBusinessFlowToALM(BusinessFlow businessFlow, bool per
             if (!String.IsNullOrEmpty(businessFlow.ExternalID))
             {
                 matchingTS = ((OctaneCore)ALMIntegration.Instance.AlmCore).GetTestSuiteById(businessFlow.ExternalID);
-                if (matchingTS != null)
+                if (businessFlow.ALMTestSetLevel.Equals("RunSet", StringComparison.CurrentCultureIgnoreCase))
                 {
-                    //ask user if want to continute
-                    userSelec = Reporter.ToUser(eUserMsgKey.BusinessFlowAlreadyMappedToTC, businessFlow.Name, matchingTS.Name);
-                    if (userSelec == eUserMsgSelection.Cancel)
-                    {
-                        return false;
-                    }
-                    else if (userSelec == eUserMsgSelection.No)
+                    if (String.IsNullOrEmpty(testPlanUploadPath))
                     {
-                        matchingTS = null;
+                        testPlanUploadPath = matchingTS.ParentId;
                     }
-                    else
+                }
+                else
+                {
+                    if (matchingTS != null)
                     {
-                        if (String.IsNullOrEmpty(testPlanUploadPath))
+                        //ask user if want to continute
+                        userSelec = Reporter.ToUser(eUserMsgKey.BusinessFlowAlreadyMappedToTC, businessFlow.Name, matchingTS.Name);
+                        if (userSelec == eUserMsgSelection.Cancel)
                         {
-                            testPlanUploadPath = matchingTS.ParentId;
+                            return false;
+                        }
+                        else if (userSelec == eUserMsgSelection.No)
+                        {
+                            matchingTS = null;
+                        }
+                        else
+                        {
+                            if (String.IsNullOrEmpty(testPlanUploadPath))
+                            {
+                                testPlanUploadPath = matchingTS.ParentId;
+                            }
                         }
                     }
                 }
+
             }
 
 

Ginger/Ginger/ALM/Repository/RQMRepository.cs

@@ -18,6 +18,7 @@ limitations under the License.
 
 using amdocs.ginger.GingerCoreNET;
 using Amdocs.Ginger.Common;
+using Amdocs.Ginger.Repository;
 using Ginger.ALM.RQM;
 using GingerCore;
 using GingerCore.Activities;
@@ -240,7 +241,9 @@ public override bool ExportBusinessFlowToALM(BusinessFlow businessFlow, bool per
             {
                 return false;
             }
-            if (WorkSpace.Instance.Solution.ExternalItemsFields.Where(x => x.ItemType == "TestCase").ToList().Count == 0)
+            var originalExternalFields = GingerCoreNET.GeneralLib.General.GetExternalFields();
+
+            if (!originalExternalFields.Any(x => x.ItemType == "TestCase"))
             {
                 Reporter.ToUser(eUserMsgKey.StaticInfoMessage, "Current solution have no predefined values for RQM's mandatory fields. Please configure before doing export. ('ALM'-'ALM Items Fields Configuration')");
                 return false;
@@ -256,7 +259,7 @@ public override bool ExportBusinessFlowToALM(BusinessFlow businessFlow, bool per
             string res = string.Empty;
             Reporter.ToStatus(eStatusMsgKey.ExportItemToALM, null, businessFlow.Name);
 
-            exportRes = ((RQMCore)ALMIntegration.Instance.AlmCore).ExportBusinessFlowToRQM(businessFlow, WorkSpace.Instance.Solution.ExternalItemsFields, ref res);
+            exportRes = ((RQMCore)ALMIntegration.Instance.AlmCore).ExportBusinessFlowToRQM(businessFlow, originalExternalFields, ref res);
 
             if (exportRes)
             {
@@ -288,6 +291,7 @@ public override bool ExportBusinessFlowToALM(BusinessFlow businessFlow, bool per
             return exportRes;
         }
 
+
         #region External Item Fields
 
         public override eUserMsgKey GetDownloadPossibleValuesMessage()

Ginger/Ginger/App.xaml.cs

@@ -261,7 +261,6 @@ private async void Application_Startup(object sender, StartupEventArgs e)
 
                 bool startGrid = ShouldStartGrid(e.Args);
                 WorkSpace.Init(new WorkSpaceEventHandler(), startGrid);
-
                 var parserResult = ParseCommandLineArguments(e.Args);
 
                 DoOptions doOptions = ExtractDoOptions(parserResult);
@@ -271,9 +270,7 @@ private async void Application_Startup(object sender, StartupEventArgs e)
                     WorkSpace.Instance.RunningInExecutionMode = true;
                     Reporter.ReportAllAlsoToConsole = true;
                 }
-
                 InitializeGingerCore();
-
                 if (!WorkSpace.Instance.RunningInExecutionMode)
                 {
                     ProcessGingerUIStartup(doOptions);
@@ -287,8 +284,8 @@ private async void Application_Startup(object sender, StartupEventArgs e)
             {
                 Reporter.ToLog(eLogLevel.ERROR, "Unhandled exception in Application_Startup", ex);
             }
-        }
- 
+       }
+
 
         /// <summary>
         /// Initializes the logging mechanism for the application using log4net.
@@ -325,11 +322,16 @@ private ParserResult<object> ParseCommandLineArguments(string[] args)
             if (args.Length == 1)
             {
                 string input = args[0];
+                input = input.Replace("\n", "").Replace("\r", "");
                 input = System.Web.HttpUtility.UrlDecode(input);
                 if (input.StartsWith("ginger://"))
                 {
                     input = input.Substring("ginger://".Length);
                 }
+                if (input.EndsWith("/"))
+                {
+                    input = input.Substring(0, input.Length - 1);
+                }
                 List<string> resultList = General.SplitWithPaths(input).Select(s => s.Trim('\"', '\'')).ToList();
                 arguments = resultList.ToArray();
             }
@@ -338,11 +340,9 @@ private ParserResult<object> ParseCommandLineArguments(string[] args)
                 arguments = args;
             }
 
-
             cliProcessor = new CLIProcessor();
             return arguments.Length != 0 ? cliProcessor.ParseArguments(arguments) : null;
         }
-
         /// <summary>
         /// Extracts the DoOptions object from the parser result if available and the operation is 'open'.
         /// Otherwise, returns null.

Ginger/Ginger/AutomatePageLib/ExecutionSummaryPage.xaml.cs

@@ -148,13 +148,6 @@ public void SwitchLegend(string status)
 
         private void ShowStatus()
         {
-            // Why we create new GR? !!!
-            GingerExecutionEngine Gr = new GingerExecutionEngine(new GingerRunner());
-            foreach (Activity activity in mContext.BusinessFlow.Activities)
-            {
-                Gr.CalculateActivityFinalStatus(activity);
-            }
-            Gr.CalculateBusinessFlowFinalStatus(mContext.BusinessFlow);
             StatusLabel.Content = mContext.BusinessFlow.RunStatus;
             StatusLabel.Foreground = General.GetStatusBrush(mContext.BusinessFlow.RunStatus);
         }