Updated

Ginger-Automation · Aug 6, 2024 · d53461e · d53461e
1 parent 3cea8eb
commit d53461e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/Ginger/Ginger/SolutionWindows/AccessibilityRulePage.xaml.cs b/Ginger/Ginger/SolutionWindows/AccessibilityRulePage.xaml.cs
@@ -40,7 +40,6 @@ public AccessibilityRulePage()
             InitializeComponent();
             mSolution = WorkSpace.Instance.Solution;
             string allProperties = string.Empty;
-            actAccessibilityTesting = new ActAccessibilityTesting();
             LoadGridData();
             SetAppsGrid();
             mAccessibilityConfiguration = !WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<AccessibilityConfiguration>().Any() ? new AccessibilityConfiguration() : WorkSpace.Instance.SolutionRepository.GetFirstRepositoryItem<AccessibilityConfiguration>();

diff --git a/Ginger/GingerCoreNET/ActionsLib/UI/Web/ActAccessibilityTesting.cs b/Ginger/GingerCoreNET/ActionsLib/UI/Web/ActAccessibilityTesting.cs
@@ -306,7 +306,7 @@ public ObservableList<AccessibilityRuleData> RulesItemsdata
         public ObservableList<AccessibilityRuleData> GetRuleList()
         {
             AccessibilityRuleData AccessibilityRuleDataObjet = new AccessibilityRuleData();
-            AccessibilityConfiguration mAccessibilityConfiguration = new ();
+            AccessibilityConfiguration mAccessibilityConfiguration;
             if (WorkSpace.Instance.SolutionRepository != null)
             {
                 if(!WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<AccessibilityConfiguration>().Any())
@@ -323,7 +323,7 @@ public ObservableList<AccessibilityRuleData> GetRuleList()
                 mAccessibilityConfiguration = new ();
             }
             mAccessibilityConfiguration.ExcludedRules = mAccessibilityConfiguration.ExcludedRules != null ? mAccessibilityConfiguration.ExcludedRules : new();
-            ObservableList<AccessibilityRuleData> ruleDatalist = new ();
+            ObservableList<AccessibilityRuleData> ruleDatalist;
             try
             {
                 string AccessbiltyString = GetAccessiblityrules();
@@ -339,13 +339,14 @@ public ObservableList<AccessibilityRuleData> GetRuleList()
                         ruleData.Active = true;
                     }
                 }
+                return ruleDatalist;
             }
             catch (Exception ex)
             {
                 Error = "Error: during accessibility testing:" + ex.Message;
                 Reporter.ToLog(eLogLevel.ERROR, $"Error: during accessibility testing in GetRuleList. Configuration: {mAccessibilityConfiguration?.Name}", ex);
             }
-            return ruleDatalist;
+            return [];
         }
 
         private Dictionary<string, object> _items;

diff --git a/Ginger/GingerCoreNETUnitTest/ActionsLib/UI/Web/AccessiblityTests.cs b/Ginger/GingerCoreNETUnitTest/ActionsLib/UI/Web/AccessiblityTests.cs
@@ -44,7 +44,6 @@ public class AccessiblityTests
     {
 
         private static IWebDriver _driver;
-        ActAccessibilityTesting mact;
         IWebElement e = null;
 
         [ClassInitialize()]
@@ -82,7 +81,7 @@ public void TestAnalyzerAccessibility_Standard_Failed()
                 return;
             }
             _driver.Navigate().GoToUrl($"https://ginger.amdocs.com/");
-            mact = new ActAccessibilityTesting();
+            ActAccessibilityTesting mact = new ActAccessibilityTesting();
             mact.GetOrCreateInputParam(ActAccessibilityTesting.Fields.Target, ActAccessibilityTesting.eTarget.Page);
             mact.GetOrCreateInputParam(ActAccessibilityTesting.Fields.Analyzer, ActAccessibilityTesting.eAnalyzer.ByStandard);
             if (mact.GetInputParamValue(ActAccessibilityTesting.Fields.Analyzer) == nameof(ActAccessibilityTesting.eAnalyzer.ByStandard))
@@ -103,7 +102,7 @@ public void TestAnalyzerAccessibility_Severity_Failed()
                 return;
             }
             _driver.Navigate().GoToUrl($"https://ginger.amdocs.com/");
-            mact = new ActAccessibilityTesting();
+            ActAccessibilityTesting mact = new ActAccessibilityTesting();
             mact.GetOrCreateInputParam(ActAccessibilityTesting.Fields.Target, ActAccessibilityTesting.eTarget.Page);
             mact.GetOrCreateInputParam(ActAccessibilityTesting.Fields.Analyzer, ActAccessibilityTesting.eAnalyzer.BySeverity);
             if (mact.GetInputParamValue(ActAccessibilityTesting.Fields.Analyzer) == nameof(ActAccessibilityTesting.eAnalyzer.BySeverity))
@@ -124,7 +123,7 @@ public void TestAnalyzerAccessibility_Standard_Pass()
             }
             string htmlFilePath = Path.Combine(TestResources.GetTestResourcesFolder("Html"), "TestAccessiblity.html");
             _driver.Navigate().GoToUrl(htmlFilePath);
-            mact = new ActAccessibilityTesting();
+            ActAccessibilityTesting mact = new ActAccessibilityTesting();
             mact.GetOrCreateInputParam(ActAccessibilityTesting.Fields.Target, ActAccessibilityTesting.eTarget.Page);
             mact.GetOrCreateInputParam(ActAccessibilityTesting.Fields.Analyzer, ActAccessibilityTesting.eAnalyzer.ByStandard);
             if (mact.GetInputParamValue(ActAccessibilityTesting.Fields.Analyzer) == nameof(ActAccessibilityTesting.eAnalyzer.ByStandard))
@@ -145,7 +144,7 @@ public void TestAnalyzerAccessibility_Severity_Pass()
             }
             string htmlFilePath = Path.Combine(TestResources.GetTestResourcesFolder("Html"), "TestAccessiblity.html");
             _driver.Navigate().GoToUrl(htmlFilePath);
-            mact = new ActAccessibilityTesting();
+            ActAccessibilityTesting mact = new ActAccessibilityTesting();
             mact.GetOrCreateInputParam(ActAccessibilityTesting.Fields.Target, ActAccessibilityTesting.eTarget.Page);
             mact.GetOrCreateInputParam(ActAccessibilityTesting.Fields.Analyzer, ActAccessibilityTesting.eAnalyzer.BySeverity);
             if (mact.GetInputParamValue(ActAccessibilityTesting.Fields.Analyzer) == nameof(ActAccessibilityTesting.eAnalyzer.BySeverity))
@@ -164,7 +163,7 @@ public void TestCreateAxeBuilder_IsNotNull()
             {
                 return;
             }
-            mact = new ActAccessibilityTesting();
+            ActAccessibilityTesting mact = new ActAccessibilityTesting();
             AxeBuilder axeBuilder = mact.CreateAxeBuilder(_driver);
             Assert.AreNotEqual(null, axeBuilder);
         }
@@ -176,7 +175,7 @@ public void TestGetRuleList_isNotNull()
             {
                return;
             }
-            mact = new ActAccessibilityTesting();
+            ActAccessibilityTesting mact = new ActAccessibilityTesting();
             ObservableList<AccessibilityRuleData> ruleList = mact.GetRuleList();
             Assert.AreNotEqual(null, ruleList);
             Assert.AreEqual(92, ruleList.Count);