port batch parser wrapper (#232)

* Initial commit for GitHub IO pages * Add initial doxfx content * Update manifest.json * Update manifest.json * Set theme jekyll-theme-cayman * Set theme jekyll-theme-slate * Set theme jekyll-theme-minimal * Set theme jekyll-theme-tactile * Clear out theme setting * Remove API docs * Revert "Adding Milliseconds to DateTime fields (#173)" (#197) This reverts commit 431dfa4156. * ported new BatchParser * added BatchParser tests * fixing merge conflicts * fix build issues * cleaned code and addressed comments from code review * addressed code review and made BatchParser logic more efficient * fixed batch parser tests * changed class name to fix build issues * fixed merge conflicts * added path for lab mode baseline tests * changed env path for lab mode * added env variable to appveyor * testing env variable for appveyor * fixed lab build * debug appveyor build * testing changes for appveyor * changed trace env path * debugging appveyor build * changed baseline env path * debugging * debugging * debugging * switched on trace flag * debugging * debugging * changed build config * changed baseline files * checking baseline output * changed baseline files * debug baseline tests * debugging baseline * debugging * debugging * debug * debugging * testing baseline format * debug * debug * debug * debug * debug * newline debug * changed baseline file * debug * test * try new way to read * added execution engine tests * change test * testing file encoding * moved execution engine tests to integration * try compare without spaces * removed no op test * added env variable for travis * put batch parser tests to integration too * put batch parser in integration * try new baseline string match * compare baseline test logic changed * changed baseline logic as well as cleaned tests * fix build for travis CI * fix travis CI issues * fixed highlighting bugs on vscode * code review changes * ported new BatchParser * added BatchParser tests * Initial commit for GitHub IO pages * Add initial doxfx content * Update manifest.json * Update manifest.json * Set theme jekyll-theme-cayman * Set theme jekyll-theme-slate * Set theme jekyll-theme-minimal * Set theme jekyll-theme-tactile * Clear out theme setting * Remove API docs * Revert "Adding Milliseconds to DateTime fields (#173)" (#197) This reverts commit 431dfa4156. * fixing merge conflicts * fix build issues * cleaned code and addressed comments from code review * addressed code review and made BatchParser logic more efficient * fixed batch parser tests * changed class name to fix build issues * fixed merge conflicts * added path for lab mode baseline tests changed env path for lab mode added env variable to appveyor testing env variable for appveyor fixed lab build debug appveyor build testing changes for appveyor changed trace env path debugging appveyor build changed baseline env path debugging debugging debugging switched on trace flag debugging debugging changed build config changed baseline files checking baseline output changed baseline files debug baseline tests debugging baseline debugging debugging debug debugging testing baseline format debug debug debug debug debug newline debug changed baseline file debug test try new way to read added execution engine tests change test testing file encoding moved execution engine tests to integration try compare without spaces removed no op test added env variable for travis * put batch parser tests to integration too * put batch parser in integration try new baseline string match * compare baseline test logic changed * changed baseline logic as well as cleaned tests * fix build for travis CI * fix travis CI issues * fixed highlighting bugs on vscode * code review changes * fixed filestream writer test * added localization string * added localization string * generated new string files again * code review changes
2026-01-14 01:25:40 -05:00 · 2017-02-10 16:51:26 -08:00
parent 1a5685c387
commit eb4f2f2b91
412 changed files with 82047 additions and 704 deletions
--- a/test/Microsoft.SqlTools.ServiceLayer.Test/QueryExecution/DataStorage/ServiceBufferFileStreamReaderWriterTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test/QueryExecution/DataStorage/ServiceBufferFileStreamReaderWriterTests.cs
@@ -354,6 +354,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution.DataStorage

                // Make sure the display value has a time string with 7 milliseconds
                Assert.True(Regex.IsMatch(displayValue, @"^[\d]{4}-[\d]{2}-[\d]{2} [\d]{2}:[\d]{2}:[\d]{2}\.[\d]{7}$"));
+
            }
        }

@@ -493,4 +494,4 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution.DataStorage
            }
        }
    }
-}
+}
--- a/test/Microsoft.SqlTools.ServiceLayer.Test/QueryExecution/Execution/QueryTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test/QueryExecution/Execution/QueryTests.cs
@@ -7,7 +7,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Castle.Components.DictionaryAdapter;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
@@ -136,20 +135,16 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution.Execution
            // If:
            // ... I Then execute the query
            query.Execute();
-            query.ExecutionTask.Wait();

            // Then:
            // ... There should be no batches
-            Assert.Empty(query.Batches);
+            Assert.Equal(1, query.Batches.Length);

-            // ... The query should have completed successfully with no batch summaries returned
-            Assert.True(query.HasExecuted);
-            Assert.Empty(query.BatchSummaries);
+            // ... The query shouldn't have completed successfully
+            Assert.False(query.HasExecuted);

-            // ... The message callback should have been called exactly once
-            // ... The message must not have a batch associated with it
-            Assert.Equal(1, messages.Count);
-            Assert.Null(messages[0].BatchId);
+            // ... The message callback should have been called 0 times
+            Assert.Equal(0, messages.Count);
        }

        [Fact]
@@ -215,26 +210,23 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution.Execution

            // .. I then execute the query
            query.Execute();
-            query.ExecutionTask.Wait();

            // Then:
-            // ... I should get back a query with one batch (no op batch is not included)
+            // ... I should get back a query with two batches
            Assert.NotEmpty(query.Batches);
-            Assert.Equal(1, query.Batches.Length);
+            Assert.Equal(2, query.Batches.Length);

-            // ... The query should have completed successfully with one batch summary returned
-            Assert.True(query.HasExecuted);
-            Assert.NotEmpty(query.BatchSummaries);
-            Assert.Equal(1, query.BatchSummaries.Length);
+            //// ... The query shouldn't have completed successfully unless all batches were executed
+            Assert.False(query.HasExecuted);

-            // ... The batch callbacks should have been called precisely 1 time
-            Assert.Equal(1, batchStartCallbacksReceived);
-            Assert.Equal(1, batchCompletionCallbacksReceived);
-            Assert.Equal(1, batchMessageCallbacksReceived);
+            //// ... The batch callbacks should have been called 0 times
+            Assert.Equal(0, batchStartCallbacksReceived);
+            Assert.Equal(0, batchCompletionCallbacksReceived);
+            Assert.Equal(0, batchMessageCallbacksReceived);
        }

        [Fact]
-        public async Task QueryExecuteMultipleNoOpBatches()
+        public void QueryExecuteMultipleNoOpBatches()
        {
            // Setup:
            // ... Keep track of how many messages were sent
@@ -253,20 +245,16 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution.Execution

            // .. I then execute the query
            query.Execute();
-            await query.ExecutionTask;

            // Then:
            // ... I should get back a query with no batches
-            Assert.Empty(query.Batches);
+            Assert.Equal(2, query.Batches.Length);

-            // ... The query should have completed successfully with one zero batch summaries returned
-            Assert.True(query.HasExecuted);
-            Assert.Empty(query.BatchSummaries);
+            // ... The query shouldn't have completed successfully
+            Assert.False(query.HasExecuted);

            // ... The message callback should have been called exactly once
-            // ... The message must not have a batch associated with it
-            Assert.Equal(1, messages.Count);
-            Assert.Null(messages[0].BatchId);
+            Assert.Equal(0, messages.Count);
        }

        [Fact]
--- a/test/Microsoft.SqlTools.ServiceLayer.Test/QueryExecution/Execution/ServiceIntegrationTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test/QueryExecution/Execution/ServiceIntegrationTests.cs
@@ -17,6 +17,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution.Execution
 {
    public class ServiceIntegrationTests
    {
+
        #region Get SQL Tests

        [Fact]
@@ -183,35 +184,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution.Execution
        // NOTE: In order to limit test duplication, we're running the ExecuteDocumentSelection
        // version of execute query. The code paths are almost identical.

-        [Fact]
-        private async Task QueryExecuteAllBatchesNoOp()
-        {
-            // If:
-            // ... I request to execute a valid query with all batches as no op
-            var workspaceService = GetDefaultWorkspaceService(string.Format("{0}\r\nGO\r\n{0}", Common.NoOpQuery));
-            var queryService = Common.GetPrimedExecutionService(null, true, false, workspaceService);
-            var queryParams = new ExecuteDocumentSelectionParams { QuerySelection = Common.WholeDocument, OwnerUri = Common.OwnerUri};
-
-            var efv = new EventFlowValidator<ExecuteRequestResult>()
-                .AddStandardQueryResultValidator()
-                .AddStandardMessageValidator()
-                .AddEventValidation(QueryCompleteEvent.Type, p =>
-                {
-                    // Validate OwnerURI matches
-                    Assert.Equal(Common.OwnerUri, p.OwnerUri);
-                    Assert.NotNull(p.BatchSummaries);
-                    Assert.Equal(0, p.BatchSummaries.Length);
-                }).Complete();
-            await Common.AwaitExecution(queryService, queryParams, efv.Object);
-
-            // Then:
-            // ... All events should have been called as per their flow validator
-            efv.Validate();
-
-            // ... There should be one active query
-            Assert.Equal(1, queryService.ActiveQueries.Count);
-        }
-
        [Fact]
        public async Task QueryExecuteSingleBatchNoResultsTest()
        {