fix minor formatting inconsistencies and typos

update SqlCe PreExecute Tests for completeness update SqlServer catalog name in cxn strings
CollaboratingPlatypus · Oct 9, 2023 · e22dbab · e22dbab
1 parent d51ec32
commit e22dbab
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 16 deletions.
diff --git a/PetaPoco.Tests.Integration/Databases/QueryLinqTests.cs b/PetaPoco.Tests.Integration/Databases/QueryLinqTests.cs
@@ -316,7 +316,7 @@ public virtual async Task ExistsAsync_GivenPrimaryKeyMatchingNoRecord_ShouldBeFa
             (await DB.ExistsAsync<Person>(Guid.NewGuid())).ShouldBeFalse();
         }
 
-        [Fact(DisplayName = "Exists: Support the older syntax of starting with a WHERE clause.")]
+        [Fact(DisplayName = "ExistsAsync: Support the older syntax of starting with a WHERE clause.")]
         [Trait("Category", "Regression")]
         [Trait("Issue", "#237")]
         [Trait("Issue", "#238")]

diff --git a/PetaPoco.Tests.Integration/Databases/SqlServerCeTests/SqlServerCePreExecuteTests.cs b/PetaPoco.Tests.Integration/Databases/SqlServerCeTests/SqlServerCePreExecuteTests.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.SqlServerCe
+{
+    [Collection("SqlServerCe")]
+    public class SqlServerCePreExecuteTests : PreExecuteTests
+    {
+        protected override IPreExecuteDatabaseProvider Provider => DB.Provider as PreExecuteDatabaseProvider;
+
+        public SqlServerCePreExecuteTests()
+            : base(new PreExecuteTestProvider())
+        {
+            Provider.ThrowExceptions = true;
+        }
+
+        protected class PreExecuteTestProvider : SqlServerCeTestProvider
+        {
+            protected override IDatabase LoadFromConnectionName(string name)
+                => BuildFromConnectionName(name).UsingProvider<PreExecuteDatabaseProvider>().Create();
+        }
+
+        protected class PreExecuteDatabaseProvider : PetaPoco.Providers.SqlServerCEDatabaseProviders, 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();
+                }
+            }
+        }
+    }
+}
diff --git a/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerDatabaseTests.cs b/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerDatabaseTests.cs
@@ -7,7 +7,8 @@ public abstract partial class SqlServerDatabaseTests : DatabaseTests
     {
         protected SqlServerDatabaseTests(TestProvider provider)
             : base(provider)
-        { }
+        {
+        }
 
         [Collection("SqlServer.SystemData")]
         public class SystemData : SqlServerDatabaseTests

diff --git a/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerDeleteTests.cs b/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerDeleteTests.cs
@@ -7,7 +7,8 @@ public abstract partial class SqlServerDeleteTests : DeleteTests
     {
         protected SqlServerDeleteTests(TestProvider provider)
             : base(provider)
-        { }
+        {
+        }
 
         [Collection("SqlServer.SystemData")]
         public class SystemData : SqlServerDeleteTests

diff --git a/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerExecuteTests.cs b/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerExecuteTests.cs
@@ -7,7 +7,8 @@ public abstract partial class SqlServerExecuteTests : ExecuteTests
     {
         protected SqlServerExecuteTests(TestProvider provider)
             : base(provider)
-        { }
+        {
+        }
 
         [Collection("SqlServer.SystemData")]
         public class SystemData : SqlServerExecuteTests

diff --git a/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerInsertTests.cs b/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerInsertTests.cs
@@ -7,7 +7,8 @@ public abstract partial class SqlServerInsertTests : InsertTests
     {
         protected SqlServerInsertTests(TestProvider provider)
             : base(provider)
-        { }
+        {
+        }
 
         [Collection("SqlServer.SystemData")]
         public class SystemData : SqlServerInsertTests

diff --git a/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerMiscellaneousTests.cs b/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerMiscellaneousTests.cs
@@ -7,7 +7,8 @@ public abstract partial class SqlServerMiscellaneousTests : MiscellaneousTests
     {
         protected SqlServerMiscellaneousTests(TestProvider provider)
             : base(provider)
-        { }
+        {
+        }
 
         [Collection("SqlServer.SystemData")]
         public class SystemData : SqlServerMiscellaneousTests

diff --git a/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerPreExecuteTests.cs b/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerPreExecuteTests.cs
@@ -10,7 +10,8 @@ public abstract partial class SqlServerPreExecuteTests : PreExecuteTests
     {
         protected SqlServerPreExecuteTests(TestProvider provider)
             : base(provider)
-        { }
+        {
+        }
 
         [Collection("SqlServer.SystemData")]
         public class SystemData : SqlServerPreExecuteTests

diff --git a/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerQueryLinqTests.cs b/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerQueryLinqTests.cs
@@ -21,7 +21,8 @@ public abstract partial class SqlServerQueryLinqTests : QueryLinqTests
 
         protected SqlServerQueryLinqTests(TestProvider provider)
             : base(provider)
-        { }
+        {
+        }
 
         [Fact]
         [Trait("Issue", "#242")]

diff --git a/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerQueryTests.cs b/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerQueryTests.cs
@@ -13,7 +13,8 @@ public abstract partial class SqlServerQueryTests : QueryTests
     {
         protected SqlServerQueryTests(TestProvider provider)
             : base(provider)
-        { }
+        {
+        }
 
         // TODO: Check dbms support and usage for SET/WITH/DECLARE keywords, possibly move to base or other derived classes
         [Fact]
@@ -260,7 +261,7 @@ public override void QueryMultiple_ForMultiResultsSetWithMultiPoco_ShouldReturnV
             });
         }
 
-    
+
         [Collection("SqlServer.SystemData")]
         public class SystemData : SqlServerQueryTests
         {

diff --git a/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerStoredProcTests.cs b/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerStoredProcTests.cs
@@ -8,7 +8,8 @@ public abstract partial class SqlServerStoredProcTests : StoredProcTests
     {
         protected SqlServerStoredProcTests(TestProvider provider)
             : base(provider)
-        { }
+        {
+        }
 
         [Collection("SqlServer.SystemData")]
         public class SystemData : SqlServerStoredProcTests

diff --git a/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerTriageTests.cs b/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerTriageTests.cs
@@ -7,7 +7,8 @@ public abstract partial class SqlServerTriageTests : TriageTests
     {
         protected SqlServerTriageTests(TestProvider provider)
             : base(provider)
-        { }
+        {
+        }
 
         [Collection("SqlServer.SystemData")]
         public class SystemData : SqlServerTriageTests

diff --git a/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerUpdateTests.cs b/PetaPoco.Tests.Integration/Databases/SqlServerTests/SqlServerUpdateTests.cs
@@ -7,7 +7,8 @@ public abstract partial class SqlServerUpdateTests : UpdateTests
     {
         protected SqlServerUpdateTests(TestProvider provider)
             : base(provider)
-        { }
+        {
+        }
 
         [Collection("SqlServer.SystemData")]
         public class SystemData : SqlServerUpdateTests

diff --git a/PetaPoco.Tests.Integration/Providers/SqlServerMSDataTestProvider.cs b/PetaPoco.Tests.Integration/Providers/SqlServerMSDataTestProvider.cs
@@ -24,7 +24,7 @@ public override void ExecuteBuildScript(IDatabase database, string script)
         private void EnsureDatabaseExists()
         {
             _connectionName = "SqlServerMSData_Builder";
-            Database.Execute("IF(db_id(N'PetaPocoMsData') IS NULL) BEGIN CREATE DATABASE [PetaPocoMsData] END");
+            Database.Execute("IF(db_id(N'PetaPocoMSData') IS NULL) BEGIN CREATE DATABASE [PetaPocoMSData] END");
             _connectionName = "SqlServerMSData";
         }
     }

diff --git a/PetaPoco.Tests.Integration/app.config b/PetaPoco.Tests.Integration/app.config
@@ -11,7 +11,7 @@
     <add name="SqlServer_Builder" connectionString="Data Source=localhost,5006;User ID=sa;Password=pAtAp0c8" providerName="System.Data.SqlClient" />
     <add name="SqlServer" connectionString="Data Source=localhost,5006;Initial Catalog=PetaPoco;User ID=sa;Password=pAtAp0c8" providerName="System.Data.SqlClient" />
     <add name="SqlServerMSData_Builder" connectionString="Data Source=localhost,5007;User ID=sa;Password=pAtAp0c8" providerName="Microsoft.Data.SqlClient" />
-    <add name="SqlServerMSData" connectionString="Data Source=localhost,5007;Initial Catalog=PetaPocoMsData;User ID=sa;Password=pAtAp0c8" providerName="Microsoft.Data.SqlClient" />
+    <add name="SqlServerMSData" connectionString="Data Source=localhost,5007;Initial Catalog=PetaPocoMSData;User ID=sa;Password=pAtAp0c8" providerName="Microsoft.Data.SqlClient" />
     <!-- Env: Local development environment -->
     <add name="SQLite" connectionString="Data Source=PetaPoco.sqlite;Version=3;Pooling=True;Max Pool Size=100" providerName="System.Data.SQLite" />
     <add name="MSAccess" connectionString="Provider=Microsoft.ACE.OLEDB.12.0;Data Source=PetaPoco.accdb" providerName="OleDb" />

diff --git a/PetaPoco.Tests.Integration/appsettings.json b/PetaPoco.Tests.Integration/appsettings.json
@@ -43,7 +43,7 @@
       },
       {
         "Name": "SqlServerMSData",
-        "ConnectionString": "Data Source=localhost,5007;Initial Catalog=PetaPocoMsData;User ID=sa;Password=pAtAp0c8",
+        "ConnectionString": "Data Source=localhost,5007;Initial Catalog=PetaPocoMSData;User ID=sa;Password=pAtAp0c8",
         "ProviderName": "Microsoft.Data.SqlClient"
       },
       {