#13 Add mapping of Base, ElementFind, Waiting, Verification timeout and interval; #14 Deprecate mapping of RetryTimeout and RetryInterval; Update GeneralSettings_NUnit test

Author: YevgeniyShunevych

README.md

@@ -367,8 +367,14 @@ string sectionBoolValue = AppConfig.Current.Section.BoolProperty;
   "takeScreenshotOnNUnitError": true,
   "takeScreenshotOnNUnitErrorTitle": "string",
   "assertionExceptionType": "string", // Replaces Atata.AssertionException type with custom type, e.g.: "NUnit.Framework.AssertionException, nunit.framework".
-  "retryTimeout": 5, // Sets the retry timeout in seconds.
-  "retryInterval": 0.5, // Sets the retry interval in seconds.
+  "baseRetryTimeout": 5, // Sets the base retry timeout in seconds.
+  "baseRetryInterval": 0.5, // Sets the base retry interval in seconds.
+  "elementFindTimeout": 5, // Sets the element find timeout in seconds.
+  "elementFindRetryInterval": 0.5, // Sets the element find retry interval in seconds.
+  "waitingTimeout": 5, // Sets the waiting timeout in seconds.
+  "waitingRetryInterval": 0.5, // Sets the waiting retry interval in seconds.
+  "verificationTimeout": 5, // Sets the verification timeout in seconds.
+  "verificationRetryInterval": 0.5, // Sets the verification retry interval in seconds.
   "logConsumers": [ // Configures list of log consumers.
     {
       "type": "nunit", // Supports: "debug", "trace", "nunit", "nlog" and custom consumers registered via LogConsumerAliases.Register method.

src/Atata.Configuration.Json.Tests/Configs/Chrome+NUnit.json

@@ -19,6 +19,12 @@
     }
   ],
   "assertionExceptionType": "NUnit.Framework.AssertionException, nunit.framework",
-  "retryTimeout": 7,
-  "retryInterval": 0.7
+  "baseRetryTimeout": 7,
+  "baseRetryInterval": 0.7,
+  "elementFindTimeout": 8,
+  "elementFindRetryInterval": 0.8,
+  "waitingTimeout": 9,
+  "waitingRetryInterval": 0.9,
+  "verificationTimeout": 10,
+  "verificationRetryInterval": 1
 }

src/Atata.Configuration.Json.Tests/GeneralSettingsTests.cs

@@ -23,8 +23,17 @@ public void GeneralSettings_NUnit()
 
             context.AssertionExceptionType.Should().Be(typeof(NUnit.Framework.AssertionException));
 
-            context.RetryTimeout.Should().Be(TimeSpan.FromSeconds(7));
-            context.RetryInterval.Should().Be(TimeSpan.FromSeconds(0.7));
+            context.BaseRetryTimeout.Should().Be(TimeSpan.FromSeconds(7));
+            context.BaseRetryInterval.Should().Be(TimeSpan.FromSeconds(0.7));
+
+            context.ElementFindTimeout.Should().Be(TimeSpan.FromSeconds(8));
+            context.ElementFindRetryInterval.Should().Be(TimeSpan.FromSeconds(0.8));
+
+            context.WaitingTimeout.Should().Be(TimeSpan.FromSeconds(9));
+            context.WaitingRetryInterval.Should().Be(TimeSpan.FromSeconds(0.9));
+
+            context.VerificationTimeout.Should().Be(TimeSpan.FromSeconds(10));
+            context.VerificationRetryInterval.Should().Be(TimeSpan.FromSeconds(1));
 
             context.TestNameFactory().Should().Be(nameof(GeneralSettings_NUnit));
         }

src/Atata.Configuration.Json/JsonConfig`1.cs

@@ -54,14 +54,64 @@ public DriverJsonSection Driver
         public string Culture { get; set; }
 
         /// <summary>
-        /// Gets or sets the retry timeout in seconds.
+        /// Gets or sets the base retry timeout in seconds.
         /// </summary>
-        public double? RetryTimeout { get; set; }
+        [Obsolete("Use BaseRetryTimeout instead.")] // Obsolete since v0.17.0.
+        public double? RetryTimeout
+        {
+            get => BaseRetryTimeout;
+            set => BaseRetryTimeout = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the base retry interval in seconds.
+        /// </summary>
+        [Obsolete("Use BaseRetryInterval instead.")] // Obsolete since v0.17.0.
+        public double? RetryInterval
+        {
+            get => BaseRetryInterval;
+            set => BaseRetryInterval = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the base retry timeout in seconds.
+        /// </summary>
+        public double? BaseRetryTimeout { get; set; }
+
+        /// <summary>
+        /// Gets or sets the base retry interval in seconds.
+        /// </summary>
+        public double? BaseRetryInterval { get; set; }
+
+        /// <summary>
+        /// Gets or sets the element find timeout in seconds.
+        /// </summary>
+        public double? ElementFindTimeout { get; set; }
+
+        /// <summary>
+        /// Gets or sets the element find retry interval in seconds.
+        /// </summary>
+        public double? ElementFindRetryInterval { get; set; }
+
+        /// <summary>
+        /// Gets or sets the waiting timeout in seconds.
+        /// </summary>
+        public double? WaitingTimeout { get; set; }
+
+        /// <summary>
+        /// Gets or sets the waiting retry interval in seconds.
+        /// </summary>
+        public double? WaitingRetryInterval { get; set; }
+
+        /// <summary>
+        /// Gets or sets the verification timeout in seconds.
+        /// </summary>
+        public double? VerificationTimeout { get; set; }
 
         /// <summary>
-        /// Gets or sets the retry interval in seconds.
+        /// Gets or sets the verification retry interval in seconds.
         /// </summary>
-        public double? RetryInterval { get; set; }
+        public double? VerificationRetryInterval { get; set; }
 
         public string AssertionExceptionType { get; set; }
 

src/Atata.Configuration.Json/Mapping/JsonConfigMapper.cs

@@ -13,11 +13,29 @@ public static AtataContextBuilder Map<TConfig>(TConfig config, AtataContextBuild
             if (config.Culture != null)
                 builder.UseCulture(config.Culture);
 
-            if (config.RetryTimeout != null)
-                builder.UseRetryTimeout(TimeSpan.FromSeconds(config.RetryTimeout.Value));
+            if (config.BaseRetryTimeout != null)
+                builder.UseBaseRetryTimeout(TimeSpan.FromSeconds(config.BaseRetryTimeout.Value));
 
-            if (config.RetryInterval != null)
-                builder.UseRetryInterval(TimeSpan.FromSeconds(config.RetryInterval.Value));
+            if (config.BaseRetryInterval != null)
+                builder.UseBaseRetryInterval(TimeSpan.FromSeconds(config.BaseRetryInterval.Value));
+
+            if (config.ElementFindTimeout != null)
+                builder.UseElementFindTimeout(TimeSpan.FromSeconds(config.ElementFindTimeout.Value));
+
+            if (config.ElementFindRetryInterval != null)
+                builder.UseElementFindRetryInterval(TimeSpan.FromSeconds(config.ElementFindRetryInterval.Value));
+
+            if (config.WaitingTimeout != null)
+                builder.UseWaitingTimeout(TimeSpan.FromSeconds(config.WaitingTimeout.Value));
+
+            if (config.WaitingRetryInterval != null)
+                builder.UseWaitingRetryInterval(TimeSpan.FromSeconds(config.WaitingRetryInterval.Value));
+
+            if (config.VerificationTimeout != null)
+                builder.UseVerificationTimeout(TimeSpan.FromSeconds(config.VerificationTimeout.Value));
+
+            if (config.VerificationRetryInterval != null)
+                builder.UseVerificationRetryInterval(TimeSpan.FromSeconds(config.VerificationRetryInterval.Value));
 
             if (config.AssertionExceptionType != null)
                 builder.UseAssertionExceptionType(Type.GetType(config.AssertionExceptionType, true));