detach unneeded dependencies from Web project - add extension methods instead

n1xan · n1xan · commit 737542fa45ca · 2026-02-02T16:54:42.000+02:00
diff --git a/src/Bellatrix.Mobile/Bellatrix.Mobile.csproj b/src/Bellatrix.Mobile/Bellatrix.Mobile.csproj
@@ -16,7 +16,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\..\Bellatrix.LLM\Bellatrix.LLM.csproj" />
 		<ProjectReference Include="..\Bellatrix.Allure\Bellatrix.Results.Allure.csproj" />
+		<ProjectReference Include="..\Bellatrix.AWS\Bellatrix.AWS.csproj" />
+		<ProjectReference Include="..\Bellatrix.CognitiveServices\Bellatrix.CognitiveServices.csproj" />
 		<ProjectReference Include="..\Bellatrix.Core\Bellatrix.Core.csproj" />
 		<ProjectReference Include="..\Bellatrix.DynamicTestCases\Bellatrix.DynamicTestCases.csproj" />
 		<ProjectReference Include="..\Bellatrix.Layout\Bellatrix.Layout.csproj" />
diff --git a/src/Bellatrix.Web/Bellatrix.Web.csproj b/src/Bellatrix.Web/Bellatrix.Web.csproj
@@ -30,11 +30,8 @@
 		<ProjectReference Include="..\..\Bellatrix.LLM\Bellatrix.LLM.csproj" />
 		<ProjectReference Include="..\Bellatrix.Allure\Bellatrix.Results.Allure.csproj" />
 		<ProjectReference Include="..\Bellatrix.Api\Bellatrix.API.csproj" />
-		<ProjectReference Include="..\Bellatrix.AWS\Bellatrix.AWS.csproj" />
 		<ProjectReference Include="..\Bellatrix.CognitiveServices\Bellatrix.CognitiveServices.csproj" />
 		<ProjectReference Include="..\Bellatrix.Core\Bellatrix.Core.csproj" />
-		<ProjectReference Include="..\Bellatrix.DynamicTestCases\Bellatrix.DynamicTestCases.csproj" />
-		<ProjectReference Include="..\Bellatrix.ImageRecognition\Bellatrix.ImageRecognition.csproj" />
 		<ProjectReference Include="..\Bellatrix.KeyVault\Bellatrix.KeyVault.csproj" />
 		<ProjectReference Include="..\Bellatrix.Layout\Bellatrix.Layout.csproj" />
 		<ProjectReference Include="..\Bellatrix.Plugins.Screenshots\Bellatrix.Plugins.Screenshots.csproj" />
diff --git a/src/Bellatrix.Web/WebPluginsConfiguration.cs b/src/Bellatrix.Web/WebPluginsConfiguration.cs
@@ -13,6 +13,8 @@
 // <site>https://bellatrix.solutions/</site>
 using System;
 using System.Collections.Generic;
+using Bellatrix.DynamicTestCases.core;
+using Bellatrix.DynamicTestCases.core.componentHandlers;
 using Bellatrix.GoogleLighthouse.MSTest;
 using Bellatrix.GoogleLighthouse.NUnit;
 using Bellatrix.Layout;
diff --git a/src/Bellatrix.Web/eventhandlers/DynamicTestCases/DynamicTestCasesCheckboxEventHandlers.cs b/src/Bellatrix.Web/eventhandlers/DynamicTestCases/DynamicTestCasesCheckboxEventHandlers.cs
@@ -11,10 +11,12 @@
 // </copyright>
 // <author>Anton Angelov</author>
 // <site>https://bellatrix.solutions/</site>
+
 using Bellatrix.Web.Controls.EventHandlers;
 using Bellatrix.Web.Events;
+using Bellatrix.Web.Extensions;
 
-namespace Bellatrix.Web.Extensions.Controls.Controls.EventHandlers;
+namespace Bellatrix.DynamicTestCases.core.componentHandlers;
 
 public class DynamicTestCasesCheckboxEventHandlers : CheckboxEventHandlers
 {
diff --git a/src/Bellatrix.Web/eventhandlers/DynamicTestCases/DynamicTestCasesTextFieldEventHandlers.cs b/src/Bellatrix.Web/eventhandlers/DynamicTestCases/DynamicTestCasesTextFieldEventHandlers.cs
@@ -11,10 +11,12 @@
 // </copyright>
 // <author>Anton Angelov</author>
 // <site>https://bellatrix.solutions/</site>
+
 using Bellatrix.Web.Controls.EventHandlers;
 using Bellatrix.Web.Events;
+using Bellatrix.Web.Extensions;
 
-namespace Bellatrix.Web.Extensions.Controls.Controls.EventHandlers;
+namespace Bellatrix.DynamicTestCases.core;
 
 public class DynamicTestCasesTextFieldEventHandlers : TextFieldEventHandlers
 {
diff --git a/src/Bellatrix.Web/infrastructure/App.cs b/src/Bellatrix.Web/infrastructure/App.cs
@@ -18,8 +18,6 @@
 using Bellatrix.Api;
 using Bellatrix.Api.Configuration;
 using Bellatrix.Assertions;
-using Bellatrix.AWS;
-using Bellatrix.CognitiveServices;
 using Bellatrix.DynamicTestCases;
 using Bellatrix.LLM;
 using Bellatrix.Plugins;
@@ -51,14 +49,9 @@ public App()
     public CookiesService Cookies => ServicesCollection.Current.Resolve<CookiesService>();
     public ComponentCreateService Components => ServicesCollection.Current.Resolve<ComponentCreateService>();
     public DynamicTestCasesService TestCases => ServicesCollection.Current.Resolve<DynamicTestCasesService>();
-    public LighthouseService Lighthouse => ServicesCollection.Current.Resolve<LighthouseService>();
-    public ComputerVision ComputerVision => ServicesCollection.Current.Resolve<ComputerVision>();
-    public FormRecognizer FormRecognizer => ServicesCollection.Current.Resolve<FormRecognizer>();
     public IAssert Assert => ServicesCollection.Current.Resolve<IAssert>();
     public ProxyService Proxy => ServicesCollection.Current.Resolve<ProxyService>();
 
-    public AWSServicesFactory AWS => ServicesCollection.Current.Resolve<AWSServicesFactory>();
-
     public ApiClientService ApiClient
     {
         get => _apiClientService;
diff --git a/templates/Bellatrix.Web.GettingStarted/37. Computer Vision/AppExtensions.ComputerVision.cs b/templates/Bellatrix.Web.GettingStarted/37. Computer Vision/AppExtensions.ComputerVision.cs
@@ -0,0 +1,19 @@
+using Bellatrix.CognitiveServices;
+
+namespace Bellatrix.Web.GettingStarted;
+
+public static partial class AppExtensions
+{
+    extension(App _)
+    {
+        public static FormRecognizer FormRecognizer()
+        {
+            return ServicesCollection.Current.Resolve<FormRecognizer>();
+        }
+
+        public static ComputerVision ComputerVision()
+        {
+            return ServicesCollection.Current.Resolve<ComputerVision>();
+        }
+    }
+}
diff --git a/templates/Bellatrix.Web.GettingStarted/37. Computer Vision/TextVerificationPDF.cs b/templates/Bellatrix.Web.GettingStarted/37. Computer Vision/TextVerificationPDF.cs
@@ -11,7 +11,7 @@ public class TextVerificationPDF : NUnit.WebTest
     [Ignore("API example purposes only. No need to run.")]
     public void MakeTextExtractionFromPDF()
     {
-        var textSnippets = App.ComputerVision.ExtractOCRTextFromLocalFile("sampleinvoice.pdf");
+        var textSnippets = App.ComputerVision().ExtractOCRTextFromLocalFile("sampleinvoice.pdf");
         textSnippets.ForEach(Console.WriteLine);
 
         List<string> expectedTextSnippets = new List<string>()
@@ -23,14 +23,14 @@ public void MakeTextExtractionFromPDF()
             "$136.00",
         };
 
-        App.ComputerVision.ValidateText("sampleinvoice.pdf", "en", expectedTextSnippets);
+        App.ComputerVision().ValidateText("sampleinvoice.pdf", "en", expectedTextSnippets);
     }
 
     [Test]
     [Ignore("API example purposes only. No need to run.")]
     public void ExtractTextFromGraph()
     {
-        var textSnippets = App.ComputerVision.ExtractOCRTextFromLocalFile("devPortalGraph1.PNG");
+        var textSnippets = App.ComputerVision().ExtractOCRTextFromLocalFile("devPortalGraph1.PNG");
         textSnippets.ForEach(Console.WriteLine);
 
         List<string> expectedTextSnippets = new List<string>()
@@ -39,23 +39,23 @@ public void ExtractTextFromGraph()
             "Apr 13 00:00",
         };
 
-        App.ComputerVision.ValidateText("devPortalGraph1.PNG", "en", expectedTextSnippets);
+        App.ComputerVision().ValidateText("devPortalGraph1.PNG", "en", expectedTextSnippets);
     }
 
     [Test]
     [Ignore("API example purposes only. No need to run.")]
     public void AssertPdfLayoutBasedOnTemplate()
     {
-        App.FormRecognizer.SaveAnalyzedFileToJson("sampleinvoice.pdf", "analizedFileOutput.json");
+        App.FormRecognizer().SaveAnalyzedFileToJson("sampleinvoice.pdf", "analizedFileOutput.json");
 
-        App.FormRecognizer.ValidateFormLayout("sampleinvoice.pdf", "sampleinvoice1.pdf");
+        App.FormRecognizer().ValidateFormLayout("sampleinvoice.pdf", "sampleinvoice1.pdf");
     }
 
     [Test]
     [Ignore("API example purposes only. No need to run.")]
     public void AssertCellsText()
     {
-        var analyzedPdf = App.FormRecognizer.Analyze("sampleinvoice.pdf");
+        var analyzedPdf = App.FormRecognizer().Analyze("sampleinvoice.pdf");
         analyzedPdf.AssertLinesCount(48);
 
         analyzedPdf.GetTable().GetCell(0, 3).AssertTextEquals("OF355548 24/1/2014");
diff --git a/templates/Bellatrix.Web.GettingStarted/38. Google Lighthouse/AppExtensions.Lighthouse.cs b/templates/Bellatrix.Web.GettingStarted/38. Google Lighthouse/AppExtensions.Lighthouse.cs
@@ -0,0 +1,11 @@
+using Bellatrix.CognitiveServices;
+
+namespace Bellatrix.Web.GettingStarted;
+
+public static partial class AppExtensions
+{
+    public static LighthouseService Lighthouse(this App app)
+    {
+        return ServicesCollection.Current.Resolve<LighthouseService>();
+    }
+}
diff --git a/templates/Bellatrix.Web.GettingStarted/38. Google Lighthouse/GoogleLighthouseAnalysisTests.cs b/templates/Bellatrix.Web.GettingStarted/38. Google Lighthouse/GoogleLighthouseAnalysisTests.cs
@@ -44,18 +44,18 @@ public void LighthouseAnalysisLogin()
         // In the testFrameworkSettings.json file, there is a section called lighthouseSettings.
         // There, you can enable/disable the integration + you can set default CLI arguments.
         // In the PerformLighthouseAnalysis method, you can add additional arguments merged with the default ones or override them completely.
-        App.Lighthouse.PerformLighthouseAnalysis();
+        App.Lighthouse().PerformLighthouseAnalysis();
 
         // BELLATRIX exposes a few assertion methods for most essential metrics.
-        App.Lighthouse.AssertFirstMeaningfulPaintScoreMoreThan(0.5);
+        App.Lighthouse().AssertFirstMeaningfulPaintScoreMoreThan(0.5);
 
         // Since there are thousands of possible values that you might be interested in validating, we give you the AssertMetric method.
         // Through it, you can use lambda syntax to pick the value that you want to assert. Through Fluent Builder API afterward you need to pick
         // what type of assertion you want to perform - equal, greaterThan, lessThan, and so on + the expected value.
         // Of course, don't forget to call the Perform method, which will do the actual assertion. The API works pretty much the same as Selenium Actions.
-        App.Lighthouse.AssertMetric(r => r.Categories.Pwa.Score).LessThan(2.3).Perform();
-        App.Lighthouse.AssertMetric(r => r.Categories.Performance.Score).GreaterThan(0.5).Perform();
-        App.Lighthouse.AssertMetric(r => r.Categories.Performance.Score).GreaterThanOrEqual(0.5).Perform();
+        App.Lighthouse().AssertMetric(r => r.Categories.Pwa.Score).LessThan(2.3).Perform();
+        App.Lighthouse().AssertMetric(r => r.Categories.Performance.Score).GreaterThan(0.5).Perform();
+        App.Lighthouse().AssertMetric(r => r.Categories.Performance.Score).GreaterThanOrEqual(0.5).Perform();
 
         Anchor logoutLink = App.Components.CreateByInnerTextContaining<Anchor>("Log out");
 
diff --git a/tests/Bellatrix.Web.Tests/AppExtensions.cs b/tests/Bellatrix.Web.Tests/AppExtensions.cs
@@ -0,0 +1,15 @@
+using Bellatrix.CognitiveServices;
+using Bellatrix.DynamicTestCases;
+
+namespace Bellatrix.Web.GettingStarted;
+
+public static partial class AppExtensions
+{
+    extension(App app)
+    {
+        public DynamicTestCasesService TestCases()
+        {
+            return new DynamicTestCasesService();
+        }
+    }
+}
diff --git a/tests/Bellatrix.Web.Tests/Page Objects/PageObjectsTests.cs b/tests/Bellatrix.Web.Tests/Page Objects/PageObjectsTests.cs
@@ -1,4 +1,5 @@
 ﻿using Bellatrix.DynamicTestCases.AzureDevOps;
+using Bellatrix.Web.GettingStarted;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Bellatrix.Web.Tests;
@@ -16,7 +17,7 @@ public class PageObjectsTests : MSTest.WebTest
     [AzureDevOpsDynamicTestCaseAttribute]
     public void PurchaseRocketWithoutPageObjects20()
     {
-        App.TestCases.AddPrecondition($"Navigate to https://demos.bellatrix.solutions/");
+        App.TestCases().AddPrecondition($"Navigate to https://demos.bellatrix.solutions/");
         App.Navigation.Navigate("https://demos.bellatrix.solutions/");
 
         Select sortDropDown = App.Components.CreateByNameEndingWith<Select>("orderby");
