Edit Data: Fixing Defaults Behavior (#533)

* Moving logic for adding default values to new rows

* Fixing implementation of script generation to handle default values all around

* Unit tests!

* Addressing PR comments

test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/Common.cs

@@ -8,6 +8,7 @@ using System.Data.Common;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Castle.Components.DictionaryAdapter;
 using Microsoft.SqlTools.ServiceLayer.EditData;
 using Microsoft.SqlTools.ServiceLayer.EditData.Contracts;
 using Microsoft.SqlTools.ServiceLayer.EditData.UpdateManagement;
@@ -22,6 +23,8 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
     public class Common
     {
         public const string OwnerUri = "testFile";
+        public const string DefaultValue = "defaultValue";
+        public const string TableName = "tbl";
 
         public static EditInitializeParams BasicInitializeParameters
         {
@@ -62,17 +65,14 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             return session;
         }
 
-        public static EditTableMetadata GetStandardMetadata(DbColumn[] columns, bool isMemoryOptimized = false)
+        public static EditTableMetadata GetStandardMetadata(DbColumn[] columns, bool isMemoryOptimized = false, int defaultColumns = 0)
         {
-            // Create column metadata providers
-            var columnMetas = columns.Select((c, i) =>
+            // Create column metadata providers            
+            var columnMetas = columns.Select((c, i) => new EditColumnMetadata
             {
-                var ecm = new EditColumnMetadata
-                {
-                    EscapedName = c.ColumnName,
-                    Ordinal = i
-                };
-                return ecm;
+                EscapedName = c.ColumnName,
+                Ordinal = i,
+                DefaultValue = i < defaultColumns ? DefaultValue : null 
             }).ToArray();
 
             // Create column wrappers
@@ -82,7 +82,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             EditTableMetadata editTableMetadata = new EditTableMetadata
             {
                 Columns = columnMetas,
-                EscapedMultipartName = "tbl",
+                EscapedMultipartName = TableName,
                 IsMemoryOptimized = isMemoryOptimized
             };
             editTableMetadata.Extend(columnWrappers);
@@ -133,11 +133,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             return new TestDbDataReader(new [] {testResultSet}, false);
         }
 
-        public static void AddCells(RowEditBase rc, bool includeIdentity)
+        public static void AddCells(RowEditBase rc, int colsToSkip)
         {
             // Skip the first column since if identity, since identity columns can't be updated
-            int start = includeIdentity ? 1 : 0;
-            for (int i = start; i < rc.AssociatedResultSet.Columns.Length; i++)
+            for (int i = colsToSkip; i < rc.AssociatedResultSet.Columns.Length; i++)
             {
                 rc.SetCell(i, "123");
             }

test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/RowCreateTests.cs

@@ -4,7 +4,9 @@
 //
 
 using System;
+using System.Collections.Generic;
 using System.Data.Common;
+using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -38,39 +40,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             Assert.Equal(etm, rc.AssociatedObjectMetadata);
         }
 
-        [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public async Task GetScript(bool includeIdentity)
-        {
-            // Setup: Generate the parameters for the row create
-            const long rowId = 100;
-            DbColumn[] columns = Common.GetColumns(includeIdentity);
-            ResultSet rs = await Common.GetResultSet(columns, includeIdentity);
-            EditTableMetadata etm = Common.GetStandardMetadata(columns);
-
-            // If: I ask for a script to be generated without an identity column
-            RowCreate rc = new RowCreate(rowId, rs, etm);
-            Common.AddCells(rc, includeIdentity);
-            string script = rc.GetScript();
-
-            // Then:
-            // ... The script should not be null,
-            Assert.NotNull(script);
-
-            // ... It should be formatted as an insert script
-            Regex r = new Regex(@"INSERT INTO (.+)\((.*)\) VALUES \((.*)\)");
-            var m = r.Match(script);
-            Assert.True(m.Success);
-
-            // ... It should have 3 columns and 3 values (regardless of the presence of an identity col)
-            string tbl = m.Groups[1].Value;
-            string cols = m.Groups[2].Value;
-            string vals = m.Groups[3].Value;
-            Assert.Equal(etm.EscapedMultipartName, tbl);
-            Assert.Equal(3, cols.Split(',').Length);
-            Assert.Equal(3, vals.Split(',').Length);
-        }
+        #region GetScript Tests
 
         [Fact]
         public async Task GetScriptMissingCell()
@@ -83,6 +53,82 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             Assert.Throws<InvalidOperationException>(() => rc.GetScript());
         }
 
+        public static IEnumerable<object[]> GetScriptData
+        {
+            get
+            {
+                yield return new object[] {true, 0, 1, new RegexExpectedOutput(3, 3, 0)};    // Has identity, no defaults, all values set
+                yield return new object[] {true, 2, 1, new RegexExpectedOutput(3, 3, 0)};    // Has identity, some defaults, all values set
+                yield return new object[] {true, 2, 2, new RegexExpectedOutput(2, 2, 0)};    // Has identity, some defaults, defaults not set
+                yield return new object[] {true, 4, 1, new RegexExpectedOutput(3, 3, 0)};    // Has identity, all defaults, all values set
+                yield return new object[] {true, 4, 4, null};                                // Has identity, all defaults, defaults not set
+                yield return new object[] {false, 0, 0, new RegexExpectedOutput(3, 3, 0)};   // No identity, no defaults, all values set
+                yield return new object[] {false, 1, 0, new RegexExpectedOutput(3, 3, 0)};   // No identity, some defaults, all values set
+                yield return new object[] {false, 1, 1, new RegexExpectedOutput(2, 2, 0)};   // No identity, some defaults, defaults not set
+                yield return new object[] {false, 3, 0, new RegexExpectedOutput(3, 3, 0)};   // No identity, all defaults, all values set
+                yield return new object[] {false, 3, 3, null};                               // No identity, all defaults, defaults not set
+            }
+        }
+        
+        [Theory]
+        [MemberData(nameof(GetScriptData))]
+        public async Task GetScript(bool includeIdentity, int defaultCols, int valuesToSkipSetting, RegexExpectedOutput expectedOutput)
+        {
+            // Setup: 
+            // ... Generate the parameters for the row create
+            DbColumn[] columns = Common.GetColumns(includeIdentity);
+            ResultSet rs = await Common.GetResultSet(columns, includeIdentity);
+            EditTableMetadata etm = Common.GetStandardMetadata(columns, includeIdentity, defaultCols);
+            
+            // ... Create a row create and set the appropriate number of cells 
+            RowCreate rc = new RowCreate(100, rs, etm);
+            Common.AddCells(rc, valuesToSkipSetting);
+            
+            // If: I ask for the script for the row insert
+            string script = rc.GetScript();
+            
+            // Then:
+            // ... The script should not be null
+            Assert.NotNull(script);
+            
+            // ... The script should match the expected regex output
+            ValidateScriptAgainstRegex(script, expectedOutput);
+        }
+
+        private static void ValidateScriptAgainstRegex(string sql, RegexExpectedOutput expectedOutput)
+        {
+            if (expectedOutput == null)
+            {
+                // If expected output was null make sure we match the default values reges
+                Regex r = new Regex(@"INSERT INTO (.+) DEFAULT VALUES");
+                Match m = r.Match(sql);
+                Assert.True(m.Success);
+                
+                // Table name matches
+                Assert.Equal(Common.TableName, m.Groups[1].Value);
+            }
+            else
+            {
+                // Do the whole validation
+                Regex r = new Regex(@"INSERT INTO (.+)\((.+)\) VALUES \((.+)\)");
+                Match m = r.Match(sql);
+                Assert.True(m.Success);
+                
+                // Table name matches
+                Assert.Equal(Common.TableName, m.Groups[1].Value);
+                
+                // In columns match
+                string cols = m.Groups[2].Value;
+                Assert.Equal(expectedOutput.ExpectedInColumns, cols.Split(',').Length);
+                
+                // In values match
+                string vals = m.Groups[3].Value;               
+                Assert.Equal(expectedOutput.ExpectedInValues, vals.Split(',').Length);
+            }
+        }
+        
+        #endregion
+
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
@@ -93,7 +139,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             const long rowId = 100;
             DbColumn[] columns = Common.GetColumns(includeIdentity);
             ResultSet rs = await Common.GetResultSet(columns, includeIdentity);
-            EditTableMetadata etm = Common.GetStandardMetadata(columns);
+            EditTableMetadata etm = Common.GetStandardMetadata(columns, includeIdentity);
 
             // ... Setup a db reader for the result of an insert
             var newRowReader = Common.GetNewRowDataReader(columns, includeIdentity);
@@ -106,56 +152,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             Assert.Equal(2, rs.RowCount);
         }
 
-        [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public async Task GetCommand(bool includeIdentity)
-        {
-            // Setup:
-            // ... Create a row create with cell updates
-            const long rowId = 100;
-            var columns = Common.GetColumns(includeIdentity);
-            var rs = await Common.GetResultSet(columns, includeIdentity);
-            var etm = Common.GetStandardMetadata(columns);
-            RowCreate rc = new RowCreate(rowId, rs, etm);
-            Common.AddCells(rc, includeIdentity);
-
-            // ... Mock db connection for building the command
-            var mockConn = new TestSqlConnection(null);
-
-            // If: I attempt to get a command for the edit
-            DbCommand cmd = rc.GetCommand(mockConn);
-
-            // Then:
-            // ... The command should not be null
-            Assert.NotNull(cmd);
-
-            // ... There should be parameters in it
-            Assert.Equal(3, cmd.Parameters.Count);
-
-            // ... It should be formatted into an insert script with output
-            Regex r = new Regex(@"INSERT INTO (.+)\((.+)\) OUTPUT (.+) VALUES \((.+)\)");
-            var m = r.Match(cmd.CommandText);
-            Assert.True(m.Success);
-
-            // ... There should be a table
-            string tbl = m.Groups[1].Value;
-            Assert.Equal(etm.EscapedMultipartName, tbl);
-
-            // ... There should be 3 columns for input
-            string inCols = m.Groups[2].Value;
-            Assert.Equal(3, inCols.Split(',').Length);
-
-            // ... There should be 3 OR 4 columns for output that are inserted.
-            string[] outCols = m.Groups[3].Value.Split(',');
-            Assert.Equal(includeIdentity ? 4 : 3, outCols.Length);
-            Assert.All(outCols, s => Assert.StartsWith("inserted.", s.Trim()));
-
-            // ... There should be 3 parameters
-            string[] param = m.Groups[4].Value.Split(',');
-            Assert.Equal(3, param.Length);
-            Assert.All(param, s => Assert.StartsWith("@Value", s.Trim()));
-        }
+        #region GetCommand Tests
 
         [Fact]
         public async Task GetCommandNullConnection()
@@ -163,14 +160,13 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             // Setup: Create a row create
             RowCreate rc = await GetStandardRowCreate();
 
-
             // If: I attempt to create a command with a null connection
             // Then: It should throw an exception
             Assert.Throws<ArgumentNullException>(() => rc.GetCommand(null));
         }
-
+        
         [Fact]
-        public async Task GetCommandMissingCell()
+        public async Task GetCommandMissingCellNoDefault()
         {
             // Setup: Generate the parameters for the row create
             RowCreate rc = await GetStandardRowCreate();
@@ -181,6 +177,101 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             Assert.Throws<InvalidOperationException>(() => rc.GetCommand(mockConn));
         }
 
+        public static IEnumerable<object[]> GetCommandData
+        {
+            get
+            {
+                yield return new object[] {true, 0, 1, new RegexExpectedOutput(3, 3, 4)};    // Has identity, no defaults, all values set
+                yield return new object[] {true, 2, 1, new RegexExpectedOutput(3, 3, 4)};    // Has identity, some defaults, all values set
+                yield return new object[] {true, 2, 2, new RegexExpectedOutput(2, 2, 4)};    // Has identity, some defaults, defaults not set
+                yield return new object[] {true, 4, 1, new RegexExpectedOutput(3, 3, 4)};    // Has identity, all defaults, all values set
+                yield return new object[] {true, 4, 4, new RegexExpectedOutput(0, 0, 4)};    // Has identity, all defaults, defaults not set
+                yield return new object[] {false, 0, 0, new RegexExpectedOutput(3, 3, 3)};   // No identity, no defaults, all values set
+                yield return new object[] {false, 1, 0, new RegexExpectedOutput(3, 3, 3)};   // No identity, some defaults, all values set
+                yield return new object[] {false, 1, 1, new RegexExpectedOutput(2, 2, 3)};   // No identity, some defaults, defaults not set
+                yield return new object[] {false, 3, 0, new RegexExpectedOutput(3, 3, 3)};   // No identity, all defaults, all values set
+                yield return new object[] {false, 3, 3, new RegexExpectedOutput(0, 0, 3)};   // No identity, all defaults, defaults not set
+            }
+        }
+        
+        [Theory]
+        [MemberData(nameof(GetCommandData))]
+        public async Task GetCommand(bool includeIdentity, int defaultCols, int valuesToSkipSetting, RegexExpectedOutput expectedOutput)
+        {
+            // Setup: 
+            // ... Generate the parameters for the row create
+            DbColumn[] columns = Common.GetColumns(includeIdentity);
+            ResultSet rs = await Common.GetResultSet(columns, includeIdentity);
+            EditTableMetadata etm = Common.GetStandardMetadata(columns, includeIdentity, defaultCols);
+            
+            // ... Mock db connection for building the command
+            var mockConn = new TestSqlConnection(null);
+            
+            // ... Create a row create and set the appropriate number of cells 
+            RowCreate rc = new RowCreate(100, rs, etm);
+            Common.AddCells(rc, valuesToSkipSetting);
+            
+            // If: I ask for the command for the row insert
+            DbCommand cmd = rc.GetCommand(mockConn);
+            
+            // Then:
+            // ... The command should not be null
+            Assert.NotNull(cmd);
+            
+            // ... There should be parameters in it
+            Assert.Equal(expectedOutput.ExpectedInValues, cmd.Parameters.Count);
+            
+            // ... The script should match the expected regex output
+            ValidateCommandAgainstRegex(cmd.CommandText, expectedOutput);
+        }
+
+        private static void ValidateCommandAgainstRegex(string sql, RegexExpectedOutput expectedOutput)
+        {
+            if (expectedOutput.ExpectedInColumns == 0 || expectedOutput.ExpectedInValues == 0)
+            {
+                // If expected output was null make sure we match the default values reges
+                Regex r = new Regex(@"INSERT INTO (.+) OUTPUT (.+) DEFAULT VALUES");
+                Match m = r.Match(sql);
+                Assert.True(m.Success);
+                
+                // Table name matches
+                Assert.Equal(Common.TableName, m.Groups[1].Value);
+                
+                // Output columns match
+                string[] outCols = m.Groups[2].Value.Split(", ");
+                Assert.Equal(expectedOutput.ExpectedOutColumns, outCols.Length);
+                Assert.All(outCols, col => Assert.StartsWith("inserted.", col));
+            }
+            else
+            {
+                // Do the whole validation
+                Regex r = new Regex(@"INSERT INTO (.+)\((.+)\) OUTPUT (.+) VALUES \((.+)\)");
+                Match m = r.Match(sql);
+                Assert.True(m.Success);
+                
+                // Table name matches
+                Assert.Equal(Common.TableName, m.Groups[1].Value);
+                
+                // Output columns match
+                string[] outCols = m.Groups[3].Value.Split(", ");
+                Assert.Equal(expectedOutput.ExpectedOutColumns, outCols.Length);
+                Assert.All(outCols, col => Assert.StartsWith("inserted.", col));
+                
+                // In columns match
+                string[] inCols = m.Groups[2].Value.Split(", ");
+                Assert.Equal(expectedOutput.ExpectedInColumns, inCols.Length);
+                
+                // In values match
+                string[] inVals = m.Groups[4].Value.Split(", ");
+                Assert.Equal(expectedOutput.ExpectedInValues, inVals.Length);
+                Assert.All(inVals, val => Assert.Matches(@"@.+\d+", val));
+            }
+        }
+        
+        #endregion
+        
+        #region GetEditRow Tests
+
         [Fact]
         public async Task GetEditRowNoAdditions()
         {
@@ -208,12 +299,81 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             });
         }
 
+        [Fact]
+        public async Task GetEditRowWithDefaultValue()
+        {
+            // Setup: Generate a row create with default values
+            const long rowId = 100;
+            DbColumn[] columns = Common.GetColumns(false);
+            ResultSet rs = await Common.GetResultSet(columns, false);
+            EditTableMetadata etm = Common.GetStandardMetadata(columns, false, columns.Length);
+            RowCreate rc = new RowCreate(rowId, rs, etm);
+            
+            // If: I request an edit row from the row create
+            EditRow er = rc.GetEditRow(null);
+            
+            // Then:
+            // ... The row should not be null
+            Assert.NotNull(er);
+            
+            // ... The row should not be clean
+            Assert.True(er.IsDirty);
+            Assert.Equal(EditRow.EditRowState.DirtyInsert, er.State);
+            
+            // ... The row sould have a bunch of default values (equal to number of columns) and all are dirty
+            Assert.Equal(rc.newCells.Length, er.Cells.Length);
+            Assert.All(er.Cells, ec =>
+            {
+                Assert.Equal(Common.DefaultValue, ec.DisplayValue);
+                Assert.False(ec.IsNull);    // TODO: Update when we support null default values better
+                Assert.True(ec.IsDirty);
+            });
+        }
+
+        [Fact]
+        public async Task GetEditRowWithCalculatedValue()
+        {
+            // Setup: Generate a row create with an identity column
+            const long rowId = 100;
+            DbColumn[] columns = Common.GetColumns(true);
+            ResultSet rs = await Common.GetResultSet(columns, true);
+            EditTableMetadata etm = Common.GetStandardMetadata(columns, true);
+            RowCreate rc = new RowCreate(rowId, rs, etm);
+            
+            // If: I request an edit row from the row created
+            EditRow er = rc.GetEditRow(null);
+            
+            // Then:
+            // ... The row should not be null
+            Assert.NotNull(er);
+            Assert.Equal(er.Id, rowId);
+            
+            // ... The row should not be clean
+            Assert.True(er.IsDirty);
+            Assert.Equal(EditRow.EditRowState.DirtyInsert, er.State);
+            
+            // ... The row should have a TBD for the identity column
+            Assert.Equal(rc.newCells.Length, er.Cells.Length);
+            Assert.Equal(SR.EditDataComputedColumnPlaceholder, er.Cells[0].DisplayValue);
+            Assert.False(er.Cells[0].IsNull);
+            Assert.True(er.Cells[0].IsDirty);
+                
+            // ... The rest of the cells should have empty display values
+            Assert.All(er.Cells.Skip(1), ec =>
+            {
+                Assert.Equal(string.Empty, ec.DisplayValue);
+                Assert.False(ec.IsNull);
+                Assert.True(ec.IsDirty);
+            });
+        }
+
         [Fact]
         public async Task GetEditRowWithAdditions()
         {
             // Setp: Generate a row create with a cell added to it
             RowCreate rc = await GetStandardRowCreate();
-            rc.SetCell(0, "foo");
+            const string setValue = "foo";
+            rc.SetCell(0, setValue);
 
             // If: I request an edit row from the row create
             EditRow er = rc.GetEditRow(null);
@@ -228,7 +388,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             Assert.Equal(EditRow.EditRowState.DirtyInsert, er.State);
 
             // ... The row should have a single non-empty cell at the beginning that is dirty
-            Assert.Equal("foo", er.Cells[0].DisplayValue);
+            Assert.Equal(setValue, er.Cells[0].DisplayValue);
             Assert.False(er.Cells[0].IsNull);
             Assert.True(er.Cells[0].IsDirty);
 
@@ -242,6 +402,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             }
         }
 
+        #endregion
+
+        #region SetCell Tests
+        
         [Theory]
         [InlineData(-1)]        // Negative
         [InlineData(3)]         // At edge of acceptable values
@@ -262,13 +426,14 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             RowCreate rc = await GetStandardRowCreate();
 
             // If: I set a cell in the newly created row to something that doesn't need changing
-            EditUpdateCellResult eucr = rc.SetCell(0, "1");
+            const string updateValue = "1";
+            EditUpdateCellResult eucr = rc.SetCell(0, updateValue);
 
             // Then:
             // ... The returned value should be equal to what we provided
             Assert.NotNull(eucr);
             Assert.NotNull(eucr.Cell);
-            Assert.Equal("1", eucr.Cell.DisplayValue);
+            Assert.Equal(updateValue, eucr.Cell.DisplayValue);
             Assert.False(eucr.Cell.IsNull);
 
             // ... The returned value should be dirty
@@ -330,13 +495,14 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             RowCreate rc = await GetStandardRowCreate();
 
             // If: I set a cell in the newly created row to null
-            EditUpdateCellResult eucr = rc.SetCell(0, "NULL");
+            const string nullValue = "NULL";
+            EditUpdateCellResult eucr = rc.SetCell(0, nullValue);
 
             // Then:
             // ... The returned value should be equal to what we provided
             Assert.NotNull(eucr);
             Assert.NotNull(eucr.Cell);
-            Assert.NotEmpty(eucr.Cell.DisplayValue);
+            Assert.Equal(nullValue, eucr.Cell.DisplayValue);
             Assert.True(eucr.Cell.IsNull);
 
             // ... The returned value should be dirty
@@ -349,6 +515,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             Assert.NotNull(rc.newCells[0]);
         }
 
+        #endregion
+        
+        #region RevertCell Tests
+        
         [Theory]
         [InlineData(-1)]        // Negative
         [InlineData(3)]         // At edge of acceptable values
@@ -363,11 +533,17 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             Assert.Throws<ArgumentOutOfRangeException>(() => rc.RevertCell(columnId));
         }
 
-        [Fact]
-        public async Task RevertCellNotSet()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task RevertCellNotSet(bool hasDefaultValues)
         {
-            // Setup: Generate the row create
-            RowCreate rc = await GetStandardRowCreate();
+            // Setup: 
+            // ... Generate the parameters for the row create
+            DbColumn[] columns = Common.GetColumns(false);
+            ResultSet rs = await Common.GetResultSet(columns, false);
+            EditTableMetadata etm = Common.GetStandardMetadata(columns, false, hasDefaultValues ? 1 : 0);
+            RowCreate rc = new RowCreate(100, rs, etm);
 
             // If: I attempt to revert a cell that has not been set
             EditRevertCellResult result = rc.RevertCell(0);
@@ -376,9 +552,11 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             // ... We should get a result back
             Assert.NotNull(result);
 
-            // ... We should get a null cell back
-            // @TODO: Check for a default value when we support it
-            Assert.Null(result.Cell);
+            // ... We should get back an edit cell with a value based on the default value
+            string expectedDisplayValue = hasDefaultValues ? Common.DefaultValue : string.Empty; 
+            Assert.NotNull(result.Cell);
+            Assert.Equal(expectedDisplayValue, result.Cell.DisplayValue);
+            Assert.False(result.Cell.IsNull);    // TODO: Modify to support null defaults
 
             // ... The row should be dirty
             Assert.True(result.IsRowDirty);
@@ -387,11 +565,17 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             Assert.Null(rc.newCells[0]);
         }
 
-        [Fact]
-        public async Task RevertCellThatWasSet()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task RevertCellThatWasSet(bool hasDefaultValues)
         {
-            // Setup: Generate the row create
-            RowCreate rc = await GetStandardRowCreate();
+            // Setup: 
+            // ... Generate the parameters for the row create
+            DbColumn[] columns = Common.GetColumns(false);
+            ResultSet rs = await Common.GetResultSet(columns, false);
+            EditTableMetadata etm = Common.GetStandardMetadata(columns, false, hasDefaultValues ? 1 : 0);
+            RowCreate rc = new RowCreate(100, rs, etm);
             rc.SetCell(0, "1");
 
             // If: I attempt to revert a cell that was set
@@ -401,9 +585,11 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             // ... We should get a result back
             Assert.NotNull(result);
 
-            // ... We should get a null cell back
-            // @TODO: Check for a default value when we support it
-            Assert.Null(result.Cell);
+            // ... We should get back an edit cell with a value based on the default value
+            string expectedDisplayValue = hasDefaultValues ? Common.DefaultValue : string.Empty; 
+            Assert.NotNull(result.Cell);
+            Assert.Equal(expectedDisplayValue, result.Cell.DisplayValue);
+            Assert.False(result.Cell.IsNull);    // TODO: Modify to support null defaults
 
             // ... The row should be dirty
             Assert.True(result.IsRowDirty);
@@ -412,6 +598,8 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             Assert.Null(rc.newCells[0]);
         }
 
+        #endregion
+        
         private static async Task<RowCreate> GetStandardRowCreate()
         {
             var cols = Common.GetColumns(false);
@@ -419,5 +607,19 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             var etm = Common.GetStandardMetadata(cols);
             return new RowCreate(100, rs, etm);
         }
+
+        public class RegexExpectedOutput
+        {
+            public RegexExpectedOutput(int expectedInColumns, int expectedInValues, int expectedOutColumns)
+            {
+                ExpectedInColumns = expectedInColumns;
+                ExpectedInValues = expectedInValues;
+                ExpectedOutColumns = expectedOutColumns;
+            }
+            
+            public int ExpectedInColumns { get; set; }
+            public int ExpectedInValues { get; set; }
+            public int ExpectedOutColumns { get; set; }
+        }
     }
 }

test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/RowUpdateTests.cs

@@ -128,7 +128,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             // If: 
             // ... I add updates to all the cells in the row
             RowUpdate ru = new RowUpdate(0, rs, etm);
-            Common.AddCells(ru, true);
+            Common.AddCells(ru, 1);
 
             // ... Then I update a cell back to it's old value
             var eucr = ru.SetCell(1, (string) rs.GetRow(0)[1].RawObject);
@@ -204,7 +204,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
 
             // If: I ask for a script to be generated for update
             RowUpdate ru = new RowUpdate(0, rs, etm);
-            Common.AddCells(ru, true);
+            Common.AddCells(ru, 1);
             string script = ru.GetScript();
 
             // Then:
@@ -241,7 +241,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.EditData
             var rs = await Common.GetResultSet(columns, includeIdentity);
             var etm = Common.GetStandardMetadata(columns, isMemoryOptimized);
             RowUpdate ru = new RowUpdate(0, rs, etm);
-            Common.AddCells(ru, includeIdentity);
+            Common.AddCells(ru, includeIdentity ? 1 : 0);
 
             // ... Mock db connection for building the command
             var mockConn = new TestSqlConnection(null);