Add test for default standard column names

Author: Colin Young

test/Serilog.Sinks.MSSqlServer.Tests/CustomStandardColumnNames.cs

@@ -1,6 +1,6 @@
 using System;
+using System.Collections.Generic;
 using System.Data.SqlClient;
-using System.Diagnostics;
 using System.Linq;
 using Dapper;
 using Xunit;
@@ -10,16 +10,12 @@ namespace Serilog.Sinks.MSSqlServer.Tests
 {
     public class CustomStandardColumnNames : IClassFixture<DatabaseFixture>
     {
-        public class InfoSchema
-        {
-            public string ColumnName { get; set; }
-        }
-
         [Fact]
         public void TableCreatedWithCustomNames()
         {
             // arrange
             var options = new ColumnOptions();
+            var standardNames = new List<string> { "CustomMessage", "CustomMessageTemplate", "CustomLevel", "CustomTimeStamp", "CustomException", "CustomProperties" };
 
             options.Store.ToList().ForEach(c =>
             {
@@ -28,26 +24,47 @@ public void TableCreatedWithCustomNames()
             });
 
             // act
-            var sink = new MSSqlServerSink(DatabaseFixture.LogEventsConnectionString, DatabaseFixture.LogTableName, 1, TimeSpan.FromSeconds(1), null, true, options);
+            var logTableName = $"{DatabaseFixture.LogTableName}Custom";
+            var sink = new MSSqlServerSink(DatabaseFixture.LogEventsConnectionString, logTableName, 1, TimeSpan.FromSeconds(1), null, true, options);
 
             // assert
             using (var conn = new SqlConnection(DatabaseFixture.MasterConnectionString))
             {
                 conn.Execute($"use {DatabaseFixture.Database}");
-                var logEvents = conn.Query<InfoSchema>($@"SELECT COLUMN_NAME AS ColumnName FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}'");
-                var infoSchemata = logEvents as InfoSchema[] ?? logEvents.ToArray();
+                var logEvents = conn.Query<InfoSchema>($@"SELECT COLUMN_NAME AS ColumnName FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{logTableName}'");
+                var infoSchema = logEvents as InfoSchema[] ?? logEvents.ToArray();
 
-                foreach (var column in options.Store.Values)
+                foreach (var column in standardNames)
                 {
-                    infoSchemata.Should().Contain(columns => columns.ColumnName == column);
+                    infoSchema.Should().Contain(columns => columns.ColumnName == column);
                 }
             }
         }
 
         [Fact]
         public void TableCreatedWithDefaultNames()
         {
-            
+            // arrange
+            var options = new ColumnOptions();
+            var standardNames = new List<string> { "Message", "MessageTemplate", "Level", "TimeStamp", "Exception", "Properties" };
+
+            // act
+            var logTableName = $"{DatabaseFixture.LogTableName}Standard";
+            System.Diagnostics.Debugger.Launch();
+            var sink = new MSSqlServerSink(DatabaseFixture.LogEventsConnectionString, logTableName, 1, TimeSpan.FromSeconds(1), null, true, options);
+
+            // assert
+            using (var conn = new SqlConnection(DatabaseFixture.MasterConnectionString))
+            {
+                conn.Execute($"use {DatabaseFixture.Database}");
+                var logEvents = conn.Query<InfoSchema>($@"SELECT COLUMN_NAME AS ColumnName FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{logTableName}'");
+                var infoSchema = logEvents as InfoSchema[] ?? logEvents.ToArray();
+
+                foreach (var column in standardNames)
+                {
+                    infoSchema.Should().Contain(columns => columns.ColumnName == column);
+                }
+            }
         }
     }
 }

test/Serilog.Sinks.MSSqlServer.Tests/InfoSchema.cs

@@ -0,0 +1,7 @@
+namespace Serilog.Sinks.MSSqlServer.Tests
+{
+    public class InfoSchema
+    {
+        public string ColumnName { get; set; }
+    }
+}