diff --git a/Packages.props b/Packages.props index 40161a93..c712ee33 100644 --- a/Packages.props +++ b/Packages.props @@ -25,7 +25,7 @@ - + diff --git a/src/Microsoft.SqlTools.ServiceLayer/SqlAssessment/Contracts/AssessmentRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlAssessment/Contracts/AssessmentRequest.cs index ed48a0d0..bee8890a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/SqlAssessment/Contracts/AssessmentRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/SqlAssessment/Contracts/AssessmentRequest.cs @@ -81,7 +81,7 @@ namespace Microsoft.SqlTools.ServiceLayer.SqlAssessment.Contracts /// /// Gets or sets a indicating /// severity level assigned to this items. - /// Values are: "Information", "Warning", "Critical". + /// Values are: "Information", "Low", "Medium", "High". /// public string Level { get; set; } } diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlAssessment/SqlAssessmentServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlAssessment/SqlAssessmentServiceTests.cs index 08df352b..0133ab7d 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlAssessment/SqlAssessmentServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlAssessment/SqlAssessmentServiceTests.cs @@ -27,7 +27,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlAssessment { private delegate Task> AssessmentMethod(SqlObjectLocator locator); - private static readonly string[] AllowedSeverityLevels = { string.Empty, "Information", "Warning", "Critical" }; + private static readonly string[] AllowedSeverityLevels = { string.Empty, "Information", "Low", "Medium", "High" }; [Test] public async Task InvokeSqlAssessmentServerTest() diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/SqlAssessment/GenerateScriptOperationTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/SqlAssessment/GenerateScriptOperationTests.cs index dcd588f2..cb6a0215 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/SqlAssessment/GenerateScriptOperationTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/SqlAssessment/GenerateScriptOperationTests.cs @@ -43,7 +43,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.SqlAssessment DisplayName = "D N2", HelpLink = "http://HL2", Kind = AssessmentResultItemKind.Warning, - Level = "Warning", + Level = "Medium", Message = "Msg'1", TargetName = "proj[*]_devW", TargetType = SqlObjectType.Database, @@ -58,7 +58,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.SqlAssessment DisplayName = "D'N1", HelpLink = "HL'1", Kind = AssessmentResultItemKind.Error, - Level = "Critical", + Level = "High", Message = "Msg'1", TargetName = "proj[*]_devE", TargetType = SqlObjectType.Server, @@ -73,7 +73,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.SqlAssessment DisplayName = "D N2", HelpLink = "http://HL2", Kind = AssessmentResultItemKind.Note, - Level = "Warning", + Level = "Medium", Message = "Msg'1", TargetName = "proj[*]_dev", TargetType = SqlObjectType.Database, @@ -88,7 +88,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.SqlAssessment DisplayName = "D'N1", HelpLink = "HL'1", Kind = AssessmentResultItemKind.Note, - Level = "Critical", + Level = "High", Message = "Msg'1", TargetName = "proj[*]_dev", TargetType = SqlObjectType.Server, @@ -120,8 +120,8 @@ INSERT INTO [dbo].[AssessmentResult] ([CheckName],[CheckId],[RulesetName],[Rules SELECT rpt.[CheckName],rpt.[CheckId],rpt.[RulesetName],rpt.[RulesetVersion],rpt.[Severity],rpt.[Message],rpt.[TargetPath],rpt.[TargetType],rpt.[HelpLink],rpt.[Timestamp] FROM (VALUES ('DN1','C1','Microsoft Ruleset','1.3','Information','Msg''1','proj[*]_dev','Server','HL1','2001-05-25 01:42:00.000 +00:00'), - ('D N2','C-2','Microsoft Ruleset','1.3','Warning','Msg''1','proj[*]_dev','Database','http://HL2','2001-05-25 01:42:00.000 +03:00'), - ('D''N1','C''3','Microsoft Ruleset','1.3','Critical','Msg''1','proj[*]_dev','Server','HL''1','2001-05-25 01:42:00.000 -01:30') + ('D N2','C-2','Microsoft Ruleset','1.3','Medium','Msg''1','proj[*]_dev','Database','http://HL2','2001-05-25 01:42:00.000 +03:00'), + ('D''N1','C''3','Microsoft Ruleset','1.3','High','Msg''1','proj[*]_dev','Server','HL''1','2001-05-25 01:42:00.000 -01:30') ) rpt([CheckName],[CheckId],[RulesetName],[RulesetVersion],[Severity],[Message],[TargetPath],[TargetType],[HelpLink],[Timestamp])"; [Test]