From 98b8bd7b1994d1de2a60dd95d0c5d04c29bb089b Mon Sep 17 00:00:00 2001 From: Maddy Koripalli Date: Thu, 6 Apr 2023 12:21:38 -0700 Subject: [PATCH 1/5] enable all trigger tests for OOP --- .../Integration/SqlTriggerBindingIntegrationTests.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Integration/SqlTriggerBindingIntegrationTests.cs b/test/Integration/SqlTriggerBindingIntegrationTests.cs index 5d37026b1..98f6cc524 100644 --- a/test/Integration/SqlTriggerBindingIntegrationTests.cs +++ b/test/Integration/SqlTriggerBindingIntegrationTests.cs @@ -168,7 +168,7 @@ await this.WaitForProductChanges( /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] public async Task PollingIntervalOverrideTriggerTest(SupportedLanguages lang) { const int firstId = 1; @@ -293,7 +293,7 @@ await this.WaitForProductChanges( /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] public async Task MultiFunctionTriggerTest(SupportedLanguages lang) { const string Trigger1Changes = "Trigger1 Changes: "; @@ -472,7 +472,7 @@ await this.WaitForProductChanges( /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] public void TableNotPresentTriggerTest(SupportedLanguages lang) { this.StartFunctionHostAndWaitForError( @@ -487,7 +487,7 @@ public void TableNotPresentTriggerTest(SupportedLanguages lang) /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] public void PrimaryKeyNotCreatedTriggerTest(SupportedLanguages lang) { this.StartFunctionHostAndWaitForError( @@ -503,7 +503,7 @@ public void PrimaryKeyNotCreatedTriggerTest(SupportedLanguages lang) /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] public void ReservedPrimaryKeyColumnNamesTriggerTest(SupportedLanguages lang) { this.StartFunctionHostAndWaitForError( @@ -519,7 +519,7 @@ public void ReservedPrimaryKeyColumnNamesTriggerTest(SupportedLanguages lang) /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript, SupportedLanguages.CSharp, SupportedLanguages.JavaScript, SupportedLanguages.PowerShell, SupportedLanguages.Python)] public void UnsupportedColumnTypesTriggerTest(SupportedLanguages lang) { this.StartFunctionHostAndWaitForError( From a622524bef9ac163c26cadde6728ade88713718a Mon Sep 17 00:00:00 2001 From: Maddy Koripalli Date: Mon, 10 Apr 2023 12:12:09 -0700 Subject: [PATCH 2/5] undo --- test/Integration/SqlTriggerBindingIntegrationTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Integration/SqlTriggerBindingIntegrationTests.cs b/test/Integration/SqlTriggerBindingIntegrationTests.cs index 98f6cc524..68cfa4220 100644 --- a/test/Integration/SqlTriggerBindingIntegrationTests.cs +++ b/test/Integration/SqlTriggerBindingIntegrationTests.cs @@ -519,7 +519,7 @@ public void ReservedPrimaryKeyColumnNamesTriggerTest(SupportedLanguages lang) /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript, SupportedLanguages.CSharp, SupportedLanguages.JavaScript, SupportedLanguages.PowerShell, SupportedLanguages.Python)] + [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] public void UnsupportedColumnTypesTriggerTest(SupportedLanguages lang) { this.StartFunctionHostAndWaitForError( From c984ca69e03c94fc5aaa1f26df65d5931b05e4b8 Mon Sep 17 00:00:00 2001 From: Maddy Koripalli Date: Tue, 11 Apr 2023 12:07:58 -0700 Subject: [PATCH 3/5] fix test --- test-outofproc/MultiFunctionTrigger.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test-outofproc/MultiFunctionTrigger.cs b/test-outofproc/MultiFunctionTrigger.cs index c583e601a..cfc49fbe4 100644 --- a/test-outofproc/MultiFunctionTrigger.cs +++ b/test-outofproc/MultiFunctionTrigger.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. +using System; using System.Collections.Generic; using DotnetIsolatedTests.Common; using Microsoft.Extensions.Logging; @@ -15,22 +16,24 @@ namespace DotnetIsolatedTests /// public static class MultiFunctionTrigger { + private static readonly Action _loggerMessage = LoggerMessage.Define(LogLevel.Information, eventId: new EventId(0, "INFO"), formatString: "{Message}"); + [Function(nameof(MultiFunctionTrigger1))] public static void MultiFunctionTrigger1( [SqlTrigger("[dbo].[Products]", "SqlConnectionString")] IReadOnlyList> products, - ILogger logger) + FunctionContext context) { - logger.LogInformation("Trigger1 Changes: " + Utils.JsonSerializeObject(products)); + _loggerMessage(context.GetLogger("ProductsTriggerWithValidation"), "Trigger1 Changes: " + Utils.JsonSerializeObject(products), null); } [Function(nameof(MultiFunctionTrigger2))] public static void MultiFunctionTrigger2( [SqlTrigger("[dbo].[Products]", "SqlConnectionString")] IReadOnlyList> products, - ILogger logger) + FunctionContext context) { - logger.LogInformation("Trigger2 Changes: " + Utils.JsonSerializeObject(products)); + _loggerMessage(context.GetLogger("ProductsTriggerWithValidation"), "Trigger2 Changes: " + Utils.JsonSerializeObject(products), null); } } } From aaf6f550fa8d474e140eff8aea9a7e5a827cd62c Mon Sep 17 00:00:00 2001 From: maddydev Date: Tue, 11 Apr 2023 14:35:58 -0700 Subject: [PATCH 4/5] merge conflict --- test/Integration/SqlTriggerBindingIntegrationTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Integration/SqlTriggerBindingIntegrationTests.cs b/test/Integration/SqlTriggerBindingIntegrationTests.cs index 2e2dd139c..663a5e292 100644 --- a/test/Integration/SqlTriggerBindingIntegrationTests.cs +++ b/test/Integration/SqlTriggerBindingIntegrationTests.cs @@ -211,7 +211,7 @@ await this.WaitForProductChanges( /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] public async Task MultiOperationTriggerTest(SupportedLanguages lang) { int firstId = 1; From 58852998a775fa784445e3feb2f1f1f691f9bad0 Mon Sep 17 00:00:00 2001 From: maddydev Date: Tue, 11 Apr 2023 14:37:18 -0700 Subject: [PATCH 5/5] remove Java --- .../Integration/SqlTriggerBindingIntegrationTests.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Integration/SqlTriggerBindingIntegrationTests.cs b/test/Integration/SqlTriggerBindingIntegrationTests.cs index 663a5e292..431af210f 100644 --- a/test/Integration/SqlTriggerBindingIntegrationTests.cs +++ b/test/Integration/SqlTriggerBindingIntegrationTests.cs @@ -211,7 +211,7 @@ await this.WaitForProductChanges( /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.CSharpscript)] public async Task MultiOperationTriggerTest(SupportedLanguages lang) { int firstId = 1; @@ -293,7 +293,7 @@ await this.WaitForProductChanges( /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.CSharpscript)] public async Task MultiFunctionTriggerTest(SupportedLanguages lang) { const string Trigger1Changes = "Trigger1 Changes: "; @@ -472,7 +472,7 @@ await this.WaitForProductChanges( /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.CSharpscript)] public void TableNotPresentTriggerTest(SupportedLanguages lang) { this.StartFunctionHostAndWaitForError( @@ -487,7 +487,7 @@ public void TableNotPresentTriggerTest(SupportedLanguages lang) /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.CSharpscript)] public void PrimaryKeyNotCreatedTriggerTest(SupportedLanguages lang) { this.StartFunctionHostAndWaitForError( @@ -503,7 +503,7 @@ public void PrimaryKeyNotCreatedTriggerTest(SupportedLanguages lang) /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.CSharpscript)] public void ReservedPrimaryKeyColumnNamesTriggerTest(SupportedLanguages lang) { this.StartFunctionHostAndWaitForError( @@ -519,7 +519,7 @@ public void ReservedPrimaryKeyColumnNamesTriggerTest(SupportedLanguages lang) /// [Theory] [SqlInlineData()] - [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)] + [UnsupportedLanguages(SupportedLanguages.CSharpscript)] public void UnsupportedColumnTypesTriggerTest(SupportedLanguages lang) { this.StartFunctionHostAndWaitForError(