Merge pull request #701 from Ste1io/Ste1io/separate-dbms-driver-tests

Integration tests refactor to separate DBMS/driver tests

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+	"recommendations": [
+		"ms-dotnettools.csdevkit",
+		"ms-azuretools.vscode-docker"
+	]
+}

PetaPoco.Tests.Integration/Databases/BaseDbContext.cs

@@ -0,0 +1,27 @@
+using System;
+
+namespace PetaPoco.Tests.Integration
+{
+    public abstract class BaseDbContext : IDisposable
+    {
+        private TestProvider _provider;
+
+        protected IDatabase DB { get; set; }
+        protected string ProviderName { get; private set; }
+
+        protected BaseDbContext(TestProvider provider)
+        {
+            _provider = provider;
+            DB = _provider.Execute();
+            ProviderName = _provider.ProviderName;
+        }
+
+        public void Dispose()
+        {
+            _provider?.Dispose();
+            _provider = null;
+            DB?.Dispose();
+            DB = null;
+        }
+    }
+}

PetaPoco.Tests.Integration/Databases/BaseDatabaseTests.cs → PetaPoco.Tests.Integration/Databases/DatabaseTests.cs

@@ -8,9 +8,9 @@
 using Shouldly;
 using Xunit;
 
-namespace PetaPoco.Tests.Integration.Databases
+namespace PetaPoco.Tests.Integration
 {
-    public abstract class BaseDatabaseTests : BaseDatabase
+    public abstract class DatabaseTests : BaseDbContext
     {
         // TODO: Move to base class, combine with other test data
         #region Test Data
@@ -23,7 +23,7 @@ public abstract class BaseDatabaseTests : BaseDatabase
 
         #endregion
 
-        protected BaseDatabaseTests(DBTestProvider provider)
+        protected DatabaseTests(TestProvider provider)
             : base(provider)
         {
         }

PetaPoco.Tests.Integration/Databases/BaseDeleteTests.cs → PetaPoco.Tests.Integration/Databases/DeleteTests.cs

@@ -4,9 +4,9 @@
 using Shouldly;
 using Xunit;
 
-namespace PetaPoco.Tests.Integration.Databases
+namespace PetaPoco.Tests.Integration
 {
-    public abstract class BaseDeleteTests : BaseDatabase
+    public abstract class DeleteTests : BaseDbContext
     {
         // TODO: Move to base class, combine with other test data
         #region Test Data
@@ -49,7 +49,7 @@ public abstract class BaseDeleteTests : BaseDatabase
 
         #endregion
 
-        protected BaseDeleteTests(DBTestProvider provider)
+        protected DeleteTests(TestProvider provider)
             : base(provider)
         {
         }

PetaPoco.Tests.Integration/Databases/BaseExecuteTests.cs → PetaPoco.Tests.Integration/Databases/ExecuteTests.cs

@@ -5,19 +5,14 @@
 using Shouldly;
 using Xunit;
 
-namespace PetaPoco.Tests.Integration.Databases
+namespace PetaPoco.Tests.Integration
 {
-    public abstract class BaseExecuteTests : BaseDatabase
+    public abstract class ExecuteTests : BaseDbContext
     {
-        // TODO: Move to base class, combine with other test data
-        #region Test Data
-
         // TODO: Make this a protected accessor from the base test class
         private readonly PocoData _pd;
 
-        #endregion
-
-        protected BaseExecuteTests(DBTestProvider provider)
+        protected ExecuteTests(TestProvider provider)
             : base(provider)
         {
             _pd = PocoData.ForType(typeof(Note), DB.DefaultMapper);

PetaPoco.Tests.Integration/Databases/FirebirdTests/FirebirdDatabaseTests.cs

@@ -0,0 +1,14 @@
+using PetaPoco.Tests.Integration.Providers;
+using Xunit;
+
+namespace PetaPoco.Tests.Integration.Databases.Firebird
+{
+    [Collection("Firebird")]
+    public class FirebirdDatabaseTests : DatabaseTests
+    {
+        public FirebirdDatabaseTests()
+            : base(new FirebirdTestProvider())
+        {
+        }
+    }
+}

PetaPoco.Tests.Integration/Databases/Firebird/FirebirdDeleteTests.cs → PetaPoco.Tests.Integration/Databases/FirebirdTests/FirebirdDeleteTests.cs

@@ -1,13 +1,14 @@
+using PetaPoco.Tests.Integration.Providers;
 using Xunit;
 
 namespace PetaPoco.Tests.Integration.Databases.Firebird
 {
     [Collection("Firebird")]
-    public class FirebirdDeleteTests : BaseDeleteTests
+    public class FirebirdDeleteTests : DeleteTests
     {
         public FirebirdDeleteTests()
-            : base(new FirebirdDBTestProvider())
+            : base(new FirebirdTestProvider())
         {
         }
     }
-}
+}

PetaPoco.Tests.Integration/Databases/FirebirdTests/FirebirdExecuteTests.cs

@@ -0,0 +1,14 @@
+using PetaPoco.Tests.Integration.Providers;
+using Xunit;
+
+namespace PetaPoco.Tests.Integration.Databases.Firebird
+{
+    [Collection("Firebird")]
+    public class FirebirdExecuteTests : ExecuteTests
+    {
+        public FirebirdExecuteTests()
+            : base(new FirebirdTestProvider())
+        {
+        }
+    }
+}

PetaPoco.Tests.Integration/Databases/FirebirdTests/FirebirdInsertTests.cs

@@ -0,0 +1,14 @@
+using PetaPoco.Tests.Integration.Providers;
+using Xunit;
+
+namespace PetaPoco.Tests.Integration.Databases.Firebird
+{
+    [Collection("Firebird")]
+    public class FirebirdInsertTests : InsertTests
+    {
+        public FirebirdInsertTests()
+            : base(new FirebirdTestProvider())
+        {
+        }
+    }
+}

PetaPoco.Tests.Integration/Databases/FirebirdTests/FirebirdMiscellaneousTests.cs

@@ -0,0 +1,14 @@
+using PetaPoco.Tests.Integration.Providers;
+using Xunit;
+
+namespace PetaPoco.Tests.Integration.Databases.Firebird
+{
+    [Collection("Firebird")]
+    public class FirebirdMiscellaneousTests : MiscellaneousTests
+    {
+        public FirebirdMiscellaneousTests()
+            : base(new FirebirdTestProvider())
+        {
+        }
+    }
+}

PetaPoco.Tests.Integration/Databases/FirebirdTests/FirebirdPreExecuteTests.cs

@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using PetaPoco.Tests.Integration.Providers;
+using Xunit;
+
+namespace PetaPoco.Tests.Integration.Databases.Firebird
+{
+    [Collection("Firebird")]
+    public class FirebirdPreExecuteTests : PreExecuteTests
+    {
+        protected override IPreExecuteDatabaseProvider Provider => DB.Provider as PreExecuteDatabaseProvider;
+
+        public FirebirdPreExecuteTests()
+            : base(new PreExecuteTestProvider())
+        {
+            Provider.ThrowExceptions = true;
+        }
+
+        protected class PreExecuteTestProvider : FirebirdTestProvider
+        {
+            protected override IDatabase LoadFromConnectionName(string name)
+                => BuildFromConnectionName(name).UsingProvider<PreExecuteDatabaseProvider>().Create();
+        }
+
+        protected class PreExecuteDatabaseProvider : PetaPoco.Providers.FirebirdDbDatabaseProvider, IPreExecuteDatabaseProvider
+        {
+            public bool ThrowExceptions { get; set; }
+            public List<IDataParameter> Parameters { get; set; } = new List<IDataParameter>();
+
+            public override void PreExecute(IDbCommand cmd)
+            {
+                Parameters.Clear();
+
+                if (ThrowExceptions)
+                {
+                    Parameters = cmd.Parameters.Cast<IDataParameter>().ToList();
+                    throw new PreExecuteException();
+                }
+            }
+        }
+    }
+}

PetaPoco.Tests.Integration/Databases/FirebirdTests/FirebirdQueryLinqTests.cs

@@ -0,0 +1,14 @@
+using PetaPoco.Tests.Integration.Providers;
+using Xunit;
+
+namespace PetaPoco.Tests.Integration.Databases.Firebird
+{
+    [Collection("Firebird")]
+    public class FirebirdQueryLinqTests : QueryLinqTests
+    {
+        public FirebirdQueryLinqTests()
+            : base(new FirebirdTestProvider())
+        {
+        }
+    }
+}

PetaPoco.Tests.Integration/Databases/Firebird/FirebirdQueryTests.cs → PetaPoco.Tests.Integration/Databases/FirebirdTests/FirebirdQueryTests.cs

@@ -3,16 +3,17 @@
 using System.Linq;
 using PetaPoco.Core;
 using PetaPoco.Tests.Integration.Models;
+using PetaPoco.Tests.Integration.Providers;
 using Shouldly;
 using Xunit;
 
 namespace PetaPoco.Tests.Integration.Databases.Firebird
 {
     [Collection("Firebird")]
-    public class FirebirdQueryTests : BaseQueryTests
+    public class FirebirdQueryTests : QueryTests
     {
         public FirebirdQueryTests()
-            : base(new FirebirdDBTestProvider())
+            : base(new FirebirdTestProvider())
         {
         }
 

PetaPoco.Tests.Integration/Databases/Firebird/FirebirdStoredProcTests.cs → PetaPoco.Tests.Integration/Databases/FirebirdTests/FirebirdStoredProcTests.cs

@@ -1,17 +1,18 @@
 using System;
 using FirebirdSql.Data.FirebirdClient;
+using PetaPoco.Tests.Integration.Providers;
 using Xunit;
 
 namespace PetaPoco.Tests.Integration.Databases.Firebird
 {
     [Collection("Firebird")]
-    public class FirebirdStoredProcTests : BaseStoredProcTests
+    public class FirebirdStoredProcTests : StoredProcTests
     {
         protected override Type DataParameterType => typeof(FbParameter);
 
         public FirebirdStoredProcTests()
-            : base(new FirebirdDBTestProvider())
+            : base(new FirebirdTestProvider())
         {
         }
     }
-}
+}