Merge branch 'master' into master

Author: devblackops

CHANGELOG.md

@@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - PR25 - Discover Pester 'Describe' block names when the -Name parameter is used (via @GitAMBS)
 - PR29 - Remove Pester 4.0+ warning by using -Show parameter instead of -Quiet. Add -UseBasicParsing parameter to Invoke-WebRequest in tests (via @larssb)
+- Fixed #3 where an error would be generated when using Invoke-OperationValidation with the -TestFilePath parameter
+  against a Pester test file with a short path.
 
 ## [1.0.1] - 2015-12-05
 

OperationValidation/Private/Convert-TestResult.ps1

@@ -1,18 +1,32 @@
 
-# emit an object which can be used in reporting
-Function Convert-TestResult
-{
-    param ( $result )
-    foreach ( $testResult in $result.TestResult )
-    {
+# Emit an object which can be used in reporting
+Function Convert-TestResult {
+    param (
+        [Parameter(Mandatory = $true)]
+        $result,
+
+        [string]$ModuleName
+    )
+
+    foreach ( $testResult in $result.TestResult ) {
         $testError = $null
-        if ( $testResult.Result -eq "Failed" )
-        {
-            Write-Verbose -message "Creating error object"
-            $testError = new-OperationValidationFailure -Stacktrace $testResult.StackTrace -FailureMessage $testResult.FailureMessage
+        if ( $testResult.Result -eq 'Failed' ) {
+            Write-Verbose -message 'Creating error object'
+            $testError = New-OperationValidationFailure -Stacktrace $testResult.StackTrace -FailureMessage $testResult.FailureMessage
+        }
+
+        $TestName = '{0}:{1}:{2}' -f $testResult.Describe, $testResult.Context, $testResult.Name
+
+        $newOVResultParams = @{
+            Name = $TestName
+            FileName = $result.path
+            Result = $testresult.result
+            RawResult = $testResult
+            Error = $TestError
+        }
+        if (-not [string]::IsNullOrEmpty($ModuleName)) {
+            $newOVResultParams['Module'] = $ModuleName
         }
-        $Module = $result.Path.split([io.path]::DirectorySeparatorChar)[-4]
-        $TestName = "{0}:{1}:{2}" -f $testResult.Describe,$testResult.Context,$testResult.Name
-        New-OperationValidationResult -Module $Module -Name $TestName -FileName $result.path -Result $testresult.result -RawResult $testResult -Error $TestError
+        New-OperationValidationResult @newOVResultParams
     }
 }

OperationValidation/Private/New-OperationValidationResult.ps1

@@ -3,10 +3,10 @@ function New-OperationValidationResult
 {
     [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Scope='Function', Target='*')]
     param (
-        [Parameter(Mandatory=$true)][string]$Module,
         [Parameter(Mandatory=$true)][string]$FileName,
         [Parameter(Mandatory=$true)][string]$Name,
         [Parameter(Mandatory=$true)][string]$Result,
+        [Parameter()][string]$Module,
         [Parameter()][object]$RawResult,
         [Parameter()][object]$Error
     )

OperationValidation/Public/Invoke-OperationValidation.ps1

@@ -314,7 +314,7 @@ function Invoke-OperationValidation
                     if ($testResult)
                     {
                         Add-member -InputObject $testResult -MemberType NoteProperty -Name Path -Value $ti.FilePath
-                        Convert-TestResult -Result $testResult -ModuleName $ModuleName
+                        Convert-TestResult -Result $testResult -ModuleName $ti.ModuleName
                     }
                 }
             }

README.md

@@ -1,7 +1,7 @@
 
 # Operation-Validation-Framework
 
-[![Build status](https://ci.appveyor.com/api/projects/status/rili6ki88ioyq23t?svg=true)](https://ci.appveyor.com/project/devblackops/operation-validation-framework)
+[![Build status](https://ci.appveyor.com/api/projects/status/rvbve3ajjtn4m0n2?svg=true)](https://ci.appveyor.com/project/devblackops/operation-validation-framework-a635v)
 
 A set of tools for executing validation of the operation of a system.
 It provides a way to organize and execute Pester tests which are written

Tests/OperationValidation.Tests.ps1

@@ -23,7 +23,7 @@ Describe "OperationValidation Module Tests" {
 
     Context "Get-OperationValidation parameters" {
         It "ModuleName parameter is proper type" {
-            $commands[0].Parameters['ModuleName'].ParameterType | Should be ([System.String[]])
+            $commands[0].Parameters['Name'].ParameterType | Should be ([System.String[]])
         }
         It "Version parameter is proper type" {
             $commands[0].Parameters['Version'].ParameterType | Should be ([System.Version])