Merge branch 'master' of https://github.com/VladimirDimov/jQuery-Datatables-Server-Side-Processing

# Conflicts:
#	src/Tests/integrationtests/Tests.SeleniumTests/Tests/ColumnFiltersIntegrationTests.cs
#	src/Tests/integrationtests/Tests.SeleniumTests/Tests/CustomFiltersTests.cs
#	src/Tests/integrationtests/Tests.SeleniumTests/Tests/SearchTests.cs

Author: VladimirDimov

src/Tests/integrationtests/Tests.SeleniumTests/Common/DriverSingletonProvider.cs

@@ -9,6 +9,12 @@ internal static class DriverSingletonProvider
 
         public static IWebDriver GetDriver()
         {
+            if (driver == null)
+            {
+                driver = GetNewDriverInstance();
+                driver.Manage().Timeouts().PageLoad = new System.TimeSpan(0, 0, 5);
+            }
+
             return driver;
         }
 
@@ -20,11 +26,7 @@ public static void Dispose()
             }
 
             driver.Dispose();
-        }
-
-        static DriverSingletonProvider()
-        {
-            DriverSingletonProvider.driver = GetNewDriverInstance();
+            driver = null;
         }
 
         private static IWebDriver GetNewDriverInstance()

src/Tests/integrationtests/Tests.SeleniumTests/ExtensionMethods/SearchContextExtensionMethods.cs

@@ -1,18 +1,50 @@
 namespace Tests.SeleniumTests.ExtensionMethods
 {
+    using System;
     using System.Collections.ObjectModel;
+    using System.Threading;
     using OpenQA.Selenium;
 
     public static class SearchContextExtensionMethods
     {
         public static IWebElement FindElementByCssSelector(this ISearchContext context, string selector)
         {
-            return context.FindElement(By.CssSelector(selector));
+            Exception outerEx = null;
+
+            for (int i = 0; i < 5; i++)
+            {
+                try
+                {
+                    return context.FindElement(By.CssSelector(selector));
+                }
+                catch (System.Exception ex)
+                {
+                    outerEx = ex;
+                    Thread.Sleep(1000);
+                }
+            }
+
+            throw outerEx;
         }
 
         public static ReadOnlyCollection<IWebElement> FindElementsByCssSelector(this ISearchContext context, string selector)
         {
-            return context.FindElements(By.CssSelector(selector));
+            Exception outerEx = null;
+
+            for (int i = 0; i < 5; i++)
+            {
+                try
+                {
+                    return context.FindElements(By.CssSelector(selector));
+                }
+                catch (System.Exception ex)
+                {
+                    outerEx = ex;
+                    Thread.Sleep(1000);
+                }
+            }
+
+            throw outerEx;
         }
     }
 }

src/Tests/integrationtests/Tests.SeleniumTests/Tests.SeleniumTests.csproj

@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;USE_UTYPES, USE_STYPES, USE_CHARTYPE, USE_DTOFFSET</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -78,6 +78,7 @@
     <Compile Include="Common\CustomFilterContainer.cs" />
     <Compile Include="Common\Data.cs" />
     <Compile Include="Common\DriverSingletonProvider.cs" />
+    <Compile Include="Common\ExceptionsHandler.cs" />
     <Compile Include="Common\GlobalConstants.cs" />
     <Compile Include="Common\Navigator.cs" />
     <Compile Include="Common\TableElement.cs" />

src/Tests/integrationtests/Tests.SeleniumTests/Tests/SortDataTests.cs

@@ -37,15 +37,19 @@ public void SetUp()
         [TestCase("Nested Model CharNullable", SortDirectionsEnum.Desc)]
         public void Sort_SholdWorkAppropriateForTextTypes(string columnName, SortDirectionsEnum direction)
         {
-            this.navigator.AllTypesDataPage().GoTo();
-            var tableElement = new TableElement("table", this.driver);
-            tableElement.ClickSortButton(columnName, direction);
+            ExceptionsHandler.Hande(() =>
+            {
+                this.navigator.AllTypesDataPage().GoTo();
+                var tableElement = new TableElement("table", this.driver);
+                tableElement.ClickSortButton(columnName, direction);
 
-            // Assert that rows are in correct order for the first page
-            AssertTextPropertyOrder(columnName, direction, tableElement);
-            tableElement.GoToLastPage();
-            // Assert that rows are in correct order for the last page
-            AssertTextPropertyOrder(columnName, direction, tableElement);
+                // Assert that rows are in correct order for the first page
+                AssertTextPropertyOrder(columnName, direction, tableElement);
+                tableElement.GoToLastPage();
+                // Assert that rows are in correct order for the last page
+                AssertTextPropertyOrder(columnName, direction, tableElement);
+            },
+            this.driver);
         }
 
         [Test]
@@ -204,30 +208,38 @@ public void Sort_SholdWorkAppropriateForTextTypes(string columnName, SortDirecti
         [TestCase(nameof(AllTypesModel.NestedModel) + "." + nameof(AllTypesModel.CharNullable), SortDirectionsEnum.Desc, typeof(char?))]
         public void Sort_SholdWorkAppropriateForNonTextTypes(string columnName, SortDirectionsEnum direction, Type propertyType)
         {
-            this.navigator.AllTypesDataPage().GoTo();
-            var tableElement = new TableElement("table", this.driver);
-            string columnHeader = columnName.StartsWith("NestedModel") ? this.GetHeaderForNestedModel(columnName) : columnName;
-            tableElement.ClickSortButton(columnHeader, direction);
+            ExceptionsHandler.Hande(() =>
+            {
+                this.navigator.AllTypesDataPage().GoTo();
+                var tableElement = new TableElement("table", this.driver);
+                string columnHeader = columnName.StartsWith("NestedModel") ? this.GetHeaderForNestedModel(columnName) : columnName;
+                tableElement.ClickSortButton(columnHeader, direction);
 
-            AssertNonTextPropertyOrder(columnName, columnHeader, direction, propertyType, tableElement);
-            tableElement.GoToLastPage();
-            AssertNonTextPropertyOrder(columnName, columnHeader, direction, propertyType, tableElement);
+                AssertNonTextPropertyOrder(columnName, columnHeader, direction, propertyType, tableElement);
+                tableElement.GoToLastPage();
+                AssertNonTextPropertyOrder(columnName, columnHeader, direction, propertyType, tableElement);
+            },
+            this.driver);
         }
 
         [Test]
         public void Sort_SholdWorkWithSubsecuentPropertiesSortOperations()
         {
-            string firstColumnName = "Integer";
-            string secondColumnName = "DoubleProperty";
+            ExceptionsHandler.Hande(() =>
+            {
+                string firstColumnName = "Integer";
+                string secondColumnName = "DoubleProperty";
 
-            this.navigator.AllTypesDataPage().GoTo();
-            var tableElement = new TableElement("table", this.driver);
-            tableElement.ClickSortButton(firstColumnName, SortDirectionsEnum.Asc);
-            tableElement.ClickSortButton(secondColumnName, SortDirectionsEnum.Asc);
+                this.navigator.AllTypesDataPage().GoTo();
+                var tableElement = new TableElement("table", this.driver);
+                tableElement.ClickSortButton(firstColumnName, SortDirectionsEnum.Asc);
+                tableElement.ClickSortButton(secondColumnName, SortDirectionsEnum.Asc);
 
-            AssertNonTextPropertyOrder(secondColumnName, secondColumnName, SortDirectionsEnum.Asc, typeof(double), tableElement);
-            tableElement.GoToLastPage();
-            AssertNonTextPropertyOrder(secondColumnName, secondColumnName, SortDirectionsEnum.Asc, typeof(double), tableElement);
+                AssertNonTextPropertyOrder(secondColumnName, secondColumnName, SortDirectionsEnum.Asc, typeof(double), tableElement);
+                tableElement.GoToLastPage();
+                AssertNonTextPropertyOrder(secondColumnName, secondColumnName, SortDirectionsEnum.Asc, typeof(double), tableElement);
+            },
+            this.driver);
         }
 
         private string GetHeaderForNestedModel(string columnName)