Fix integration tests

johlju · Nov 26, 2022 · 32785ac · 32785ac
1 parent b7dba14
commit 32785ac
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 57 deletions.
diff --git a/source/DSCResources/DSC_SqlDatabase/DSC_SqlDatabase.psm1 b/source/DSCResources/DSC_SqlDatabase/DSC_SqlDatabase.psm1
@@ -15,6 +15,7 @@ $script:supportedCompatibilityLevels = @{
     13 = @('Version100', 'Version110', 'Version120', 'Version130')
     14 = @('Version100', 'Version110', 'Version120', 'Version130', 'Version140')
     15 = @('Version100', 'Version110', 'Version120', 'Version130', 'Version140', 'Version150')
+    16 = @('Version100', 'Version110', 'Version120', 'Version130', 'Version140', 'Version150', 'Version160')
 }
 
 <#

diff --git a/tests/Integration/DSC_SqlDatabase.Integration.Tests.ps1 b/tests/Integration/DSC_SqlDatabase.Integration.Tests.ps1
@@ -28,33 +28,12 @@ BeforeAll {
         -ResourceType 'Mof' `
         -TestType 'Integration'
 
-    Import-Module -Name (Join-Path -Path $PSScriptRoot -ChildPath '..\TestHelpers\CommonTestHelper.psm1')
-
-    if (Test-ContinuousIntegrationTaskCategory -Category 'Integration_SQL2022')
-    {
-        $script:sqlVersion = '160'
-    }
-    elseif (Test-ContinuousIntegrationTaskCategory -Category 'Integration_SQL2019')
-    {
-        $script:sqlVersion = '150'
-    }
-    elseif (Test-ContinuousIntegrationTaskCategory -Category 'Integration_SQL2017')
-    {
-        $script:sqlVersion = '140'
-    }
-    else
-    {
-        $script:sqlVersion = '130'
-    }
-
     $configFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:dscResourceName).config.ps1"
     . $configFile
 }
 
 AfterAll {
     Restore-TestEnvironment -TestEnvironment $script:testEnvironment
-
-    Get-Module -Name 'CommonTestHelper' -All | Remove-Module -Force
 }
 
 Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016', 'Integration_SQL2017', 'Integration_SQL2019', 'Integration_SQL2022') {

diff --git a/tests/Integration/DSC_SqlDatabase.config.ps1 b/tests/Integration/DSC_SqlDatabase.config.ps1
@@ -13,41 +13,6 @@ if (Test-Path -Path $configFile)
 }
 else
 {
-    <#
-        The variable $script:sqlVersion is set in the integration script file,
-        which is available once this script is dot-sourced.
-    #>
-    switch ($script:sqlVersion)
-    {
-        '160'
-        {
-            $versionSpecificData = @{
-                CompatibilityLevel = 'Version150'
-            }
-        }
-
-        '150'
-        {
-            $versionSpecificData = @{
-                CompatibilityLevel = 'Version120'
-            }
-        }
-
-        '140'
-        {
-            $versionSpecificData = @{
-                CompatibilityLevel = 'Version120'
-            }
-        }
-
-        '130'
-        {
-            $versionSpecificData = @{
-                CompatibilityLevel = 'Version120'
-            }
-        }
-    }
-
     $ConfigurationData = @{
         AllNodes = @(
             @{
@@ -67,7 +32,7 @@ else
                 DatabaseName5      = 'Database5'
 
                 Collation          = 'SQL_Latin1_General_Pref_CP850_CI_AS'
-                CompatibilityLevel = $versionSpecificData.CompatibilityLevel
+                CompatibilityLevel = 'Version120'
                 RecoveryModel      = 'Simple'
                 OwnerName          = 'sa'
             }