Merge pull request #162 from SQLPlayer/develop

Ver.0.95

Author: NowinskiK

azure.datafactory.tools.psd1

@@ -12,7 +12,7 @@
     RootModule = 'azure.datafactory.tools.psm1'
 
     # Version number of this module.
-    ModuleVersion = '0.94.0'
+    ModuleVersion = '0.95.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

changelog.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.95.0] - 2021-10-23
+* Added structure to return object for Test-AdfCode which allows to check number of warnings too
+* Fixed tests
+
 ## [0.94.0] - 2021-10-20
 * Fixed bug: add 'properties' node to ManagedVirtualNetwork if does not exist in default.json file #157
 

private/ToArray.ps1

@@ -12,4 +12,16 @@ function ToArray
   {
     return ,$output;
   }
-}
+}
+
+function Test-ErrorNoTermination {
+  Write-Error -Message 'Test error message with no termination' -ErrorAction 'Continue'
+}
+
+function Test-ErrorTermination {
+  Write-Error -Message 'Test error message with termination' -ErrorAction 'Stop'
+}
+
+function Test-Exception {
+  Throw 'Test error message'
+}

public/Test-AdfCode.ps1

@@ -24,8 +24,14 @@ function Test-AdfCode {
         [String] $ConfigPath
     )
 
-    $ErrorCount = 0
-    $WarningCount = 0
+    class ReturnClass {
+        [int] $ErrorCount
+        [int] $WarningCount 
+    }
+    $result = New-Object 'ReturnClass'
+
+    $result.ErrorCount = 0
+    $result.WarningCount = 0
     $adfName = Split-Path -Path "$RootFolder" -Leaf
 
     Write-Host "=== Loading files from location: $RootFolder ..."
@@ -38,7 +44,7 @@ function Test-AdfCode {
     $ErrorActionPreference = 'Continue'
 
     if ($ObjectsCount -eq 0) {
-        $WarningCount += 1
+        $result.WarningCount += 1
         Write-Warning "No Azure Data Factory files have been found in a given location."
     }
 
@@ -47,22 +53,22 @@ function Test-AdfCode {
         Write-Host "Checking: $FullName..."
         $HasBody = $null -ne $_.Body
         if (-not $HasBody) {
-            $ErrorCount += 1
-            Write-Error -Message "Object $FullName was not loaded properly."
+            $result.ErrorCount += 1
+            Write-Error -Message "Object $FullName was not loaded properly." -ErrorAction 'Continue'
         }
         if ($HasBody) {
 
             if ($_.name -ne $_.Body.name) {
-                $ErrorCount += 1
-                Write-Error -Message "Object $FullName has mismatch file name."
+                $result.ErrorCount += 1
+                Write-Error -Message "Object $FullName has mismatch file name." -ErrorAction 'Continue'
             }
 
             $_.DependsOn | ForEach-Object {
                 Write-Verbose -Message "  - Checking dependency: [$_]"
                 $ref_arr = $adf.GetObjectsByFullName("$_")
                 if ($ref_arr.Count -eq 0) {
-                    $ErrorCount += 1
-                    Write-Error -Message "Couldn't find referenced object $_."
+                    $result.ErrorCount += 1
+                    Write-Error -Message "Couldn't find referenced object $_." -ErrorAction 'Continue'
                 }
             }
         }
@@ -74,15 +80,15 @@ function Test-AdfCode {
         $r = $adf.GetObjectsByFullName("*." + $_)
         if ($r.Count -gt 1) {
             Write-Warning "Duplication of object name: $_"
-            $WarningCount += 1
+            $result.WarningCount += 1
         }
     }
 
     $adf.LinkedServices + $adf.DataSets + $adf.Pipelines + $adf.DataFlows | ForEach-Object {
         [string] $name = $_.Name
         if ($name.Contains('-')) {
             Write-Warning "Dashes ('-') are not allowed in the names of linked services, data flows, and datasets ($name)."
-            $WarningCount += 1
+            $result.WarningCount += 1
         }
     }
 
@@ -91,7 +97,7 @@ function Test-AdfCode {
             [string] $name = $_.Name
             if ($name.Contains('-')) {
                 Write-Warning "Dashes ('-') are not allowed in the names of global parameters ($name)."
-                $WarningCount += 1
+                $result.WarningCount += 1
             }
         }
     }
@@ -115,7 +121,7 @@ function Test-AdfCode {
             Update-PropertiesFromFile -adf $adf -stage $FileName -ErrorVariable err -ErrorAction 'Stop' -dryRun:$True
         }
         catch {
-            $ErrorCount += 1
+            $result.ErrorCount += 1
             Write-Host "ERROR: $($_.Exception.Message)" -ForegroundColor 'Red'
             Write-Debug -Message $_.Exception
             #$_.Exception
@@ -125,13 +131,13 @@ function Test-AdfCode {
 
 
     $msg = "Test code completed ($ObjectsCount objects)."
-    if ($ErrorCount -gt 0) { $msg = "Test code failed." }
-    $line1 = $adf.Name.PadRight(63) + "  # of Errors: $ErrorCount".PadLeft(28)
-    $line2 = $msg.PadRight(63)      + "# of Warnings: $WarningCount".PadLeft(28)
+    if ($result.ErrorCount -gt 0) { $msg = "Test code failed." }
+    $line1 = $adf.Name.PadRight(63) + "  # of Errors: $($result.ErrorCount)".PadLeft(28)
+    $line2 = $msg.PadRight(63)      + "# of Warnings: $($result.WarningCount)".PadLeft(28)
     Write-Host "============================================================================================="
     Write-Host " $line1"
     Write-Host " $line2"
     Write-Host "============================================================================================="
 
-    return $ErrorCount;
+    return $result;
 }

test/!RunAllTests.ps1

@@ -57,7 +57,7 @@ try{
     $configuration.Should.ErrorAction = 'Continue'
     $configuration.CodeCoverage.Enabled = $false
     $configuration.TestResult.OutputFormat = "NUnitXml"
-    $configuration.TestResult.OutputPath = "TEST-Results.xml"
+    $configuration.TestResult.OutputPath = "$folder\TEST-Results.xml"
     $configuration.TestResult.Enabled = $true
     $configuration.Output.Verbosity = 'Detailed'
     if ($LocalTestsOnly) {
@@ -73,6 +73,8 @@ try{
     #$r.Passed[0]
     $r.Failed | Format-Table -Property Result, StartLine, Duration, Path
 
+    #Get-ChildItem -Path $folder | Format-Table
+
 } finally {
     Pop-Location
 }

test/Test-AdfCode.Tests.ps1

@@ -30,8 +30,10 @@ InModuleScope azure.datafactory.tools {
                 $script:res = Test-AdfCode -RootFolder $RootFolder
             } | Should -Not -Throw
         }
-        It 'Should return 1 error' {
-            $res | Should -Be 1
+        It 'Should return 1 error and 6 warnings in ReturnClass' {
+            $res.GetType() | Should -Be 'Test-AdfCode.ReturnClass'
+            $res.ErrorCount | Should -Be 1
+            $res.WarningCount | Should -Be 6
         }
 
     }

test/Test-Exceptions.Tests.ps1

@@ -0,0 +1,29 @@
+BeforeDiscovery {
+    $ModuleRootPath = $PSScriptRoot | Split-Path -Parent
+    $moduleManifestName = 'azure.datafactory.tools.psd1'
+    $moduleManifestPath = Join-Path -Path $ModuleRootPath -ChildPath $moduleManifestName
+    
+    Import-Module -Name $moduleManifestPath -Force -Verbose:$false
+}
+
+InModuleScope azure.datafactory.tools {
+    $testHelperPath = $PSScriptRoot | Join-Path -ChildPath 'TestHelper'
+    Import-Module -Name $testHelperPath -Force
+
+    # Variables for use in tests
+    
+    Describe 'Test-Exceptions' -Tag 'Unit' {
+        It 'Test-ErrorNoTermination should not throw error' {
+            { Test-ErrorNoTermination } | Should -Not -Throw
+        }
+        It 'Test-ErrorNoTermination should throw error' {
+            { Test-ErrorTermination } | Should -Throw
+        }
+        It 'Test-Exception should throw error' {
+            { Test-Exception } | Should -Throw -ExceptionType ([System.Management.Automation.RuntimeException])
+        }
+    }
+    
+
+
+}