Improvements to GenerateTSqlModel request and tests (#1611)

src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GenerateTSqlModelRequest.cs

@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx.Contracts
 {
@@ -33,7 +32,7 @@ namespace Microsoft.SqlTools.ServiceLayer.DacFx.Contracts
     /// </summary>
     class GenerateTSqlModelRequest
     {
-        public static readonly RequestType<GenerateTSqlModelParams, ResultStatus> Type =
+        public static readonly RequestType<GenerateTSqlModelParams, bool> Type =
-            RequestType<GenerateTSqlModelParams, ResultStatus>.Create("dacFx/generateTSqlModel");
+            RequestType<GenerateTSqlModelParams, bool>.Create("dacFx/generateTSqlModel");
     }
 }

src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxService.cs

@@ -12,7 +12,6 @@ using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Hosting;
 using Microsoft.SqlTools.ServiceLayer.TaskServices;
 using Microsoft.SqlServer.Dac.Model;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using DacTableDesigner = Microsoft.Data.Tools.Sql.DesignServices.TableDesigner.TableDesigner;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx
@@ -271,7 +270,7 @@ namespace Microsoft.SqlTools.ServiceLayer.DacFx
             });
         }
 
-        public async Task HandleGenerateTSqlModelRequest(GenerateTSqlModelParams requestParams, RequestContext<ResultStatus> requestContext)
+        public async Task HandleGenerateTSqlModelRequest(GenerateTSqlModelParams requestParams, RequestContext<bool> requestContext)
         {
             try
             {
@@ -279,11 +278,7 @@ namespace Microsoft.SqlTools.ServiceLayer.DacFx
                 TSqlModel model = operation.GenerateTSqlModel();
 
                 projectModels.Value[operation.Parameters.ProjectUri] = model;
-                await requestContext.SendResult(new ResultStatus
+                await requestContext.SendResult(true);
-                {
-                    Success = true,
-                    ErrorMessage = null
-                });
             }
             catch (Exception e)
             {

test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxServiceTests.cs

@@ -17,7 +17,6 @@ using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
 using Microsoft.SqlTools.ServiceLayer.TaskServices;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using Microsoft.SqlServer.Dac.Model;
 using NUnit.Framework;
 using Moq;
@@ -28,7 +27,6 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.DacFx
     public class DacFxServiceTests
     {
         private string publishProfileFolder = Path.Combine("..", "..", "..", "DacFx", "PublishProfiles");
-        private string TSqlModelTestFolder = Path.Combine("..", "..", "..", "DacFx", "TSqlModels");
         private const string SourceScript = @"CREATE TABLE [dbo].[table1]
 (
     [ID] INT NOT NULL PRIMARY KEY,
@@ -930,6 +928,28 @@ Streaming query statement contains a reference to missing output stream 'Missing
                 Assert.That(actualValue, Is.EqualTo(expectedValue), $"Actual Property from Service is not equal to default property for {optionRow.Key}");
             }
         }
+    }
+}
+
+[TestFixture]
+public class TSqlModelRequestTests
+{
+    private string TSqlModelTestFolder = string.Empty;
+
+    private DacFxService service = new DacFxService();
+
+    [SetUp]
+    public void Create()
+    {
+        TSqlModelTestFolder = Path.Combine("..", "..", "..", "DacFx", "TSqlModels", Guid.NewGuid().ToString());
+        Directory.CreateDirectory(TSqlModelTestFolder);
+    }
+
+    [TearDown]
+    public void CleanUp()
+    {
+        Directory.Delete(TSqlModelTestFolder, true);
+    }
 
     /// <summary>
     /// Verify the generate Tsql model operation
@@ -937,8 +957,6 @@ Streaming query statement contains a reference to missing output stream 'Missing
     [Test]
     public void GenerateTSqlModelFromSqlFiles()
     {
-            DacFxService service = new DacFxService();
-            Directory.CreateDirectory(TSqlModelTestFolder);
         string sqlTable1DefinitionPath = Path.Join(TSqlModelTestFolder, "table1.sql");
         string sqlTable2DefinitionPath = Path.Join(TSqlModelTestFolder, "table2.sql");
         const string table1 = @"CREATE TABLE [dbo].[table1]
@@ -964,12 +982,8 @@ Streaming query statement contains a reference to missing output stream 'Missing
         var model = op.GenerateTSqlModel();
         var objects = model.GetObjects(DacQueryScopes.UserDefined, ModelSchema.Table).ToList();
 
-            VerifyAndCleanup(sqlTable1DefinitionPath);
-            VerifyAndCleanup(sqlTable2DefinitionPath);
-            Directory.Delete(TSqlModelTestFolder);
-
         Assert.That(model.Version.ToString(), Is.EqualTo(generateTSqlScriptParams.ModelTargetVersion), $"Model version is not equal to {generateTSqlScriptParams.ModelTargetVersion}");
-            Assert.That(objects, Is.Not.Empty);
+        Assert.That(objects, Is.Not.Empty, "Model is empty");
 
         var tableNames = objects.Select(o => o.Name.ToString()).ToList();
 
@@ -983,9 +997,6 @@ Streaming query statement contains a reference to missing output stream 'Missing
     [Test]
     public void GenerateEmptyTSqlModel()
     {
-            DacFxService service = new DacFxService();
-            Directory.CreateDirectory(TSqlModelTestFolder);
-
         var generateTSqlScriptParams = new GenerateTSqlModelParams
         {
             ProjectUri = Path.Join(TSqlModelTestFolder, "test.sqlproj"),
@@ -996,9 +1007,6 @@ Streaming query statement contains a reference to missing output stream 'Missing
         GenerateTSqlModelOperation op = new GenerateTSqlModelOperation(generateTSqlScriptParams);
         var model = op.GenerateTSqlModel();
 
-            // clean up
-            Directory.Delete(TSqlModelTestFolder);
-
         Assert.That(model.GetObjects(DacQueryScopes.UserDefined, ModelSchema.Table).ToList().Count, Is.EqualTo(0), "Model is not empty");
         Assert.That(model.Version.ToString(), Is.EqualTo(generateTSqlScriptParams.ModelTargetVersion), $"Model version is not equal to {generateTSqlScriptParams.ModelTargetVersion}");
     }
@@ -1009,9 +1017,6 @@ Streaming query statement contains a reference to missing output stream 'Missing
     [Test]
     public async Task VerifyGenerateTSqlModelHandle()
     {
-            DacFxService service = new DacFxService();
-            Directory.CreateDirectory(TSqlModelTestFolder);
-
         var generateTSqlScriptParams = new GenerateTSqlModelParams
         {
             ProjectUri = Path.Join(TSqlModelTestFolder, "test.sqlproj"),
@@ -1019,13 +1024,10 @@ Streaming query statement contains a reference to missing output stream 'Missing
             FilePaths = new string[] { }
         };
 
-            var requestContext = new Mock<RequestContext<ResultStatus>>();
+        var requestContext = new Mock<RequestContext<bool>>();
-            requestContext.Setup((RequestContext<ResultStatus> x) => x.SendResult(It.Is<ResultStatus>((result) => result.Success == true))).Returns(Task.FromResult(new object()));
+        requestContext.Setup((RequestContext<bool> x) => x.SendResult(It.Is<bool>((result) => result == true))).Returns(Task.FromResult(new object()));
+
         await service.HandleGenerateTSqlModelRequest(generateTSqlScriptParams, requestContext.Object);
-
+        Assert.That(service.projectModels.Value, Contains.Key(generateTSqlScriptParams.ProjectUri), "Model was not stored under project uri");
-            Directory.Delete(TSqlModelTestFolder);
-
-            Assert.True(service.projectModels.Value.Keys.Contains(generateTSqlScriptParams.ProjectUri), "Model was not stored under project uri");
-        }
     }
 }