fixed db trigger, system types and oe tests (#331)

* fixed db trigger, system types and oe tests

src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/NodeFilter.cs

@@ -4,7 +4,9 @@
 //
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes
 {
@@ -76,6 +78,22 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes
                     filter = $"{filter} {orPrefix} @{Property} = {proeprtyValue}";
                 }
             }
+            filter = $"({filter})";
+
+            return filter;
+        }
+
+        public static string ConcatProperties(IEnumerable<NodeFilter> filters)
+        {
+            string filter = "";
+            var list = filters.ToList();
+            for (int i = 0; i < list.Count; i++)
+            {
+                var value = list[i];
+                
+                string orPrefix = i == 0 ? "" : "and";
+                filter = $"{filter} {orPrefix} {value.ToPropertyFilterString()}";
+            }
             filter = $"[{filter}]";
 
             return filter;

src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ObjectExplorerService.cs

@@ -88,6 +88,16 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
             serviceHost.SetRequestHandler(ExpandRequest.Type, HandleExpandRequest);
         }
 
+        public void CloseSession(string uri)
+        {
+            ObjectExplorerSession session;
+            if (sessionMap.TryGetValue(uri, out session))
+            {
+                // Establish a connection to the specified server/database
+                sessionMap.Remove(session.Uri);
+            }
+        }
+        
         internal async Task HandleCreateSessionRequest(ConnectionDetails connectionDetails, RequestContext<CreateSessionResponse> context)
         {
             Logger.Write(LogLevel.Verbose, "HandleCreateSessionRequest");

src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoChildFactoryBase.cs

@@ -23,7 +23,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
         
         public override IEnumerable<TreeNode> Expand(TreeNode parent)
         {
-            //parent.BeginChildrenInit();
             try
             {
                 List<TreeNode> allChildren = new List<TreeNode>();
@@ -35,7 +34,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
             }
             finally
             {
-                //parent.EndChildrenInit();
             }
         }
         
@@ -62,10 +60,15 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
             }
             SmoQueryContext context = parent.GetContextAs<SmoQueryContext>();
             Validate.IsNotNull(nameof(context), context);
+            
+            var validForFlag = ServerVersionHelper.GetValidForFlag(context.SqlServerType);
+            if (ShouldFilterNode(parent, validForFlag))
+            {
+                return;
+            }
+
             IEnumerable<SmoQuerier> queriers = context.ServiceProvider.GetServices<SmoQuerier>(q => IsCompatibleQuerier(q));
             var filters = this.Filters;
-            var validForFlag = ServerVersionHelper.GetValidForFlag(context.SqlServerType);
-
             foreach (var querier in queriers)
             {
                 string propertyFilter = GetProperyFilter(filters, querier.GetType(), validForFlag);
@@ -77,7 +80,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
                         Console.WriteLine("smoObject should not be null");
                     }
                     TreeNode childNode = CreateChild(parent, smoObject);
-                    if (childNode != null && !ShouldFilterNode(childNode, validForFlag))
+                    if (childNode != null && PassesFinalFilters(childNode, smoObject) && !ShouldFilterNode(childNode, validForFlag))
                     {
                         allChildren.Add(childNode);
                     }
@@ -102,15 +105,14 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
 
         private string GetProperyFilter(IEnumerable<NodeFilter> filters, Type querierType, ValidForFlag validForFlag)
         {
-            string filter = "";
+            string filter = string.Empty;
             if (filters != null)
             {
-                var filterToApply = filters.FirstOrDefault(f => f.CanApplyFilter(querierType, validForFlag));
+                var filtersToApply = filters.Where(f => f.CanApplyFilter(querierType, validForFlag)).ToList();
-                filter = "";
+                filter = string.Empty;
-
+                if (filtersToApply.Any())
-                if (filterToApply != null)
                 {
-                    filter = filterToApply.ToPropertyFilterString();
+                    filter = NodeFilter.ConcatProperties(filtersToApply);
                 }
             }
 

src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.cs

@@ -923,7 +923,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
     [Export(typeof(SmoQuerier))]
     internal partial class SqlDatabaseDdlTriggerQuerier: SmoQuerier
     {
-        Type[] supportedTypes = new Type[] { typeof(Trigger) };
+        Type[] supportedTypes = new Type[] { typeof(DatabaseDdlTrigger) };
 
         public override Type[] SupportedObjectTypes { get { return supportedTypes; } }
 
@@ -937,7 +937,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
                 HashSet<string> urns = null;
                 if (hasFilter)
                 {
-                    string urn = $"{parentDatabase.Urn.ToString()}/Trigger" + filter;
+                    string urn = $"{parentDatabase.Urn.ToString()}/DatabaseDdlTrigger" + filter;
                     Enumerator en = new Enumerator();
                     Request request = new Request(new Urn(urn));
                     ServerConnection serverConnection = new ServerConnection(context.Server.ConnectionContext.SqlConnectionObject);
@@ -948,11 +948,11 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
                 {
                     if (hasFilter && urns != null)
                     {
-                        return new SmoCollectionWrapper<Trigger>(retValue).Where(c => urns.Contains(c.Urn));
+                        return new SmoCollectionWrapper<DatabaseDdlTrigger>(retValue).Where(c => urns.Contains(c.Urn));
                     }
                     else
                     {
-                        return new SmoCollectionWrapper<Trigger>(retValue);
+                        return new SmoCollectionWrapper<DatabaseDdlTrigger>(retValue);
                     }
                 }
             }
@@ -1120,46 +1120,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
         }
     }
 
-    [Export(typeof(SmoQuerier))]
-    internal partial class SqlSystemDataTypeQuerier: SmoQuerier
-    {
-        Type[] supportedTypes = new Type[] { typeof(SystemDataType) };
-
-        public override Type[] SupportedObjectTypes { get { return supportedTypes; } }
-
-        public override  IEnumerable<SqlSmoObject> Query(SmoQueryContext context, string filter)
-        {
-            Server parentServer = context.Parent as Server;
-            if (parentServer != null)
-            {
-                var retValue = parentServer.SystemDataTypes;
-                bool hasFilter = !string.IsNullOrEmpty(filter);
-                HashSet<string> urns = null;
-                if (hasFilter)
-                {
-                    string urn = $"{parentServer.Urn.ToString()}/SystemDataType" + filter;
-                    Enumerator en = new Enumerator();
-                    Request request = new Request(new Urn(urn));
-                    ServerConnection serverConnection = new ServerConnection(context.Server.ConnectionContext.SqlConnectionObject);
-                    EnumResult result = en.Process(serverConnection, request);
-                    urns = GetUrns(result);
-                }
-                if (retValue != null)
-                {
-                    if (hasFilter && urns != null)
-                    {
-                        return new SmoCollectionWrapper<SystemDataType>(retValue).Where(c => urns.Contains(c.Urn));
-                    }
-                    else
-                    {
-                        return new SmoCollectionWrapper<SystemDataType>(retValue);
-                    }
-                }
-            }
-            return Enumerable.Empty<SqlSmoObject>();
-        }
-    }
-
     [Export(typeof(SmoQuerier))]
     internal partial class SqlUserDefinedDataTypeQuerier: SmoQuerier
     {
@@ -2802,15 +2762,15 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
 
         public override  IEnumerable<SqlSmoObject> Query(SmoQueryContext context, string filter)
         {
-            Server parentServer = context.Parent as Server;
+            Database parentDatabase = context.Parent as Database;
-            if (parentServer != null)
+            if (parentDatabase != null)
             {
-                var retValue = parentServer.SystemDataTypes;
+                var retValue = parentDatabase.Parent.SystemDataTypes;
                 bool hasFilter = !string.IsNullOrEmpty(filter);
                 HashSet<string> urns = null;
                 if (hasFilter)
                 {
-                    string urn = $"{parentServer.Urn.ToString()}/SystemDataType" + filter;
+                    string urn = $"{parentDatabase.Urn.ToString()}/SystemDataType" + filter;
                     Enumerator en = new Enumerator();
                     Request request = new Request(new Urn(urn));
                     ServerConnection serverConnection = new ServerConnection(context.Server.ConnectionContext.SqlConnectionObject);

src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModelDefinition.xml

@@ -52,7 +52,9 @@
   <Node Name="SqlFullTextIndex" Parent="Table" Collection="False" />
   <Node Name="SqlStatistic" Parent="TableViewBase"/>
 
-  <Node Name="SqlDatabaseDdlTrigger" Type="Trigger" Parent="Database"/>
+  <Node Name="SqlDatabaseDdlTrigger" Type="DatabaseDdlTrigger" Parent="Database">
+    <NavigationPath Parent="Database" Field="Triggers" />
+  </Node>
   <Node Name="SqlAssembly" Type="SqlAssembly" Parent="Database" >
     <NavigationPath Parent="Database" Field="Assemblies" />
   </Node>
@@ -61,7 +63,6 @@
   <Node Name="SqlDefault" Parent="Database" />
   <Node Name="SqlSequence" Parent="Database" />
 
-  <Node Name="SqlSystemDataType" Parent="Server" />
   <Node Name="SqlUserDefinedDataType" Parent="Database" />
 
   <Node Name="SqlUserDefinedTableType" Parent="Database" />
@@ -129,7 +130,9 @@
 
   <Node Name="SqlPartitionFunctionParameter" Parent="PartitionFunction" />
 
-  <Node Name="SqlBuiltInType" Type="SystemDataType" Parent="Server"/>
+  <Node Name="SqlBuiltInType" Type="SystemDataType" Parent="Database">
+    <NavigationPath Parent="Database" Field="Parent.SystemDataTypes" />
+  </Node>
   <!-- TODO Enable all types
   <Node Name="SqlRoute"/>
   -->

src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeDefinition.xml

@@ -216,6 +216,7 @@
     <Child Name="ScalarValuedFunctions"/>
     <Child Name="AggregateFunctions"/>
   </Node>
+
   <Node Name="DatabaseTriggers" LocLabel="SR.SchemaHierarchy_DatabaseTriggers" BaseClass="ModelBased" NodeType="DatabaseTrigger" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlDatabaseDdlTrigger"/>
   <Node Name="Assemblies" LocLabel="SR.SchemaHierarchy_Assemblies" BaseClass="ModelBased" Strategy="MultipleElementsOfType" NodeType="Assembly" ChildQuerierTypes="SqlAssembly" ValidFor="Sql2005|Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV12"/>
   <Node Name="Types" LocLabel="SR.SchemaHierarchy_Types" BaseClass="ModelBased" >
@@ -268,8 +269,8 @@
   <Node Name="SystemUnicodeCharacterStrings" LocLabel="SR.SchemaHierarchy_SystemUnicodeCharacterStrings" BaseClass="ModelBased" NodeType="SystemUnicodeCharacterString" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlBuiltInType"/>
   <Node Name="SystemBinaryStrings" LocLabel="SR.SchemaHierarchy_SystemBinaryStrings" BaseClass="ModelBased" Strategy="MultipleElementsOfType" NodeType="SystemBinaryString" ChildQuerierTypes="SqlBuiltInType"/>
   <Node Name="SystemOtherDataTypes" LocLabel="SR.SchemaHierarchy_SystemOtherDataTypes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" NodeType="SystemOtherDataType" ChildQuerierTypes="SqlBuiltInType"/>
-  <Node Name="SystemClrDataTypes" LocLabel="SR.SchemaHierarchy_SystemCLRDataTypes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" NodeType="SystemClrDataType" ChildQuerierTypes="SqlUserDefinedType" ValidFor="Sql2005|Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV11|AzureV12"/>
+  <Node Name="SystemClrDataTypes" LocLabel="SR.SchemaHierarchy_SystemCLRDataTypes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" NodeType="SystemClrDataType" ChildQuerierTypes="SqlBuiltInType" ValidFor="Sql2005|Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV11|AzureV12"/>
-  <Node Name="SystemSpatialDataTypes" LocLabel="SR.SchemaHierarchy_SystemSpatialDataTypes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" NodeType="SystemSpatialDataType" ChildQuerierTypes="SqlUserDefinedType" ValidFor="Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV11|AzureV12"/>
+  <Node Name="SystemSpatialDataTypes" LocLabel="SR.SchemaHierarchy_SystemSpatialDataTypes" BaseClass="ModelBased" Strategy="MultipleElementsOfType" NodeType="SystemSpatialDataType" ChildQuerierTypes="SqlBuiltInType" ValidFor="Sql2008|Sql2012|Sql2014|Sql2016|SqlvNext|AzureV11|AzureV12"/>
 
   <!-- Childs of ExternalResources -->
   <Node Name="ExternalDataSources" LocLabel="SR.SchemaHierarchy_ExternalDataSources" BaseClass="ModelBased" NodeType="ExternalDataSource" Strategy="MultipleElementsOfType" ChildQuerierTypes="SqlExternalDataSource" ValidFor="Sql2016|SqlvNext|AzureV12"/>

src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs

@@ -2393,7 +2393,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
         {
            get
            {
-              return new [] { typeof(SqlUserDefinedTypeQuerier), };
+              return new [] { typeof(SqlBuiltInTypeQuerier), };
            }
         }
 
@@ -2417,7 +2417,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
         {
            get
            {
-              return new [] { typeof(SqlUserDefinedTypeQuerier), };
+              return new [] { typeof(SqlBuiltInTypeQuerier), };
            }
         }
 

test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/ObjectExplorer/ObjectExplorerServiceTests.cs

@@ -4,9 +4,12 @@
 //
 
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
@@ -14,6 +17,7 @@ using Microsoft.SqlTools.ServiceLayer.ObjectExplorer;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Contracts;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
+using Microsoft.SqlTools.ServiceLayer.Test.Common.Baselined;
 using Xunit;
 using static Microsoft.SqlTools.ServiceLayer.ObjectExplorer.ObjectExplorerService;
 
@@ -33,8 +37,8 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.ObjectExplorer
             {
                 var session = await CreateSession(null, uri);
                 await ExpandServerNodeAndVerifyDatabaseHierachy(testDb.DatabaseName, session);
+                DisconnectConnection(uri);
             }
-            CancelConnection(uri);
         }
 
         [Fact]
@@ -47,9 +51,8 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.ObjectExplorer
             {
                 var session = await CreateSession("tempdb", uri);
                 await ExpandServerNodeAndVerifyDatabaseHierachy(testDb.DatabaseName, session);
+                DisconnectConnection(uri);
             }
-            CancelConnection(uri);
-
         }
 
         [Fact]
@@ -62,15 +65,35 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.ObjectExplorer
             {
                 var session = await CreateSession(testDb.DatabaseName, uri);
                 ExpandAndVerifyDatabaseNode(testDb.DatabaseName, session);
+                DisconnectConnection(uri);
+            }
         }
-            CancelConnection(uri);
 
+        [Fact]
+        public async void VerifyAllSqlObjects()
+        {
+            var queryFileName = "AllSqlObjects.sql";
+            string uri = "AllSqlObjects";
+            string baselineFileName = "AllSqlObjects.txt";
+            string databaseName = null;
+            await TestServiceProvider.CalculateRunTime(() => VerifyObjectExplorerTest(databaseName, queryFileName, uri, baselineFileName), true);
+        }
+
+        //[Fact]
+        //This takes take long to run so not a good test for CI builds
+        public async void VerifySystemObjects()
+        {
+            string queryFileName = null;
+            string uri = "SystemObjects";
+            string baselineFileName = null;
+            string databaseName = null;
+            await TestServiceProvider.CalculateRunTime(() => VerifyObjectExplorerTest(databaseName, queryFileName, uri, baselineFileName, true), true);
         }
 
         private async Task<ObjectExplorerSession> CreateSession(string databaseName, string uri)
         {
             ConnectParams connectParams = TestServiceProvider.Instance.ConnectionProfileService.GetConnectionParameters(TestServerType.OnPrem, databaseName);
-            connectParams.Connection.Pooling = false;
+            //connectParams.Connection.Pooling = false;
             ConnectionDetails details = connectParams.Connection;
 
             var session =  await _service.DoCreateSession(details, uri);
@@ -136,23 +159,37 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.ObjectExplorer
             Assert.NotNull(tablesRoot);
         }
 
-        private void CancelConnection(string uri)
+        private void DisconnectConnection(string uri)
         {
-            ConnectionService.Instance.CancelConnect(new CancelConnectParams
+            ConnectionService.Instance.Disconnect(new DisconnectParams
             {
                 OwnerUri = uri,
                 Type = ConnectionType.Default
             });
         }
 
-        private async Task ExpandTree(NodeInfo node, ObjectExplorerSession session)
+        private async Task ExpandTree(NodeInfo node, ObjectExplorerSession session, StringBuilder stringBuilder = null, bool verifySystemObjects = false)
         {
             if (node != null && !node.IsLeaf)
             {
                 var children = await _service.ExpandNode(session, node.NodePath);
                 foreach (var child in children)
                 {
-                    await _service.ExpandNode(session, child.NodePath);
+                    if (stringBuilder != null && child.NodeType != "Folder" && child.NodeType != "FileGroupFile")
+                    {
+                        stringBuilder.AppendLine($"NodeType: {child.NodeType} Label: {child.Label}");
+                    }
+                    if (!verifySystemObjects && (child.Label == SR.SchemaHierarchy_SystemStoredProcedures ||
+                        child.Label == SR.SchemaHierarchy_SystemViews ||
+                        child.Label == SR.SchemaHierarchy_SystemFunctions ||
+                        child.Label == SR.SchemaHierarchy_SystemDataTypes))
+                    {
+                        // don't expand the system folders because then the test will take for ever
+                    }
+                    else
+                    {
+                        await ExpandTree(child, session, stringBuilder, verifySystemObjects);
+                    }
                 }
             }
         }
@@ -160,7 +197,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.ObjectExplorer
         /// <summary>
         /// Returns the children of a node with the given label
         /// </summary>
-        private async Task<NodeInfo[]> FindNodeByLabel(NodeInfo node, ObjectExplorerSession session, string nodeType, bool nodeFound = false)
+        private async Task<IList<NodeInfo>> FindNodeByLabel(NodeInfo node, ObjectExplorerSession session, string nodeType, bool nodeFound = false)
         {
             if (node != null && !node.IsLeaf)
             {
@@ -211,117 +248,25 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.ObjectExplorer
             }
         }
 
-
+        private async Task<bool> VerifyObjectExplorerTest(string databaseName, string queryFileName, string uri, string baselineFileName, bool verifySystemObjects = false)
-        [Fact]
-        public async void VerifyAdventureWorksDatabaseObjects()
-        {
-            var query = Scripts.AdventureWorksScript;
-            string uri = "VerifyAdventureWorksDatabaseObjects";
-            string databaseName = null;
-
-            using (SelfCleaningTempFile queryTempFile = new SelfCleaningTempFile())
-            using (SqlTestDb testDb = SqlTestDb.CreateNew(TestServerType.OnPrem, true, databaseName, query, uri))
-            {
-                var session = await CreateSession(testDb.DatabaseName, queryTempFile.FilePath);
-                var databaseNodeInfo = await ExpandServerNodeAndVerifyDatabaseHierachy(testDb.DatabaseName, session, false);
-                await ExpandTree(session.Root.ToNodeInfo(), session);
-                var tablesChildren = await FindNodeByLabel(databaseNodeInfo, session, SR.SchemaHierarchy_Tables);
-
-                var systemTables = await FindNodeByLabel(databaseNodeInfo, session, SR.SchemaHierarchy_SystemTables);
-                Assert.True(!systemTables.Any());
-
-                var externalTables = await FindNodeByLabel(databaseNodeInfo, session, SR.SchemaHierarchy_ExternalTables);
-                Assert.True(!externalTables.Any());
-
-                var fileTables = await FindNodeByLabel(databaseNodeInfo, session, SR.SchemaHierarchy_FileTables);
-                Assert.True(!fileTables.Any());
-
-                var allTables = tablesChildren.Where(x => x.NodeType != NodeTypes.Folder.ToString());
-                Assert.True(allTables.Any());
-
-                var storedProcedures = await FindNodeByLabel(databaseNodeInfo, session, SR.SchemaHierarchy_StoredProcedures);
-                Assert.True(storedProcedures.Any());
-
-                var views = await FindNodeByLabel(databaseNodeInfo, session, SR.SchemaHierarchy_Views);
-                Assert.True(views.Any());
-
-                var userDefinedDataTypes = await FindNodeByLabel(databaseNodeInfo, session, SR.SchemaHierarchy_UserDefinedDataTypes);
-                Assert.True(userDefinedDataTypes.Any());
-
-                var scalarValuedFunctions = await FindNodeByLabel(databaseNodeInfo, session, SR.SchemaHierarchy_ScalarValuedFunctions);
-                Assert.True(scalarValuedFunctions.Any());
-
-            }
-           CancelConnection(uri);
-
-        }
-
-        // [Fact]
-        public async void VerifySql2016Objects()
-        {
-            var query = LoadScript("Sql_2016_Additions.sql");
-            string uri = "VerifySql2016Objects";
-            string databaseName = null;
-
-            using (SqlTestDb testDb = SqlTestDb.CreateNew(TestServerType.OnPrem, false, databaseName, query, uri))
         {
+            var query = string.IsNullOrEmpty(queryFileName) ? string.Empty : LoadScript(queryFileName);
+            StringBuilder stringBuilder = new StringBuilder();
+            SqlTestDb testDb = SqlTestDb.CreateNew(TestServerType.OnPrem, false, databaseName, query, uri);
             var session = await CreateSession(testDb.DatabaseName, uri);
-                var databaseNodeInfo = await ExpandServerNodeAndVerifyDatabaseHierachy(testDb.DatabaseName, session);
+            await ExpandServerNodeAndVerifyDatabaseHierachy(testDb.DatabaseName, session, false);
-                await FindNodeByLabel(databaseNodeInfo, session, SR.SchemaHierarchy_Tables);
+            await ExpandTree(session.Root.ToNodeInfo(), session, stringBuilder, verifySystemObjects);
-            }
-            CancelConnection(uri);
 
-        }
+            string baseline = string.IsNullOrEmpty(baselineFileName) ? string.Empty : LoadBaseLine(baselineFileName);
-
+            if (!string.IsNullOrEmpty(baseline))
-        // [Fact]
-        public async void VerifySqlObjects()
             {
-            var query = LoadScript("Sql_Additions.sql");
+                string actual = stringBuilder.ToString();
-            string uri = "VerifySqlObjects";
+                BaselinedTest.CompareActualWithBaseline(actual, baseline);
-            string databaseName = null;
-
-            using (SqlTestDb testDb = SqlTestDb.CreateNew(TestServerType.OnPrem, false, databaseName, query, uri))
-            {
-                var session = await CreateSession(testDb.DatabaseName, uri);
-                var databaseNodeInfo = await ExpandServerNodeAndVerifyDatabaseHierachy(testDb.DatabaseName, session);
-                await FindNodeByLabel(databaseNodeInfo, session, SR.SchemaHierarchy_Tables);
             }
-            CancelConnection(uri);
+            _service.CloseSession(session.Uri);
-
+            Thread.Sleep(3000);
-        }
+            testDb.Cleanup();
-
+            return true;
-        // [Fact]
-        public async void VerifyFileTableTest()
-        {
-            var query = LoadScript("FileTableTest.sql");
-            string uri = "VerifyFileTableTest";
-            string databaseName = null;
-
-            using (SqlTestDb testDb = SqlTestDb.CreateNew(TestServerType.OnPrem, false, databaseName, query, uri))
-            {
-                var session = await CreateSession(testDb.DatabaseName, uri);
-                var databaseNodeInfo = await ExpandServerNodeAndVerifyDatabaseHierachy(testDb.DatabaseName, session);
-                await FindNodeByLabel(databaseNodeInfo, session, SR.SchemaHierarchy_Tables);
-            }
-            CancelConnection(uri);
-
-        }
-
-        //[Fact]
-        public async void VerifyColumnstoreindexSql16()
-        {
-            var query = LoadScript("ColumnstoreindexSql16.sql");
-            string uri = "VerifyColumnstoreindexSql16";
-            string databaseName = null;
-
-            using (SqlTestDb testDb = SqlTestDb.CreateNew(TestServerType.OnPrem, false, databaseName, query, uri))
-            {
-                var session = await CreateSession(testDb.DatabaseName, uri);
-                var databaseNodeInfo = await ExpandServerNodeAndVerifyDatabaseHierachy(testDb.DatabaseName, session);
-                await FindNodeByLabel(databaseNodeInfo, session, SR.SchemaHierarchy_Tables);
-            }
-            CancelConnection(uri);
-
         }
 
         private static string TestLocationDirectory
@@ -341,15 +286,36 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.ObjectExplorer
             }
         }
 
+        public DirectoryInfo BaselineFileDirectory
+        {
+            get
+            {
+                string d = Path.Combine(TestLocationDirectory, "Baselines");
+                return new DirectoryInfo(d);
+            }
+        }
+
         public FileInfo GetInputFile(string fileName)
         {
             return new FileInfo(Path.Combine(InputFileDirectory.FullName, fileName));
         }
 
+        public FileInfo GetBaseLineFile(string fileName)
+        {
+            return new FileInfo(Path.Combine(BaselineFileDirectory.FullName, fileName));
+        }
+
         private string LoadScript(string fileName)
         {
             FileInfo inputFile = GetInputFile(fileName);
             return TestUtilities.ReadTextAndNormalizeLineEndings(inputFile.FullName);
         }
+
+        private string LoadBaseLine(string fileName)
+        {
+            FileInfo inputFile = GetBaseLineFile(fileName);
+            return TestUtilities.ReadTextAndNormalizeLineEndings(inputFile.FullName);
+        }
+
     }
 }

test/Microsoft.SqlTools.ServiceLayer.Test.Common/Baselined/BaselinedTest.cs

@@ -272,7 +272,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common.Baselined
         /// <param name="actualContent">Actual string</param>
         /// <param name="baselineContent">Expected string</param>
         /// <remarks>Fails test if strings do not match; comparison is done using an InvariantCulture StringComparer</remarks>
-        public void CompareActualWithBaseline(string actualContent, string baselineContent)
+        public static void CompareActualWithBaseline(string actualContent, string baselineContent)
         {
 
             int _compareResult = string.Compare(actualContent, baselineContent, StringComparison.OrdinalIgnoreCase);

test/Microsoft.SqlTools.ServiceLayer.Test.Common/SqlTestDb.cs

@@ -62,8 +62,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
         {
             SqlTestDb testDb = new SqlTestDb();
 
-            using (SelfCleaningTempFile queryTempFile = new SelfCleaningTempFile())
-            {
             databaseName = databaseName ?? GetUniqueDBName(dbNamePrefix);
             string createDatabaseQuery = Scripts.CreateDatabaseQuery.Replace("#DatabaseName#", databaseName);
             TestServiceProvider.Instance.RunQuery(serverType, MasterDatabaseName, createDatabaseQuery);
@@ -76,7 +74,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
             testDb.DatabaseName = databaseName;
             testDb.ServerType = serverType;
             testDb.DoNotCleanupDb = doNotCleanupDb;
-            }
 
             return testDb;
         }
@@ -110,6 +107,8 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
         }
 
         public void Cleanup()
+        {
+            try
             {
                 if (!DoNotCleanupDb)
                 {
@@ -120,6 +119,11 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
                     TestServiceProvider.Instance.RunQuery(ServerType, MasterDatabaseName, dropDatabaseQuery);
                 }
             }
+            catch (Exception ex)
+            {
+                Console.WriteLine(string.Format(CultureInfo.InvariantCulture, "Failed to cleanup database: {0} error:{1}", DatabaseName, ex.Message));
+            }
+        }
 
         /// <summary>
         /// Returns connection info after making a connection to the database

test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/ObjectExplorer/Baselines/AllSqlObjects.txt

@@ -0,0 +1,136 @@
+NodeType: Table Label: HumanResources.Employee
+NodeType: Column Label: BusinessEntityID
+NodeType: Column Label: NationalIDNumber
+NodeType: Column Label: LoginID
+NodeType: Column Label: OrganizationNode
+NodeType: Column Label: OrganizationLevel
+NodeType: Column Label: JobTitle
+NodeType: Column Label: BirthDate
+NodeType: Column Label: MaritalStatus
+NodeType: Column Label: Gender
+NodeType: Column Label: HireDate
+NodeType: Column Label: SalariedFlag
+NodeType: Column Label: VacationHours
+NodeType: Column Label: SickLeaveHours
+NodeType: Column Label: CurrentFlag
+NodeType: Column Label: rowguid
+NodeType: Column Label: ModifiedDate
+NodeType: Key Label: FK_Employee_Person_BusinessEntityID
+NodeType: Key Label: PK_Employee_BusinessEntityID
+NodeType: Constraint Label: CK_Employee_BirthDate
+NodeType: Constraint Label: CK_Employee_Gender
+NodeType: Constraint Label: CK_Employee_HireDate
+NodeType: Constraint Label: CK_Employee_MaritalStatus
+NodeType: Constraint Label: CK_Employee_SickLeaveHours
+NodeType: Constraint Label: CK_Employee_VacationHours
+NodeType: Index Label: NonClusteredIndex-Login
+NodeType: Statistic Label: NonClusteredIndex-Login
+NodeType: Statistic Label: PK_Employee_BusinessEntityID
+NodeType: Table Label: HumanResources.Employee_Temporal
+NodeType: Column Label: BusinessEntityID
+NodeType: Column Label: NationalIDNumber
+NodeType: Column Label: LoginID
+NodeType: Column Label: OrganizationNode
+NodeType: Column Label: OrganizationLevel
+NodeType: Column Label: JobTitle
+NodeType: Column Label: BirthDate
+NodeType: Column Label: MaritalStatus
+NodeType: Column Label: Gender
+NodeType: Column Label: HireDate
+NodeType: Column Label: VacationHours
+NodeType: Column Label: SickLeaveHours
+NodeType: Column Label: ValidFrom
+NodeType: Column Label: ValidTo
+NodeType: Key Label: PK_Employee_History_BusinessEntityID
+NodeType: Statistic Label: PK_Employee_History_BusinessEntityID
+NodeType: Table Label: Person.Person
+NodeType: Column Label: BusinessEntityID
+NodeType: Column Label: PersonType
+NodeType: Column Label: NameStyle
+NodeType: Column Label: Title
+NodeType: Column Label: FirstName
+NodeType: Column Label: MiddleName
+NodeType: Column Label: LastName
+NodeType: Column Label: Suffix
+NodeType: Column Label: EmailPromotion
+NodeType: Column Label: AdditionalContactInfo
+NodeType: Column Label: rowguid
+NodeType: Column Label: ModifiedDate
+NodeType: Key Label: PK_Person_BusinessEntityID
+NodeType: Constraint Label: CK_Person_EmailPromotion
+NodeType: Constraint Label: CK_Person_PersonType
+NodeType: Trigger Label: TableTrigger
+NodeType: Statistic Label: PK_Person_BusinessEntityID
+NodeType: View Label: HumanResources.vEmployee
+NodeType: Column Label: BusinessEntityID
+NodeType: Column Label: Title
+NodeType: Column Label: FirstName
+NodeType: Column Label: MiddleName
+NodeType: Column Label: LastName
+NodeType: Column Label: Suffix
+NodeType: Column Label: JobTitle
+NodeType: Column Label: AdditionalContactInfo
+NodeType: Synonym Label: dbo.MyProduct
+NodeType: StoredProcedure Label: HumanResources.sp_GetEmployee_Person_Info_AsOf
+NodeType: StoredProcedureParameter Label: @asOf
+NodeType: TableValuedFunction Label: dbo.ufnGetContactInformation
+NodeType: TableValuedFunctionParameter Label: @PersonID
+NodeType: ScalarValuedFunction Label: dbo.fun1
+NodeType: ScalarValuedFunction Label: dbo.ufnGetInventoryStock
+NodeType: ScalarValuedFunctionParameter Label: @ProductID
+NodeType: DatabaseTrigger Label: Trigger_2
+NodeType: Assembly Label: Microsoft.SqlServer.Types
+NodeType: UserDefinedDataType Label: dbo.AccountNumber
+NodeType: UserDefinedDataType Label: dbo.Flag
+NodeType: UserDefinedDataType Label: dbo.Name
+NodeType: UserDefinedDataType Label: dbo.NameStyle
+NodeType: UserDefinedDataType Label: dbo.OrderNumber
+NodeType: UserDefinedDataType Label: dbo.Phone
+NodeType: UserDefinedTableType Label: Demo.SalesOrderDetailType_inmem
+NodeType: UserDefinedTableTypeColumn Label: OrderQty
+NodeType: UserDefinedTableTypeColumn Label: ProductID
+NodeType: UserDefinedTableTypeColumn Label: SpecialOfferID
+NodeType: UserDefinedTableType Label: Demo.SalesOrderDetailType_ondisk
+NodeType: UserDefinedTableTypeColumn Label: OrderQty
+NodeType: UserDefinedTableTypeColumn Label: ProductID
+NodeType: UserDefinedTableTypeColumn Label: SpecialOfferID
+NodeType: XmlSchemaCollection Label: Person.AdditionalContactInfoSchemaCollection
+NodeType: Rule Label: dbo.list_rule
+NodeType: Default Label: dbo.phonedflt
+NodeType: Sequence Label: Demo.ID_Seq
+NodeType: FileGroup Label: PRIMARY
+NodeType: FullTextCatalog Label: AW2014FullTextCatalog
+NodeType: User Label: amy0
+NodeType: User Label: dbo
+NodeType: User Label: guest
+NodeType: User Label: INFORMATION_SCHEMA
+NodeType: User Label: sys
+NodeType: DatabaseRole Label: db_accessadmin
+NodeType: DatabaseRole Label: db_backupoperator
+NodeType: DatabaseRole Label: db_datareader
+NodeType: DatabaseRole Label: db_datawriter
+NodeType: DatabaseRole Label: db_ddladmin
+NodeType: DatabaseRole Label: db_denydatareader
+NodeType: DatabaseRole Label: db_denydatawriter
+NodeType: DatabaseRole Label: db_owner
+NodeType: DatabaseRole Label: db_securityadmin
+NodeType: DatabaseRole Label: public
+NodeType: DatabaseRole Label: SalesManagers
+NodeType: DatabaseRole Label: SalesPersons
+NodeType: Schema Label: dbo
+NodeType: Schema Label: db_accessadmin
+NodeType: Schema Label: db_backupoperator
+NodeType: Schema Label: db_datareader
+NodeType: Schema Label: db_datawriter
+NodeType: Schema Label: db_ddladmin
+NodeType: Schema Label: db_denydatareader
+NodeType: Schema Label: db_denydatawriter
+NodeType: Schema Label: db_owner
+NodeType: Schema Label: db_securityadmin
+NodeType: Schema Label: Demo
+NodeType: Schema Label: guest
+NodeType: Schema Label: HumanResources
+NodeType: Schema Label: INFORMATION_SCHEMA
+NodeType: Schema Label: Person
+NodeType: Schema Label: sys
+NodeType: DatabaseEncryptionKey Label: 

test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceProvider.cs

@@ -6,6 +6,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using Microsoft.SqlTools.Credentials;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
@@ -78,9 +80,12 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
         /// </summary>
         public void RunQuery(TestServerType serverType, string databaseName, string queryText, bool throwOnError = false)
         {
+            string uri = "";
             using (SelfCleaningTempFile queryTempFile = new SelfCleaningTempFile())
             {
-                ConnectionInfo connInfo = InitLiveConnectionInfo(serverType, databaseName, queryTempFile.FilePath);
+                uri = queryTempFile.FilePath;
+
+                ConnectionInfo connInfo = InitLiveConnectionInfo(serverType, databaseName, uri);
                 Query query = new Query(queryText, connInfo, new QueryExecutionSettings(), MemoryFileSystem.GetFileStreamFactory());
                 query.Execute();
                 query.ExecutionTask.Wait();
@@ -96,7 +101,18 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
                                 string.Join(Environment.NewLine, errorBatches.Select(b => b.BatchText))));
                     }
                 }
+                DisconnectConnection(uri);
             }
+
+        }
+
+        public static async Task<T> CalculateRunTime<T>(Func<Task<T>> testToRun, bool printResult, [CallerMemberName] string testName = "")
+        {
+            TestTimer timer = new TestTimer() { PrintResult = printResult };
+            T result = await testToRun();
+            timer.EndAndPrint(testName);
+
+            return result;
         }
 
         private ConnectionInfo InitLiveConnectionInfo(TestServerType serverType, string databaseName, string scriptFilePath)
@@ -119,6 +135,15 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
             return connInfo;
         }
 
+        private void DisconnectConnection(string uri)
+        {
+            ConnectionService.Instance.Disconnect(new DisconnectParams
+            {
+                OwnerUri = uri,
+                Type = ConnectionType.Default
+            });
+        }
+
         private static bool hasInitServices = false;
 
         private static void InitializeTestServices()