Updated Test function to only catch SQL execution exceptions

dsccommunity · Aug 21, 2016 · dba7ab8 · dba7ab8
1 parent c127d90
commit dba7ab8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/DSCResources/MSFT_xSQLServerScript/MSFT_xSQLServerScript.psm1 b/DSCResources/MSFT_xSQLServerScript/MSFT_xSQLServerScript.psm1
@@ -128,7 +128,7 @@ function Test-TargetResource
             return $false
         }
     }
-    catch
+    catch [Microsoft.SqlServer.Management.PowerShell.SqlPowerShellSqlExecutionException]
     {
         Write-Verbose $_
         return $false

diff --git a/Tests/Unit/MSFT_xSQLServerScript.Test.ps1 b/Tests/Unit/MSFT_xSQLServerScript.Test.ps1
@@ -1,6 +1,6 @@
 <#
-.Synopsis
-   Automated unit test for MSFT_xSQLServerScript DSC Resource
+    .SYNOPSIS
+       Automated unit test for MSFT_xSQLServerScript DSC Resource
 #>
 
 
@@ -25,6 +25,18 @@ $TestEnvironment = Initialize-TestEnvironment `
 
 #endregion HEADER
 
+Add-Type -ErrorAction SilentlyContinue -TypeDefinition @'
+namespace Microsoft.SqlServer.Management.PowerShell
+{
+    public class SqlPowerShellSqlExecutionException : System.Exception
+    {
+        public SqlPowerShellSqlExecutionException()
+        {
+        }
+    }
+}
+'@ 
+
 # Begin Testing
 try
 {
@@ -56,11 +68,9 @@ try
         }
 
         It 'Test method returns false' {
-            $throwMessage = "Failed to run SQL Script"
-
-             Mock -CommandName Invoke-SqlCmd -MockWith { Throw $throwMessage }
+            Mock -CommandName Invoke-SqlCmd -MockWith { throw New-Object Microsoft.SqlServer.Management.PowerShell.SqlPowerShellSqlExecutionException}
 
-             Test-TargetResource @testParameters | should be $false
+            Test-TargetResource @testParameters | should be $false
         }
 
         It 'Set method calls Invoke-SqlCmd' {
@@ -182,7 +192,7 @@ try
         }
 
         It 'Test method throws' {
-            Test-TargetResource @testParameters | should be $false
+            { Test-TargetResource @testParameters } | should throw $throwMessage
         }
 
         It 'Set method throws' {