Move waiter to framework

yapoml · Jun 26, 2024 · b86a81f · b86a81f
1 parent 25d3cf7
commit b86a81f
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 93 deletions.
diff --git a/src/Yapoml.Selenium.SourceGeneration/Yapoml.Selenium.SourceGeneration.csproj b/src/Yapoml.Selenium.SourceGeneration/Yapoml.Selenium.SourceGeneration.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
     <PackageReference Include="Scriban" Version="5.9.0" GeneratePathProperty="true" PrivateAssets="all" />
     <PackageReference Include="YamlDotNet" Version="13.4.0" GeneratePathProperty="true" PrivateAssets="all" />
-    <PackageReference Include="Yapoml.Framework.Workspace" Version="0.15.2" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="Yapoml.Framework.Workspace" Version="0.16.0" GeneratePathProperty="true" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Yapoml.Selenium/Components/BaseComponentConditions.cs b/src/Yapoml.Selenium/Components/BaseComponentConditions.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using System.Threading;
+using Yapoml.Framework;
 using Yapoml.Framework.Logging;
 using Yapoml.Selenium.Components.Conditions;
 using Yapoml.Selenium.Components.Conditions.Generic;
@@ -81,7 +82,7 @@ bool attempt()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(attempt, timeout.Value, PollingInterval);
+                        Waiter.Until(attempt, timeout.Value, PollingInterval);
                     });
                 }
             }
@@ -128,7 +129,7 @@ bool attempt()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(attempt, timeout.Value, PollingInterval);
+                        Waiter.Until(attempt, timeout.Value, PollingInterval);
                     });
                 }
             }
@@ -188,7 +189,7 @@ bool attempt()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(attempt, timeout.Value, PollingInterval);
+                        Waiter.Until(attempt, timeout.Value, PollingInterval);
                     });
                 }
             }
@@ -237,7 +238,7 @@ bool attempt()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(attempt, timeout.Value, PollingInterval);
+                        Waiter.Until(attempt, timeout.Value, PollingInterval);
                     });
                 }
             }
@@ -269,7 +270,7 @@ bool attempt()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(attempt, timeout.Value, PollingInterval);
+                        Waiter.Until(attempt, timeout.Value, PollingInterval);
                     });
                 }
             }
@@ -301,7 +302,7 @@ bool attempt()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(attempt, timeout.Value, PollingInterval);
+                        Waiter.Until(attempt, timeout.Value, PollingInterval);
                     });
                 }
             }
@@ -344,7 +345,7 @@ bool attempt()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(attempt, timeout.Value, PollingInterval);
+                        Waiter.Until(attempt, timeout.Value, PollingInterval);
                     });
                 }
             }
@@ -377,7 +378,7 @@ bool attempt()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(attempt, timeout.Value, PollingInterval);
+                        Waiter.Until(attempt, timeout.Value, PollingInterval);
                     });
                 }
             }
@@ -430,7 +431,7 @@ bool attempt()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(attempt, timeout.Value, PollingInterval);
+                        Waiter.Until(attempt, timeout.Value, PollingInterval);
                     });
                 }
             }
@@ -473,7 +474,7 @@ bool attempt()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(attempt, timeout.Value, PollingInterval);
+                        Waiter.Until(attempt, timeout.Value, PollingInterval);
                     });
                 }
             }

diff --git a/src/Yapoml.Selenium/Components/BaseComponentList.cs b/src/Yapoml.Selenium/Components/BaseComponentList.cs
@@ -6,12 +6,12 @@
 #if NET6_0_OR_GREATER
 using System.Runtime.CompilerServices;
 #endif
+using Yapoml.Framework;
 using Yapoml.Framework.Logging;
 using Yapoml.Framework.Options;
 using Yapoml.Selenium.Components.Metadata;
 using Yapoml.Selenium.Events;
 using Yapoml.Selenium.Options;
-using Yapoml.Selenium.Services;
 using Yapoml.Selenium.Services.Factory;
 using Yapoml.Selenium.Services.Locator;
 

diff --git a/src/Yapoml.Selenium/Components/BaseComponentListConditions.cs b/src/Yapoml.Selenium/Components/BaseComponentListConditions.cs
@@ -5,10 +5,10 @@
 using System.Runtime.CompilerServices;
 #endif
 using System.Threading;
+using Yapoml.Framework;
 using Yapoml.Framework.Logging;
 using Yapoml.Selenium.Components.Conditions;
 using Yapoml.Selenium.Events;
-using Yapoml.Selenium.Services;
 using Yapoml.Selenium.Services.Locator;
 
 namespace Yapoml.Selenium.Components

diff --git a/src/Yapoml.Selenium/Components/BasePageConditions.cs b/src/Yapoml.Selenium/Components/BasePageConditions.cs
@@ -1,6 +1,7 @@
 using OpenQA.Selenium;
 using System;
 using System.Threading;
+using Yapoml.Framework;
 using Yapoml.Framework.Logging;
 using Yapoml.Selenium.Components.Conditions;
 using Yapoml.Selenium.Components.Metadata;
@@ -54,7 +55,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, PollingInterval);
+                        Waiter.Until(condition, timeout.Value, PollingInterval);
                     });
                 }
             }

diff --git a/src/Yapoml.Selenium/Components/Conditions/Generic/NumericConditions.cs b/src/Yapoml.Selenium/Components/Conditions/Generic/NumericConditions.cs
@@ -1,4 +1,5 @@
 using System;
+using Yapoml.Framework;
 using Yapoml.Framework.Logging;
 
 namespace Yapoml.Selenium.Components.Conditions.Generic
@@ -42,7 +43,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -80,7 +81,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -118,7 +119,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -156,7 +157,7 @@ bool condition()
                 {
                     scope.Execute(() => 
                     { 
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -194,7 +195,7 @@ bool condition()
                 {
                     scope.Execute(() => 
                     { 
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -232,7 +233,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }

diff --git a/src/Yapoml.Selenium/Components/Conditions/Generic/TextualConditions.cs b/src/Yapoml.Selenium/Components/Conditions/Generic/TextualConditions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Text.RegularExpressions;
+using Yapoml.Framework;
 using Yapoml.Framework.Logging;
 
 namespace Yapoml.Selenium.Components.Conditions.Generic
@@ -43,7 +44,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -79,7 +80,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -110,7 +111,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -141,7 +142,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -177,7 +178,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -213,7 +214,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -249,7 +250,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -285,7 +286,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -321,7 +322,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -357,7 +358,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -388,7 +389,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }
@@ -419,7 +420,7 @@ bool condition()
                 {
                     scope.Execute(() =>
                     {
-                        Services.Waiter.Until(condition, timeout.Value, _pollingInterval);
+                        Waiter.Until(condition, timeout.Value, _pollingInterval);
                     });
                 }
             }

diff --git a/src/Yapoml.Selenium/Services/Waiter.cs b/src/Yapoml.Selenium/Services/Waiter.cs
diff --git a/src/Yapoml.Selenium/Yapoml.Selenium.csproj b/src/Yapoml.Selenium/Yapoml.Selenium.csproj
@@ -26,7 +26,7 @@
     </PackageReference>
 
     <PackageReference Include="Selenium.WebDriver" Version="4.11.0" />
-    <PackageReference Include="Yapoml.Framework" Version="0.15.2" />
+    <PackageReference Include="Yapoml.Framework" Version="0.16.0" />
   </ItemGroup>
 
   <ItemGroup>