Added better error handling for stored procedures. General logging fo…

…rmatting improvements. Merge pull request #21
sorengranfeldt · Sep 24, 2022 · 96ace33 · 96ace33
1 parent c0066ca
commit 96ace33
Show file tree

Hide file tree

Showing 21 changed files with 1,392 additions and 1,435 deletions.
diff --git a/Granfeldt.SQL.MA.UnitTests/Granfeldt.SQL.MA.UnitTests.cs b/Granfeldt.SQL.MA.UnitTests/Granfeldt.SQL.MA.UnitTests.cs
@@ -1,122 +1,119 @@
-using System;
+using Microsoft.MetadirectoryServices;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Microsoft.MetadirectoryServices;
-using System.Data;
-using System.Data.SqlClient;
 
 namespace Granfeldt
 {
-	[TestClass]
-	public class SqlTests
-	{
-		SqlMethods methods = new SqlMethods();
-
-		[TestMethod]
-		public void GetObjectClasses()
-		{
-			methods.OpenConnection();
-			foreach (string str in methods.GetObjectClasses())
-			{
-				Tracer.TraceInformation("got-objectclass {0}", str);
-			}
-			methods.Dispose();
-		}
-
-		[TestMethod]
-		public void GetSingleValueColumns()
-		{
-			methods.OpenConnection();
-			foreach (AttributeDefinition ad in methods.GetSchema(Configuration.TableNameSingle))
-			{
-			}
-			methods.Dispose();
-		}
-
-		[TestMethod]
-		public void GetMultiValueColumns()
-		{
-			methods.OpenConnection();
-			foreach (AttributeDefinition ad in methods.GetSchema(Configuration.TableNameMulti))
-			{
-			}
-			methods.Dispose();
-		}
-
-		[TestMethod]
-		public void GetMASchema()
-		{
-
-			using (SQLManagementAgent ma = new SQLManagementAgent())
-			{
-				Configuration.Schema = ma.DefaultSchemaXml.XmlDeserializeFromString<SchemaConfiguration>();
-				Schema schema = ma.GetSchemaDetached();
-			}
-		}
-
-		[TestMethod]
-		public void GetFullImport()
-		{
-			using (SQLManagementAgent ma = new SQLManagementAgent())
-			{
-				Configuration.Schema = ma.DefaultSchemaXml.XmlDeserializeFromString<SchemaConfiguration>();
-				Schema schema = ma.GetSchemaDetached();
-
-				ma.Schema = schema;
-				ma.ImportType = OperationType.Full;
-
-				OpenImportConnectionRunStep dummyOpenImportRunStep = new OpenImportConnectionRunStep();
-
-				// fake runstep data
-				ma.ImportType = OperationType.Full;
-				ma.CustomData = "";
-				ma.PageSize = 100;
-
-				System.Collections.ObjectModel.KeyedCollection<string, ConfigParameter> configParams = null;
-				ma.OpenImportConnectionDetached(configParams, schema, null);
-
-				GetImportEntriesRunStep rs = new GetImportEntriesRunStep();
-
-				GetImportEntriesResults rest = new GetImportEntriesResults();
-				rest.MoreToImport = true;
-				while (rest.MoreToImport)
-				{
+    [TestClass]
+    public class SqlTests
+    {
+        SqlMethods methods = new SqlMethods();
+
+        [TestMethod]
+        public void GetObjectClasses()
+        {
+            methods.OpenConnection();
+            foreach (string str in methods.GetObjectClasses())
+            {
+                Tracer.TraceInformation("got-objectclass {0}", str);
+            }
+            methods.Dispose();
+        }
+
+        [TestMethod]
+        public void GetSingleValueColumns()
+        {
+            methods.OpenConnection();
+            foreach (AttributeDefinition ad in methods.GetSchema(Configuration.TableNameSingle))
+            {
+            }
+            methods.Dispose();
+        }
+
+        [TestMethod]
+        public void GetMultiValueColumns()
+        {
+            methods.OpenConnection();
+            foreach (AttributeDefinition ad in methods.GetSchema(Configuration.TableNameMulti))
+            {
+            }
+            methods.Dispose();
+        }
+
+        [TestMethod]
+        public void GetMASchema()
+        {
+
+            using (SQLManagementAgent ma = new SQLManagementAgent())
+            {
+                Configuration.Schema = ma.DefaultSchemaXml.XmlDeserializeFromString<SchemaConfiguration>();
+                Schema schema = ma.GetSchemaDetached();
+            }
+        }
+
+        [TestMethod]
+        public void GetFullImport()
+        {
+            using (SQLManagementAgent ma = new SQLManagementAgent())
+            {
+                Configuration.Schema = ma.DefaultSchemaXml.XmlDeserializeFromString<SchemaConfiguration>();
+                Schema schema = ma.GetSchemaDetached();
+
+                ma.Schema = schema;
+                ma.ImportType = OperationType.Full;
+
+                OpenImportConnectionRunStep dummyOpenImportRunStep = new OpenImportConnectionRunStep();
+
+                // fake runstep data
+                ma.ImportType = OperationType.Full;
+                ma.CustomData = "";
+                ma.PageSize = 100;
+
+                System.Collections.ObjectModel.KeyedCollection<string, ConfigParameter> configParams = null;
+                ma.OpenImportConnectionDetached(configParams, schema, null);
+
+                GetImportEntriesRunStep rs = new GetImportEntriesRunStep();
+
+                GetImportEntriesResults rest = new GetImportEntriesResults();
+                rest.MoreToImport = true;
+                while (rest.MoreToImport)
+                {
                     rest = ma.GetImportEntriesDetached(rs);
-				}
-				
-				CloseImportConnectionRunStep dummyCloseImportRunStep = null;
-				ma.CloseImportConnectionDetached(dummyCloseImportRunStep);
-			}
-		}
-		[TestMethod]
-		public void GetDeltaImport()
-		{
-			using (SQLManagementAgent ma = new SQLManagementAgent())
-			{
-				Configuration.Schema = ma.DefaultSchemaXml.XmlDeserializeFromString<SchemaConfiguration>();
-				Schema schema = ma.GetSchemaDetached();
-
-				// first get full data to get deltawatermark
-				ma.Schema = schema;
-				ma.ImportType = OperationType.Delta;
-				ma.CustomData = "140180";
-				ma.PageSize = 1;
-
-				System.Collections.ObjectModel.KeyedCollection<string, ConfigParameter> configParams = null;
-				ma.OpenImportConnectionDetached(configParams, schema, null);
-
-				GetImportEntriesRunStep rs = new GetImportEntriesRunStep();
-
-				GetImportEntriesResults rest = new GetImportEntriesResults();
-				rest.MoreToImport = true;
-				while (rest.MoreToImport)
-				{
-					rest = ma.GetImportEntriesDetached(rs);
-				}
-
-				CloseImportConnectionRunStep dummyCloseImportRunStep = null;
-				ma.CloseImportConnectionDetached(dummyCloseImportRunStep);
-			}
-		}
-
-	}
+                }
+
+                CloseImportConnectionRunStep dummyCloseImportRunStep = null;
+                ma.CloseImportConnectionDetached(dummyCloseImportRunStep);
+            }
+        }
+        [TestMethod]
+        public void GetDeltaImport()
+        {
+            using (SQLManagementAgent ma = new SQLManagementAgent())
+            {
+                Configuration.Schema = ma.DefaultSchemaXml.XmlDeserializeFromString<SchemaConfiguration>();
+                Schema schema = ma.GetSchemaDetached();
+
+                // first get full data to get deltawatermark
+                ma.Schema = schema;
+                ma.ImportType = OperationType.Delta;
+                ma.CustomData = "140180";
+                ma.PageSize = 1;
+
+                System.Collections.ObjectModel.KeyedCollection<string, ConfigParameter> configParams = null;
+                ma.OpenImportConnectionDetached(configParams, schema, null);
+
+                GetImportEntriesRunStep rs = new GetImportEntriesRunStep();
+
+                GetImportEntriesResults rest = new GetImportEntriesResults();
+                rest.MoreToImport = true;
+                while (rest.MoreToImport)
+                {
+                    rest = ma.GetImportEntriesDetached(rs);
+                }
+
+                CloseImportConnectionRunStep dummyCloseImportRunStep = null;
+                ma.CloseImportConnectionDetached(dummyCloseImportRunStep);
+            }
+        }
+
+    }
 }
diff --git a/Granfeldt.SQL.MA.UnitTests/Properties/AssemblyInfo.cs b/Granfeldt.SQL.MA.UnitTests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following