Merge branch 'dev' into feature/componentizeServiceHost

test/ServiceHost.Test/Connection/ConnectionServiceTests.cs

@@ -0,0 +1,60 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using System.Threading.Tasks;
+using Microsoft.SqlTools.Test.Utility;
+using Xunit;
+
+namespace Microsoft.SqlTools.ServiceLayer.Test.Connection
+{
+    /// <summary>
+    /// Tests for the ServiceHost Connection Service tests
+    /// </summary>
+    public class ConnectionServiceTests
+    {
+        #region "Connection tests"
+
+        /// <summary>
+        /// Verify that the SQL parser correctly detects errors in text
+        /// </summary>
+        [Fact]
+        public void ConnectToDatabaseTest()
+        {
+            // connect to a database instance 
+            var connectionResult = 
+                TestObjects.GetTestConnectionService()
+                .Connect(TestObjects.GetTestConnectionDetails());
+
+            // verify that a valid connection id was returned
+            Assert.True(connectionResult.ConnectionId > 0);
+        }
+
+        /// <summary>
+        /// Verify that the SQL parser correctly detects errors in text
+        /// </summary>
+        [Fact]
+        public void OnConnectionCallbackHandlerTest()
+        {
+            bool callbackInvoked = false;
+
+            // setup connection service with callback
+            var connectionService = TestObjects.GetTestConnectionService();
+            connectionService.RegisterOnConnectionTask(
+                (sqlConnection) => { 
+                    callbackInvoked = true;
+                    return Task.FromResult(true); 
+                }
+            );
+            
+            // connect to a database instance 
+            var connectionResult = connectionService.Connect(TestObjects.GetTestConnectionDetails());
+
+            // verify that a valid connection id was returned
+            Assert.True(callbackInvoked);
+        }
+
+        #endregion
+    }
+}

test/ServiceHost.Test/LanguageServer/LanguageServiceTests.cs

@@ -0,0 +1,124 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using Microsoft.SqlTools.ServiceLayer.LanguageServices;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts;
+using Microsoft.SqlTools.Test.Utility;
+using Xunit;
+
+namespace Microsoft.SqlTools.ServiceLayer.Test.LanguageServer
+{
+    /// <summary>
+    /// Tests for the ServiceHost Language Service tests
+    /// </summary>
+    public class LanguageServiceTests
+    {
+        #region "Diagnostics tests"
+
+        /// <summary>
+        /// Verify that the SQL parser correctly detects errors in text
+        /// </summary>
+        [Fact]
+        public void ParseSelectStatementWithoutErrors()
+        {
+            // sql statement with no errors
+            const string sqlWithErrors = "SELECT * FROM sys.objects";
+
+            // get the test service 
+            LanguageService service = TestObjects.GetTestLanguageService();
+
+            // parse the sql statement
+            var scriptFile = new ScriptFile();
+            scriptFile.SetFileContents(sqlWithErrors);
+            ScriptFileMarker[] fileMarkers = service.GetSemanticMarkers(scriptFile);
+
+            // verify there are no errors
+            Assert.Equal(0, fileMarkers.Length);
+        }
+
+        /// <summary>
+        /// Verify that the SQL parser correctly detects errors in text
+        /// </summary>
+        [Fact]
+        public void ParseSelectStatementWithError()
+        {
+            // sql statement with errors
+            const string sqlWithErrors = "SELECT *** FROM sys.objects";
+
+            // get test service
+            LanguageService service = TestObjects.GetTestLanguageService();
+
+            // parse sql statement
+            var scriptFile = new ScriptFile();
+            scriptFile.SetFileContents(sqlWithErrors);
+            ScriptFileMarker[] fileMarkers = service.GetSemanticMarkers(scriptFile);
+
+            // verify there is one error
+            Assert.Equal(1, fileMarkers.Length);
+
+            // verify the position of the error
+            Assert.Equal(9, fileMarkers[0].ScriptRegion.StartColumnNumber);
+            Assert.Equal(1, fileMarkers[0].ScriptRegion.StartLineNumber);
+            Assert.Equal(10, fileMarkers[0].ScriptRegion.EndColumnNumber);
+            Assert.Equal(1, fileMarkers[0].ScriptRegion.EndLineNumber);
+        }
+
+        /// <summary>
+        /// Verify that the SQL parser correctly detects errors in text
+        /// </summary>
+        [Fact]
+        public void ParseMultilineSqlWithErrors()
+        {
+            // multiline sql with errors
+            const string sqlWithErrors = 
+                "SELECT *** FROM sys.objects;\n" +
+                "GO\n" +
+                "SELECT *** FROM sys.objects;\n";
+
+            // get test service
+            LanguageService service = TestObjects.GetTestLanguageService();
+
+            // parse sql
+            var scriptFile = new ScriptFile();
+            scriptFile.SetFileContents(sqlWithErrors);
+            ScriptFileMarker[] fileMarkers = service.GetSemanticMarkers(scriptFile);
+
+            // verify there are two errors
+            Assert.Equal(2, fileMarkers.Length);
+
+            // check position of first error
+            Assert.Equal(9, fileMarkers[0].ScriptRegion.StartColumnNumber);
+            Assert.Equal(1, fileMarkers[0].ScriptRegion.StartLineNumber);
+            Assert.Equal(10, fileMarkers[0].ScriptRegion.EndColumnNumber);
+            Assert.Equal(1, fileMarkers[0].ScriptRegion.EndLineNumber);
+
+            // check position of second error
+            Assert.Equal(9, fileMarkers[1].ScriptRegion.StartColumnNumber);
+            Assert.Equal(3, fileMarkers[1].ScriptRegion.StartLineNumber);
+            Assert.Equal(10, fileMarkers[1].ScriptRegion.EndColumnNumber);
+            Assert.Equal(3, fileMarkers[1].ScriptRegion.EndLineNumber);
+        }
+
+        #endregion
+
+        #region "Autocomplete Tests"
+
+        /// <summary>
+        /// Verify that the SQL parser correctly detects errors in text
+        /// </summary>
+        [Fact]
+        public void AutocompleteTest()
+        {
+            var autocompleteService = TestObjects.GetAutoCompleteService();
+            var connectionService = TestObjects.GetTestConnectionService();
+            var connectionResult = connectionService.Connect(TestObjects.GetTestConnectionDetails());
+            var sqlConnection = connectionService.ActiveConnections[connectionResult.ConnectionId];
+            autocompleteService.UpdateAutoCompleteCache(sqlConnection);
+        }
+
+        #endregion
+    }
+}
+

test/ServiceHost.Test/Utility/TestObjects.cs

@@ -0,0 +1,108 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+//#define USE_LIVE_CONNECTION
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.SqlTools.ServiceLayer.Connection;
+using Microsoft.SqlTools.ServiceLayer.LanguageServices;
+using Microsoft.SqlTools.ServiceLayer.SqlContext;
+using Xunit;
+
+namespace Microsoft.SqlTools.Test.Utility
+{
+    /// <summary>
+    /// Tests for the ServiceHost Connection Service tests
+    /// </summary>
+    public class TestObjects
+    {
+        /// <summary>
+        /// Creates a test connection service
+        /// </summary>
+        public static ConnectionService GetTestConnectionService()
+        {
+#if !USE_LIVE_CONNECTION
+            // use mock database connection
+            return new ConnectionService(new TestSqlConnectionFactory());
+#else
+            // connect to a real server instance
+            return ConnectionService.Instance;
+#endif
+        }
+
+        /// <summary>
+        /// Creates a test connection details object
+        /// </summary>
+        public static ConnectionDetails GetTestConnectionDetails()
+        {
+            return new ConnectionDetails()
+            {
+                UserName = "sa",
+                Password = "Yukon900",
+                DatabaseName = "AdventureWorks2016CTP3_2",
+                ServerName = "sqltools11"
+            };
+        }
+
+        /// <summary>
+        /// Create a test language service instance
+        /// </summary>
+        /// <returns></returns>
+        public static LanguageService GetTestLanguageService()
+        {
+            return new LanguageService();
+        }
+
+        /// <summary>
+        /// Creates a test autocomplete service instance
+        /// </summary>
+        public static AutoCompleteService GetAutoCompleteService()
+        {
+            return AutoCompleteService.Instance;
+        }
+
+        /// <summary>
+        /// Creates a test sql connection factory instance
+        /// </summary>
+        public static ISqlConnectionFactory GetTestSqlConnectionFactory()
+        {
+#if !USE_LIVE_CONNECTION
+            // use mock database connection
+            return new TestSqlConnectionFactory();
+#else
+            // connect to a real server instance
+            return ConnectionService.Instance.ConnectionFactory;
+#endif
+            
+        }
+    }
+
+    /// <summary>
+    /// Test mock class for SqlConnection wrapper
+    /// </summary>
+    public class TestSqlConnection : ISqlConnection
+    {
+        public void OpenDatabaseConnection(string connectionString)
+        {
+        }
+
+        public IEnumerable<string> GetServerObjects()
+        {
+            return null;
+        }
+    }
+
+    /// <summary>
+    /// Test mock class for SqlConnection factory
+    /// </summary>
+    public class TestSqlConnectionFactory : ISqlConnectionFactory
+    {
+        public ISqlConnection CreateSqlConnection()
+        {
+            return new TestSqlConnection();
+        }
+    }
+}

test/ServiceHost.Test/project.json

@@ -6,11 +6,13 @@
   "dependencies": {
     "Newtonsoft.Json": "9.0.1",
     "System.Runtime.Serialization.Primitives": "4.1.1",
+    "System.Data.Common": "4.1.0",
+    "System.Data.SqlClient": "4.1.0",
     "xunit": "2.1.0",
     "dotnet-test-xunit": "1.0.0-rc2-192208-24",
-	"ServiceHost": {
-		"target": "project"
-	  }
+    "ServiceHost": {
+       "target": "project"
+    }
   },
   "testRunner": "xunit",
   "frameworks": {