From 989137ddb7702080772bca687d48108236975223 Mon Sep 17 00:00:00 2001 From: Sai Avishkar Sreerama <74571829+ssreerama@users.noreply.github.com> Date: Tue, 31 May 2022 14:03:44 -0500 Subject: [PATCH] DacFx default options test validation fixes (#1509) --- .../DacFx/DacFxServiceTests.cs | 13 +------------ .../SchemaCompare/SchemaCompareTestUtils.cs | 9 +-------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxServiceTests.cs index 2ad0f393..de8f6328 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxServiceTests.cs @@ -731,7 +731,6 @@ FROM MissingEdgeHubInputStream'"; expectedResults.BlockOnPossibleDataLoss = new DeploymentOptionProperty(true); expectedResults.AllowIncompatiblePlatform = new DeploymentOptionProperty(true); expectedResults.DisableIndexesForDataPhase = new DeploymentOptionProperty(false); - expectedResults.IgnoreTableOptions = new DeploymentOptionProperty(false); var dacfxRequestContext = new Mock>(); dacfxRequestContext.Setup((RequestContext x) => x.SendResult(It.Is((result) => ValidateOptions(expectedResults, result.DeploymentOptions) == true))).Returns(Task.FromResult(new object())); @@ -757,7 +756,6 @@ FROM MissingEdgeHubInputStream'"; DeploymentOptions expectedResults = DeploymentOptions.GetDefaultPublishOptions(); expectedResults.ExcludeObjectTypes = null; expectedResults.DisableIndexesForDataPhase = new DeploymentOptionProperty(false); - expectedResults.IgnoreTableOptions = new DeploymentOptionProperty(false); var dacfxRequestContext = new Mock>(); dacfxRequestContext.Setup((RequestContext x) => x.SendResult(It.Is((result) => ValidateOptions(expectedResults, result.DeploymentOptions) == true))).Returns(Task.FromResult(new object())); @@ -781,7 +779,6 @@ FROM MissingEdgeHubInputStream'"; public async Task ValidateGetDefaultPublishOptionsCallFromService() { DeploymentOptions expectedResults = DeploymentOptions.GetDefaultPublishOptions(); - expectedResults.IgnoreTableOptions = new DeploymentOptionProperty(false); var dacfxRequestContext = new Mock>(); dacfxRequestContext.Setup((RequestContext x) => x.SendResult(It.Is((result) => ValidateOptions(expectedResults, result.DeploymentOptions) == true))).Returns(Task.FromResult(new object())); @@ -859,15 +856,7 @@ Streaming query statement contains a reference to missing output stream 'Missing else { //Verifying expected and actual deployment options properties are equal - Assert.True((defaultP == null && actualP == null) - || (defaultP == null && String.IsNullOrEmpty(actualP as string)) - // check the type of the properties, the descriptions will not match when overriding defaults - || defaultP.GetType().Equals(actualP.GetType()) - , $"Actual Property from Service is not equal to default property for {v.Name}, Actual property: {actualP} and Default property: {defaultP}"); - - // Verifying expected and actual deployment options property values are equal - Assert.True((defaultPValue == null && actualPValue == null) - || (defaultPValue == null && String.IsNullOrEmpty(actualPValue as string)) + Assert.True((defaultPValue == null && String.IsNullOrEmpty(actualPValue as string)) || (defaultPValue).Equals(actualPValue) , $"Actual Property from Service is not equal to default property for {v.Name}, Actual value: {actualPValue} and Default value: {defaultPValue}"); } diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareTestUtils.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareTestUtils.cs index 32689afa..7e6d3633 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareTestUtils.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareTestUtils.cs @@ -170,14 +170,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SchemaCompare else { // Verifying expected and actual deployment options properties are equal - Assert.True((defaultP == null && actualP == null) - || (defaultP == null && String.IsNullOrEmpty(actualP as string)) - || defaultP.Equals(actualP) - , $"Actual Property from Service is not equal to default property for {v.Name}, Actual property: {actualP} and Default property: {defaultP}"); - - // Verifying expected and actual deployment options property values are equal - Assert.True((defaultPValue == null && actualPValue == null) - || (defaultPValue == null && String.IsNullOrEmpty(actualPValue as string)) + Assert.True((defaultPValue == null && String.IsNullOrEmpty(actualPValue as string)) || (defaultPValue).Equals(actualPValue) , $"Actual Property from Service is not equal to default property for {v.Name}, Actual value: {actualPValue} and Default value: {defaultPValue}"); }